BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 179 insertions, 190 deletions

diff --git a/chromium/ios/third_party/edo/BUILD.gn b/chromium/ios/third_party/edo/BUILD.gn
index 19aa2dab85c..cd3f9be79ce 100644
--- a/chromium/ios/third_party/edo/BUILD.gn
+++ b/chromium/ios/third_party/edo/BUILD.gn
@@ -91,6 +91,8 @@ source_set("edo") {
     "src/Service/Sources/EDOParameter.m",
     "src/Service/Sources/EDOProtocolObject.h",
     "src/Service/Sources/EDOProtocolObject.m",
+    "src/Service/Sources/EDORemoteException.h",
+    "src/Service/Sources/EDORemoteException.m",
     "src/Service/Sources/EDORemoteVariable.h",
     "src/Service/Sources/EDORemoteVariable.m",
     "src/Service/Sources/EDOServiceError.h",
@@ -114,6 +116,8 @@ source_set("edo") {
     "src/Service/Sources/NSKeyedArchiver+EDOAdditions.m",
     "src/Service/Sources/NSKeyedUnarchiver+EDOAdditions.h",
     "src/Service/Sources/NSKeyedUnarchiver+EDOAdditions.m",
+    "src/Service/Sources/NSObject+EDOBlacklistedType.h",
+    "src/Service/Sources/NSObject+EDOBlacklistedType.m",
     "src/Service/Sources/NSObject+EDOParameter.h",
     "src/Service/Sources/NSObject+EDOParameter.m",
     "src/Service/Sources/NSObject+EDOValue.h",
diff --git a/chromium/ios/third_party/features.gni b/chromium/ios/third_party/features.gni
deleted file mode 100644
index adfcbc5baf6..00000000000
--- a/chromium/ios/third_party/features.gni
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-declare_args() {
-  # Controls whether //ios/third_party/material_components_ios (and its
-  # dependencies) is build as a framework bundle. This boolean allows
-  # migrating the internal code to the framework incrementally.
-  ios_third_party_material_components_built_as_framework = true
-}
diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn
index 53d5e0541cc..bc25175f510 100644
--- a/chromium/ios/third_party/material_components_ios/BUILD.gn
+++ b/chromium/ios/third_party/material_components_ios/BUILD.gn
@@ -5,13 +5,11 @@
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/ios/rules.gni")
 import("//build/config/locales.gni")
-import("//ios/third_party/features.gni")
 
-# This variable lists all public headers that are exported by MDC. It is
-# there to allow supporting build. It allows not repeating the list if
-# ios_third_party_material_components_built_as_framework is true/false.
-# TODO(crbug.com/1017165): remove once MaterialComponents is always built
-# as a framework
+# The three variables _mdc_public_headers, _mdc_include_dirs and _mdc_sources
+# are there to allow script to automatically keep the build rules up-to-date
+# when rolling material_components_ios. They should not be removed.
+
 _mdc_public_headers = [
   # List generated by the following commands:
   # $ cd src/ios/third_party/material_components_ios
@@ -32,6 +30,8 @@ _mdc_public_headers = [
   "src/components/ActionSheet/src/TypographyThemer/MaterialActionSheet+TypographyThemer.h",
   "src/components/ActionSheet/src/private/MDCActionSheetHeaderView.h",
   "src/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h",
+  "src/components/ActionSheet/src/private/MaterialActionSheetStrings.h",
+  "src/components/ActionSheet/src/private/MaterialActionSheetStrings_table.h",
   "src/components/ActivityIndicator/src/MDCActivityIndicator.h",
   "src/components/ActivityIndicator/src/MDCActivityIndicatorDelegate.h",
   "src/components/ActivityIndicator/src/MaterialActivityIndicator.h",
@@ -201,8 +201,6 @@ _mdc_public_headers = [
   "src/components/FeatureHighlight/src/MDCFeatureHighlightView.h",
   "src/components/FeatureHighlight/src/MDCFeatureHighlightViewController.h",
   "src/components/FeatureHighlight/src/MaterialFeatureHighlight.h",
-  "src/components/FeatureHighlight/src/MaterialFeatureHighlightStrings.h",
-  "src/components/FeatureHighlight/src/MaterialFeatureHighlightStrings_table.h",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.h",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightDismissGestureRecognizer.h",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightLayer.h",
@@ -218,9 +216,14 @@ _mdc_public_headers = [
   "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewDelegate.h",
   "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewLayoutDelegate.h",
   "src/components/FlexibleHeader/src/MaterialFlexibleHeader.h",
+  "src/components/FlexibleHeader/src/ShiftBehavior/MDCFlexibleHeaderShiftBehavior.h",
+  "src/components/FlexibleHeader/src/ShiftBehavior/MaterialFlexibleHeader+ShiftBehavior.h",
+  "src/components/FlexibleHeader/src/ShiftBehaviorEnabledWithStatusBar/MDCFlexibleHeaderShiftBehaviorEnabledWithStatusBar.h",
+  "src/components/FlexibleHeader/src/ShiftBehaviorEnabledWithStatusBar/MaterialFlexibleHeader+ShiftBehaviorEnabledWithStatusBar.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderHairline.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderMinMaxHeight.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderMinMaxHeightDelegate.h",
+  "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderShifter.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeAreaDelegate.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderView+Private.h",
@@ -268,6 +271,8 @@ _mdc_public_headers = [
   "src/components/NavigationDrawer/src/MDCBottomDrawerViewController.h",
   "src/components/NavigationDrawer/src/MDCBottomDrawerViewControllerDelegate.h",
   "src/components/NavigationDrawer/src/MaterialNavigationDrawer.h",
+  "src/components/NavigationDrawer/src/Theming/MDCBottomDrawerViewController+MaterialTheming.h",
+  "src/components/NavigationDrawer/src/Theming/MaterialNavigationDrawer+Theming.h",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewController.h",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewControllerDelegate.h",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerHeaderMask.h",
@@ -330,6 +335,7 @@ _mdc_public_headers = [
   "src/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.h",
   "src/components/Snackbar/src/FontThemer/MaterialSnackbar+FontThemer.h",
   "src/components/Snackbar/src/MDCSnackbarAlignment.h",
+  "src/components/Snackbar/src/MDCSnackbarError.h",
   "src/components/Snackbar/src/MDCSnackbarManager.h",
   "src/components/Snackbar/src/MDCSnackbarManagerDelegate.h",
   "src/components/Snackbar/src/MDCSnackbarMessage.h",
@@ -391,7 +397,6 @@ _mdc_public_headers = [
   "src/components/TextControls/src/BaseTextAreas/private/MDCBaseTextAreaTextView.h",
   "src/components/TextControls/src/BaseTextFields/MDCBaseTextField.h",
   "src/components/TextControls/src/BaseTextFields/MaterialTextControls+BaseTextFields.h",
-  "src/components/TextControls/src/BaseTextFields/private/MDCBaseTextFieldLayout.h",
   "src/components/TextControls/src/Enums/MDCTextControlLabelBehavior.h",
   "src/components/TextControls/src/Enums/MDCTextControlState.h",
   "src/components/TextControls/src/Enums/MaterialTextControls+Enums.h",
@@ -411,6 +416,10 @@ _mdc_public_headers = [
   "src/components/TextControls/src/OutlinedTextFields/MaterialTextControls+OutlinedTextFields.h",
   "src/components/TextControls/src/OutlinedTextFieldsTheming/MDCOutlinedTextField+MaterialTheming.h",
   "src/components/TextControls/src/OutlinedTextFieldsTheming/MaterialTextControls+OutlinedTextFieldsTheming.h",
+  "src/components/TextControls/src/UnderlinedTextFields/MDCUnderlinedTextField.h",
+  "src/components/TextControls/src/UnderlinedTextFields/MaterialTextControls+UnderlinedTextFields.h",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming/MDCUnderlinedTextField+MaterialTheming.h",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming/MaterialTextControls+UnderlinedTextFieldsTheming.h",
   "src/components/TextFields/src/ColorThemer/MDCFilledTextFieldColorThemer.h",
   "src/components/TextFields/src/ColorThemer/MaterialTextFields+ColorThemer.h",
   "src/components/TextFields/src/MDCIntrinsicHeightTextView.h",
@@ -468,6 +477,7 @@ _mdc_public_headers = [
   "src/components/private/Icons/icons/ic_check_circle/src/MaterialIcons+ic_check_circle.h",
   "src/components/private/Icons/icons/ic_chevron_right/src/MaterialIcons+ic_chevron_right.h",
   "src/components/private/Icons/icons/ic_color_lens/src/MaterialIcons+ic_color_lens.h",
+  "src/components/private/Icons/icons/ic_feedback/src/MaterialIcons+ic_feedback.h",
   "src/components/private/Icons/icons/ic_help_outline/src/MaterialIcons+ic_help_outline.h",
   "src/components/private/Icons/icons/ic_info/src/MaterialIcons+ic_info.h",
   "src/components/private/Icons/icons/ic_more_horiz/src/MaterialIcons+ic_more_horiz.h",
@@ -508,11 +518,20 @@ _mdc_public_headers = [
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlAssistiveLabelViewLayout.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlColorViewModel.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.h",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioning.h",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioningReference.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelPosition.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlVerticalPositioningReference.h",
   "src/components/private/TextControlsPrivate/src/Shared/MaterialTextControlsPrivate+Shared.h",
   "src/components/private/TextControlsPrivate/src/Shared/UIBezierPath+MDCTextControlStyle.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCTextControlTextField.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCTextControlTextFieldSideViewAlignment.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MaterialTextControlsPrivate+TextFields.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlStyleUnderlined.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlVerticalPositioningReferenceUnderlined.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MaterialTextControlsPrivate+UnderlinedStyle.h",
   "src/components/private/ThumbTrack/src/MDCNumericValueLabel.h",
   "src/components/private/ThumbTrack/src/MDCThumbTrack.h",
   "src/components/private/ThumbTrack/src/MDCThumbView.h",
@@ -543,7 +562,7 @@ _mdc_include_dirs = [
   # List generated by the following commands:
   # $ cd src/ios/third_party/material_components_ios
   # $ find src -path 'src/components/*/src/*.h' -a \! -path '*Test*'|\
-  #   sed -e 's:\(.*\)/[^/]*:    "\1",:'|sort -u
+  #   sed -e 's:\(.*\)/[^/]*:  "\1",:'|sort -u
   "src/components/ActionSheet/src",
   "src/components/ActionSheet/src/ActionSheetThemer",
   "src/components/ActionSheet/src/ColorThemer",
@@ -600,6 +619,8 @@ _mdc_include_dirs = [
   "src/components/FeatureHighlight/src/private",
   "src/components/FlexibleHeader/src",
   "src/components/FlexibleHeader/src/CanAlwaysExpandToMaximumHeight",
+  "src/components/FlexibleHeader/src/ShiftBehavior",
+  "src/components/FlexibleHeader/src/ShiftBehaviorEnabledWithStatusBar",
   "src/components/FlexibleHeader/src/private",
   "src/components/HeaderStackView/src",
   "src/components/HeaderStackView/src/ColorThemer",
@@ -614,6 +635,7 @@ _mdc_include_dirs = [
   "src/components/NavigationBar/src/TypographyThemer",
   "src/components/NavigationDrawer/src",
   "src/components/NavigationDrawer/src/ColorThemer",
+  "src/components/NavigationDrawer/src/Theming",
   "src/components/NavigationDrawer/src/private",
   "src/components/OverlayWindow/src",
   "src/components/PageControl/src",
@@ -647,7 +669,6 @@ _mdc_include_dirs = [
   "src/components/TextControls/src/BaseTextAreas",
   "src/components/TextControls/src/BaseTextAreas/private",
   "src/components/TextControls/src/BaseTextFields",
-  "src/components/TextControls/src/BaseTextFields/private",
   "src/components/TextControls/src/Enums",
   "src/components/TextControls/src/FilledTextAreas",
   "src/components/TextControls/src/FilledTextAreasTheming",
@@ -657,6 +678,8 @@ _mdc_include_dirs = [
   "src/components/TextControls/src/OutlinedTextAreasTheming",
   "src/components/TextControls/src/OutlinedTextFields",
   "src/components/TextControls/src/OutlinedTextFieldsTheming",
+  "src/components/TextControls/src/UnderlinedTextFields",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming",
   "src/components/TextFields/src",
   "src/components/TextFields/src/ColorThemer",
   "src/components/TextFields/src/Theming",
@@ -672,6 +695,7 @@ _mdc_include_dirs = [
   "src/components/private/Icons/icons/ic_check_circle/src",
   "src/components/private/Icons/icons/ic_chevron_right/src",
   "src/components/private/Icons/icons/ic_color_lens/src",
+  "src/components/private/Icons/icons/ic_feedback/src",
   "src/components/private/Icons/icons/ic_help_outline/src",
   "src/components/private/Icons/icons/ic_info/src",
   "src/components/private/Icons/icons/ic_more_horiz/src",
@@ -690,6 +714,8 @@ _mdc_include_dirs = [
   "src/components/private/TextControlsPrivate/src/FilledStyle",
   "src/components/private/TextControlsPrivate/src/OutlinedStyle",
   "src/components/private/TextControlsPrivate/src/Shared",
+  "src/components/private/TextControlsPrivate/src/TextFields",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle",
   "src/components/private/ThumbTrack/src",
   "src/components/private/ThumbTrack/src/private",
   "src/components/private/UIMetrics/src",
@@ -705,7 +731,7 @@ _mdc_sources = [
   # List generated by the following commands:
   # $ cd src/ios/third_party/material_components_ios
   # $ find src -path 'src/components/*/src/*.[hm]' -a \! -path '*Test*'|\
-  #   sed -e 's:\(.*\):    "\1",:'|sort -u
+  #   sed -e 's:\(.*\):  "\1",:'|sort -u
   "src/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.h",
   "src/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetScheme.m",
   "src/components/ActionSheet/src/ActionSheetThemer/MDCActionSheetThemer.h",
@@ -729,6 +755,8 @@ _mdc_sources = [
   "src/components/ActionSheet/src/private/MDCActionSheetHeaderView.m",
   "src/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.h",
   "src/components/ActionSheet/src/private/MDCActionSheetItemTableViewCell.m",
+  "src/components/ActionSheet/src/private/MaterialActionSheetStrings.h",
+  "src/components/ActionSheet/src/private/MaterialActionSheetStrings_table.h",
   "src/components/ActivityIndicator/src/MDCActivityIndicator.h",
   "src/components/ActivityIndicator/src/MDCActivityIndicator.m",
   "src/components/ActivityIndicator/src/MDCActivityIndicatorDelegate.h",
@@ -986,8 +1014,6 @@ _mdc_sources = [
   "src/components/FeatureHighlight/src/MDCFeatureHighlightViewController.h",
   "src/components/FeatureHighlight/src/MDCFeatureHighlightViewController.m",
   "src/components/FeatureHighlight/src/MaterialFeatureHighlight.h",
-  "src/components/FeatureHighlight/src/MaterialFeatureHighlightStrings.h",
-  "src/components/FeatureHighlight/src/MaterialFeatureHighlightStrings_table.h",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.h",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightAnimationController.m",
   "src/components/FeatureHighlight/src/private/MDCFeatureHighlightDismissGestureRecognizer.h",
@@ -1010,11 +1036,17 @@ _mdc_sources = [
   "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewDelegate.h",
   "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewLayoutDelegate.h",
   "src/components/FlexibleHeader/src/MaterialFlexibleHeader.h",
+  "src/components/FlexibleHeader/src/ShiftBehavior/MDCFlexibleHeaderShiftBehavior.h",
+  "src/components/FlexibleHeader/src/ShiftBehavior/MaterialFlexibleHeader+ShiftBehavior.h",
+  "src/components/FlexibleHeader/src/ShiftBehaviorEnabledWithStatusBar/MDCFlexibleHeaderShiftBehaviorEnabledWithStatusBar.h",
+  "src/components/FlexibleHeader/src/ShiftBehaviorEnabledWithStatusBar/MaterialFlexibleHeader+ShiftBehaviorEnabledWithStatusBar.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderHairline.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderHairline.m",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderMinMaxHeight.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderMinMaxHeight.m",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderMinMaxHeightDelegate.h",
+  "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderShifter.h",
+  "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderShifter.m",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.h",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.m",
   "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeAreaDelegate.h",
@@ -1084,6 +1116,9 @@ _mdc_sources = [
   "src/components/NavigationDrawer/src/MDCBottomDrawerViewController.m",
   "src/components/NavigationDrawer/src/MDCBottomDrawerViewControllerDelegate.h",
   "src/components/NavigationDrawer/src/MaterialNavigationDrawer.h",
+  "src/components/NavigationDrawer/src/Theming/MDCBottomDrawerViewController+MaterialTheming.h",
+  "src/components/NavigationDrawer/src/Theming/MDCBottomDrawerViewController+MaterialTheming.m",
+  "src/components/NavigationDrawer/src/Theming/MaterialNavigationDrawer+Theming.h",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewController.h",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewController.m",
   "src/components/NavigationDrawer/src/private/MDCBottomDrawerContainerViewControllerDelegate.h",
@@ -1181,6 +1216,8 @@ _mdc_sources = [
   "src/components/Snackbar/src/FontThemer/MDCSnackbarFontThemer.m",
   "src/components/Snackbar/src/FontThemer/MaterialSnackbar+FontThemer.h",
   "src/components/Snackbar/src/MDCSnackbarAlignment.h",
+  "src/components/Snackbar/src/MDCSnackbarError.h",
+  "src/components/Snackbar/src/MDCSnackbarError.m",
   "src/components/Snackbar/src/MDCSnackbarManager.h",
   "src/components/Snackbar/src/MDCSnackbarManager.m",
   "src/components/Snackbar/src/MDCSnackbarManagerDelegate.h",
@@ -1270,8 +1307,6 @@ _mdc_sources = [
   "src/components/TextControls/src/BaseTextFields/MDCBaseTextField.h",
   "src/components/TextControls/src/BaseTextFields/MDCBaseTextField.m",
   "src/components/TextControls/src/BaseTextFields/MaterialTextControls+BaseTextFields.h",
-  "src/components/TextControls/src/BaseTextFields/private/MDCBaseTextFieldLayout.h",
-  "src/components/TextControls/src/BaseTextFields/private/MDCBaseTextFieldLayout.m",
   "src/components/TextControls/src/Enums/MDCTextControlLabelBehavior.h",
   "src/components/TextControls/src/Enums/MDCTextControlState.h",
   "src/components/TextControls/src/Enums/MDCTextControlState.m",
@@ -1300,6 +1335,12 @@ _mdc_sources = [
   "src/components/TextControls/src/OutlinedTextFieldsTheming/MDCOutlinedTextField+MaterialTheming.h",
   "src/components/TextControls/src/OutlinedTextFieldsTheming/MDCOutlinedTextField+MaterialTheming.m",
   "src/components/TextControls/src/OutlinedTextFieldsTheming/MaterialTextControls+OutlinedTextFieldsTheming.h",
+  "src/components/TextControls/src/UnderlinedTextFields/MDCUnderlinedTextField.h",
+  "src/components/TextControls/src/UnderlinedTextFields/MDCUnderlinedTextField.m",
+  "src/components/TextControls/src/UnderlinedTextFields/MaterialTextControls+UnderlinedTextFields.h",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming/MDCUnderlinedTextField+MaterialTheming.h",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming/MDCUnderlinedTextField+MaterialTheming.m",
+  "src/components/TextControls/src/UnderlinedTextFieldsTheming/MaterialTextControls+UnderlinedTextFieldsTheming.h",
   "src/components/TextFields/src/ColorThemer/MDCFilledTextFieldColorThemer.h",
   "src/components/TextFields/src/ColorThemer/MDCFilledTextFieldColorThemer.m",
   "src/components/TextFields/src/ColorThemer/MaterialTextFields+ColorThemer.h",
@@ -1393,6 +1434,8 @@ _mdc_sources = [
   "src/components/private/Icons/icons/ic_chevron_right/src/MaterialIcons+ic_chevron_right.m",
   "src/components/private/Icons/icons/ic_color_lens/src/MaterialIcons+ic_color_lens.h",
   "src/components/private/Icons/icons/ic_color_lens/src/MaterialIcons+ic_color_lens.m",
+  "src/components/private/Icons/icons/ic_feedback/src/MaterialIcons+ic_feedback.h",
+  "src/components/private/Icons/icons/ic_feedback/src/MaterialIcons+ic_feedback.m",
   "src/components/private/Icons/icons/ic_help_outline/src/MaterialIcons+ic_help_outline.h",
   "src/components/private/Icons/icons/ic_help_outline/src/MaterialIcons+ic_help_outline.m",
   "src/components/private/Icons/icons/ic_info/src/MaterialIcons+ic_info.h",
@@ -1461,14 +1504,28 @@ _mdc_sources = [
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlColorViewModel.m",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.m",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioning.h",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioningReference.h",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlHorizontalPositioningReference.m",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.m",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelPosition.h",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelPosition.m",
   "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlVerticalPositioningReference.h",
+  "src/components/private/TextControlsPrivate/src/Shared/MDCTextControlVerticalPositioningReference.m",
   "src/components/private/TextControlsPrivate/src/Shared/MaterialTextControlsPrivate+Shared.h",
   "src/components/private/TextControlsPrivate/src/Shared/UIBezierPath+MDCTextControlStyle.h",
   "src/components/private/TextControlsPrivate/src/Shared/UIBezierPath+MDCTextControlStyle.m",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCBaseTextFieldLayout.m",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCTextControlTextField.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MDCTextControlTextFieldSideViewAlignment.h",
+  "src/components/private/TextControlsPrivate/src/TextFields/MaterialTextControlsPrivate+TextFields.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlStyleUnderlined.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlStyleUnderlined.m",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlVerticalPositioningReferenceUnderlined.h",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MDCTextControlVerticalPositioningReferenceUnderlined.m",
+  "src/components/private/TextControlsPrivate/src/UnderlinedStyle/MaterialTextControlsPrivate+UnderlinedStyle.h",
   "src/components/private/ThumbTrack/src/MDCNumericValueLabel.h",
   "src/components/private/ThumbTrack/src/MDCNumericValueLabel.m",
   "src/components/private/ThumbTrack/src/MDCThumbTrack.h",
@@ -1508,30 +1565,6 @@ _mdc_sources = [
   "src/components/schemes/Typography/src/Scheming/MaterialTypographyScheme+Scheming.h",
 ]
 
-# TODO(crbug.com/1017165): remove once MaterialComponents is always built
-# as a framework
-if (!ios_third_party_material_components_built_as_framework) {
-  config("mdc_components_ios_public_headers_config") {
-    include_dirs = [ "$root_gen_dir/frameworks/material_components_ios" ]
-  }
-
-  copy("mdc_components_ios_public_headers") {
-    sources = _mdc_public_headers
-    outputs = [ "$root_gen_dir/frameworks/material_components_ios/MaterialComponents/{{source_file_part}}" ]
-    public_configs = [ ":mdc_components_ios_public_headers_config" ]
-  }
-} else {
-  config("public_configs") {
-    visibility = [ ":*" ]
-
-    # This is a hack to allow to include the header using the full path but
-    # still have them function as if they were included using framework style.
-    # TODO(crbug.com/1017165): remove once MaterialComponents is always built
-    # as a framework
-    include_dirs = [ "$root_out_dir/MaterialComponents.framework/Headers" ]
-  }
-}
-
 config("config") {
   visibility = [ ":*" ]
   include_dirs = _mdc_include_dirs
@@ -1544,36 +1577,12 @@ config("disable_deprecated_errors") {
   ]
 }
 
-# This variable is used to build MDC as either an ios_framework_bundle or a
-# source_set if ios_third_party_material_components_built_as_framework is set
-# to true/false.
-# TODO(crbug.com/1017165): remove once MaterialComponents is always built
-# as a framework
-if (ios_third_party_material_components_built_as_framework) {
-  _mdc_target_type = "ios_framework_bundle"
-} else {
-  _mdc_target_type = "source_set"
-}
-
-# This target is there to allow code to include framework headers with the
-# full path while both framework and source_set compilation mode both need
-# to be supported.
-# TODO(crbug.com/1017165): remove once MaterialComponents is always built
-# as a framework
-if (ios_third_party_material_components_built_as_framework) {
-  source_set("material_components_ios_public_headers") {
-    public = _mdc_public_headers
-  }
-}
-
-target(_mdc_target_type, "material_components_ios") {
+ios_framework_bundle("material_components_ios") {
   sources = _mdc_sources
 
-  if (ios_third_party_material_components_built_as_framework) {
-    info_plist = "Info.plist"
-    output_name = "MaterialComponents"
-    public_headers = _mdc_public_headers
-  }
+  info_plist = "Info.plist"
+  output_name = "MaterialComponents"
+  public_headers = _mdc_public_headers
 
   frameworks = [
     "CoreGraphics.framework",
@@ -1592,22 +1601,6 @@ target(_mdc_target_type, "material_components_ios") {
     "//ios/third_party/motion_transitioning_objc",
   ]
 
-  if (!ios_third_party_material_components_built_as_framework) {
-    deps += [ ":mdc_components_ios_public_headers" ]
-  }
-
-  # TODO(crbug.com/1017165): remove once MaterialComponents is always built
-  # as a framework
-  if (ios_third_party_material_components_built_as_framework) {
-    public_deps = [ ":material_components_ios_public_headers" ]
-  }
-
-  if (ios_third_party_material_components_built_as_framework) {
-    public_configs = [ ":public_configs" ]
-  } else {
-    public_configs = [ ":config" ]
-  }
-
   configs -= [
     "//build/config/compiler:chromium_code",
     "//build/config/gcc:symbol_visibility_hidden",
@@ -1624,18 +1617,6 @@ target(_mdc_target_type, "material_components_ios") {
   ]
 }
 
-# TODO(crbug.com/1017165): remove once MaterialComponents is always built
-# as a framework
-if (!ios_third_party_material_components_built_as_framework) {
-  group("material_components_ios+link") {
-    public_deps = [ ":material_components_ios" ]
-  }
-
-  group("material_components_ios+bundle") {
-    public_deps = [ ":material_components_ios" ]
-  }
-}
-
 # Template to declare a bundle_data target to pack localized strings bundle.
 #
 # Arguments
@@ -1693,7 +1674,6 @@ _components = [
   "CollectionCells",
   "Collections",
   "Dialogs",
-  "FeatureHighlight",
   "PageControl",
   "Snackbar",
   "Tabs",
diff --git a/chromium/ios/third_party/webkit/BUILD.gn b/chromium/ios/third_party/webkit/BUILD.gn
index a21975f562e..d5381899a79 100644
--- a/chromium/ios/third_party/webkit/BUILD.gn
+++ b/chromium/ios/third_party/webkit/BUILD.gn
@@ -6,80 +6,87 @@ import("//build/config/gclient_args.gni")
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/zip.gni")
 
-# Using a locally-built WebKit is only supported for Debug simulator builds.
-_build_custom_webkit = checkout_ios_webkit && is_debug && use_ios_simulator
+declare_args() {
+  build_mac_webkit = false
+}
+
+# Using a locally-built iOS WebKit is only supported for simulator builds, and
+# only if not building WebKit for macOS.
+_build_ios_webkit =
+    checkout_ios_webkit && use_ios_simulator && !build_mac_webkit
+_build_mac_webkit = checkout_ios_webkit && build_mac_webkit
 
 group("webkit") {
-  if (_build_custom_webkit) {
+  if (_build_ios_webkit) {
     deps = [ ":bundle_webkit_ios_frameworks" ]
   }
 
   public_configs = [ ":_webkit_ios_config" ]
 }
 
-if (_build_custom_webkit) {
-  # WebKit is built from source using xcodebuild (invoked via the
-  # build_webkit.py wrapper script).  The WebKit build places its output in a
-  # sub-directory named "Release-iphonesimulator" for iOS builds and
-  # "Release" for macOS builds.
-  _webkit_ios_out_base_dir = "$target_out_dir/iOS"
-  _webkit_mac_out_base_dir = "$target_out_dir/macOS"
-
-  _webkit_ios_xcodebuild_out_dir_name = "Release-iphonesimulator"
-  _webkit_mac_xcodebuild_out_dir_name = "Release"
-
-  _webkit_ios_out_product_dir =
-      "$_webkit_ios_out_base_dir/$_webkit_ios_xcodebuild_out_dir_name"
-  _webkit_mac_out_product_dir =
-      "$_webkit_mac_out_base_dir/$_webkit_mac_xcodebuild_out_dir_name"
-
-  template("compile_webkit") {
-    action(target_name) {
-      visibility = [
-        ":bundle_webkit_ios_frameworks",
-        ":copy_webkit_mac_minibrowser",
-        ":webkit",
-      ]
-
-      script = "build_webkit.py"
-
-      inputs = [
-        # Because it's difficult to list every webkit source file as an input
-        # here, use the ChangeLog files as a proxy to determine whether or not
-        # source files have changed.
-        # TODO(crbug.com/934252): This will not pick up local edits to source
-        # files, so find a way to properly rebuild when those change.
-        "src/Tools/ChangeLog",
-        "src/ChangeLog",
-        "src/Source/WebKit/ChangeLog",
-        "src/Source/JavaScriptCore/ChangeLog",
-        "src/Source/WebKitLegacy/ChangeLog",
-        "src/Source/WebKitLegacy/ios/ChangeLog",
-        "src/Source/WebKitLegacy/mac/ChangeLog",
-        "src/Source/bmalloc/ChangeLog",
-        "src/Source/WebCore/ChangeLog",
-        "src/Source/WTF/ChangeLog",
-        "src/Source/ThirdParty/ChangeLog",
-        "src/WebKitLibraries/ChangeLog",
-      ]
-
-      outputs = invoker.outputs
-
-      args = invoker.args
-
-      # TODO(crbug.com/934252): "-j 4" restricts xcodebuild to four simultaneous
-      # jobs. This is intended to prevent overloading the machine, because ninja
-      # will already be spawning a large number of jobs in parallel with
-      # xcodebuild, but it causes the webkit build to run very slowly. Find a way
-      # to increase the parallelism here.
-      args += [
-        "-j",
-        "4",
-        "-quiet",
-      ]
-    }
+# WebKit is built from source using xcodebuild (invoked via the
+# build_webkit.py wrapper script).  The WebKit build places its output in a
+# sub-directory named "Release-iphonesimulator" for iOS builds and
+# "Release" for macOS builds.
+_webkit_ios_out_base_dir = "$target_out_dir/iOS"
+_webkit_mac_out_base_dir = "$target_out_dir/macOS"
+
+_webkit_ios_xcodebuild_out_dir_name = "Release-iphonesimulator"
+_webkit_mac_xcodebuild_out_dir_name = "Release"
+
+_webkit_ios_out_product_dir =
+    "$_webkit_ios_out_base_dir/$_webkit_ios_xcodebuild_out_dir_name"
+_webkit_mac_out_product_dir =
+    "$_webkit_mac_out_base_dir/$_webkit_mac_xcodebuild_out_dir_name"
+
+template("compile_webkit") {
+  action(target_name) {
+    visibility = [
+      ":bundle_webkit_ios_frameworks",
+      ":copy_webkit_mac_minibrowser",
+      ":webkit",
+    ]
+
+    script = "build_webkit.py"
+
+    inputs = [
+      # Because it's difficult to list every webkit source file as an input
+      # here, use the ChangeLog files as a proxy to determine whether or not
+      # source files have changed.
+      # TODO(crbug.com/934252): This will not pick up local edits to source
+      # files, so find a way to properly rebuild when those change.
+      "src/Tools/ChangeLog",
+      "src/ChangeLog",
+      "src/Source/WebKit/ChangeLog",
+      "src/Source/JavaScriptCore/ChangeLog",
+      "src/Source/WebKitLegacy/ChangeLog",
+      "src/Source/WebKitLegacy/ios/ChangeLog",
+      "src/Source/WebKitLegacy/mac/ChangeLog",
+      "src/Source/bmalloc/ChangeLog",
+      "src/Source/WebCore/ChangeLog",
+      "src/Source/WTF/ChangeLog",
+      "src/Source/ThirdParty/ChangeLog",
+      "src/WebKitLibraries/ChangeLog",
+    ]
+
+    outputs = invoker.outputs
+
+    args = invoker.args
+
+    # TODO(crbug.com/934252): "-j 4" restricts xcodebuild to four simultaneous
+    # jobs. This is intended to prevent overloading the machine, because ninja
+    # will already be spawning a large number of jobs in parallel with
+    # xcodebuild, but it causes the webkit build to run very slowly. Find a way
+    # to increase the parallelism here.
+    args += [
+      "-j",
+      "4",
+      "-quiet",
+    ]
   }
+}
 
+if (_build_ios_webkit) {
   compile_webkit("compile_webkit_ios_frameworks") {
     outputs = [
       # The frameworks themselves include many resource files, but as a first
@@ -92,6 +99,7 @@ if (_build_custom_webkit) {
       "$_webkit_ios_out_product_dir/WebKit.framework/WebKit",
       "$_webkit_ios_out_product_dir/WebKitLegacy.framework",
       "$_webkit_ios_out_product_dir/WebKitLegacy.framework/WebKitLegacy",
+      "$_webkit_ios_out_product_dir/WebKitTestRunnerApp.app/Frameworks/libclang_rt.asan_iossim_dynamic.dylib",
       "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc",
       "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc/com.apple.WebKit.Networking.Development",
       "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc",
@@ -102,13 +110,33 @@ if (_build_custom_webkit) {
       "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.xpc/com.apple.WebKit.WebContent.Development",
     ]
     args = [
-      "--ios-simulator",
+      "--ios_simulator",
       "--asan",
       "--output_dir",
       rebase_path("$_webkit_ios_out_base_dir"),
     ]
   }
 
+  bundle_data("bundle_webkit_ios_frameworks") {
+    public_deps = [ ":compile_webkit_ios_frameworks" ]
+
+    sources = [
+      "$_webkit_ios_out_product_dir/JavaScriptCore.framework",
+      "$_webkit_ios_out_product_dir/WebCore.framework",
+      "$_webkit_ios_out_product_dir/WebKit.framework",
+      "$_webkit_ios_out_product_dir/WebKitLegacy.framework",
+      "$_webkit_ios_out_product_dir/WebKitTestRunnerApp.app/Frameworks/libclang_rt.asan_iossim_dynamic.dylib",
+      "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc",
+      "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc",
+      "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.Development.xpc",
+      "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.xpc",
+    ]
+    outputs =
+        [ "{{bundle_contents_dir}}/WebKitFrameworks/{{source_file_part}}" ]
+  }
+}
+
+if (_build_mac_webkit) {
   compile_webkit("compile_webkit_mac_minibrowser") {
     outputs = [ "$_webkit_mac_out_product_dir" ]
     args = [
@@ -132,23 +160,6 @@ if (_build_custom_webkit) {
     ]
   }
 
-  bundle_data("bundle_webkit_ios_frameworks") {
-    public_deps = [ ":compile_webkit_ios_frameworks" ]
-
-    sources = [
-      "$_webkit_ios_out_product_dir/JavaScriptCore.framework",
-      "$_webkit_ios_out_product_dir/WebCore.framework",
-      "$_webkit_ios_out_product_dir/WebKit.framework",
-      "$_webkit_ios_out_product_dir/WebKitLegacy.framework",
-      "$_webkit_ios_out_product_dir/com.apple.WebKit.Networking.xpc",
-      "$_webkit_ios_out_product_dir/com.apple.WebKit.Plugin.64.xpc",
-      "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.Development.xpc",
-      "$_webkit_ios_out_product_dir/com.apple.WebKit.WebContent.xpc",
-    ]
-    outputs =
-        [ "{{bundle_contents_dir}}/WebKitFrameworks/{{source_file_part}}" ]
-  }
-
   action("copy_webkit_mac_minibrowser") {
     script = "copy_webkit_for_clusterfuzz.py"
 
@@ -158,6 +169,8 @@ if (_build_custom_webkit) {
     ]
     outputs = [ "$root_out_dir/WebKitMacOS" ]
 
+    _clang_asan_lib = rebase_path(sources[0], root_build_dir) + "/WebKitTestRunnerApp.app/Contents/Frameworks/libclang_rt.asan_osx_dynamic.dylib"
+
     args = [
       "--output",
       rebase_path(outputs[0], root_build_dir),
@@ -165,6 +178,8 @@ if (_build_custom_webkit) {
       rebase_path(sources[0], root_build_dir),
       "--clusterfuzz_script",
       rebase_path(sources[1], root_build_dir),
+      "--clang_asan_library",
+      "$_clang_asan_lib",
     ]
 
     public_deps = [ ":compile_webkit_mac_minibrowser" ]
@@ -172,7 +187,7 @@ if (_build_custom_webkit) {
 }
 
 config("_webkit_ios_config") {
-  if (_build_custom_webkit) {
+  if (_build_ios_webkit) {
     # From the ld documentation: "Directories specified with -F are searched in
     # the order they appear on the command line and before the default search
     # path."