BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-12 14:27:29 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-13 09:35:20 +0000
commit: c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree: e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ios
parent: 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
download: qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz
130 files changed, 1613 insertions, 614 deletions
diff --git a/chromium/ios/BUILD.gn b/chromium/ios/BUILD.gn
index d6e0e31caa8..167e6ac32b9 100644
--- a/chromium/ios/BUILD.gn
+++ b/chromium/ios/BUILD.gn
@@ -31,7 +31,6 @@ group("all") {
 
       # List all the test targets that need to be built on iOS by default.
       "//ios/chrome/test:all_tests",
-      "//ios/chrome/test/earl_grey:all_tests",
       "//ios/chrome/test/earl_grey2:all_tests",
       "//ios/chrome/test/wpt:all_tests",
       "//ios/components:all_tests",
@@ -41,7 +40,6 @@ group("all") {
       "//ios/web:all_tests",
       "//ios/web/shell/test:all_tests",
       "//ios/web_view:all_tests",
-      "//ios/web_view/shell/test:all_tests",
     ]
   }
 }
diff --git a/chromium/ios/build/chrome_build.gni b/chromium/ios/build/chrome_build.gni
index 95b3cbf1d16..25727fd2ae9 100644
--- a/chromium/ios/build/chrome_build.gni
+++ b/chromium/ios/build/chrome_build.gni
@@ -15,11 +15,11 @@ declare_args() {
   ios_enable_share_extension = true
 
   # Enable credential provider extension.
-  ios_enable_credential_provider_extension = false
+  ios_enable_credential_provider_extension = true
 
   # Label of the target providing implementation for AccountVerificationProvider.
   # Overridden when using the Google-internal repository to build Chrome on iOS.
-  ios_account_verification_provider_target = "//ios/chrome/common/credential_provider:account_verification_provider_implementation"
+  ios_account_verification_provider_target = "//ios/chrome/credential_provider_extension:account_verification_provider_implementation"
 
   # Enable use of SceneDelegate-driven startup flow in
   # Info.plist.
@@ -37,6 +37,10 @@ declare_args() {
   # List of plist templates to merge when generating chrome Info.plist.
   ios_chrome_info_plist_additions = []
 
+  # List of targets used to generate the plist listed in
+  # ios_chrome_info_plist_additions variable (if any).
+  ios_chrome_info_plist_addition_targets = []
+
   # List of plist templates to merge when generating chrome entitlements.
   ios_chrome_entitlements_additions = []
 
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index 0d6f14bfd02..0a1c2afb580 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -10,7 +10,6 @@ import("//ios/build/chrome_build.gni")
 import("//ios/build/config.gni")
 import("//ios/chrome/features.gni")
 import("//ios/public/provider/chrome/browser/build_config.gni")
-import("//ios/third_party/features.gni")
 
 source_set("app") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -49,6 +48,7 @@ source_set("unit_tests") {
     "//components/prefs",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
     "//ios/chrome/app/application_delegate:tab_opening",
+    "//ios/chrome/app/application_delegate:url_opener_params",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
@@ -59,6 +59,7 @@ source_set("unit_tests") {
     "//ios/public/provider/chrome/browser:test_support",
     "//ios/public/provider/chrome/browser/distribution",
     "//ios/testing:block_swizzler",
+    "//ios/third_party/material_components_ios",
     "//ios/web/public/test:test",
     "//testing/gtest",
     "//third_party/ocmock",
@@ -95,6 +96,12 @@ tweak_info_plist("info_plist") {
   } else if (ios_enable_scene_startup) {
     info_plists += [ "resources/MultiWindowDisabled+Info.plist" ]
   }
+  if (ios_chrome_info_plist_addition_targets != []) {
+    if (!defined(deps)) {
+      deps = []
+    }
+    deps += ios_chrome_info_plist_addition_targets
+  }
   args = [
     "--breakpad=$breakpad_enabled_as_int",
     "--branding=$chromium_short_name",
@@ -130,6 +137,7 @@ source_set("app_internal") {
 
   deps = [
     ":app",
+    ":blocking_scene_commands",
     ":mode",
     ":tests_hook",
     "//base",
@@ -162,6 +170,7 @@ source_set("app_internal") {
     "//ios/chrome/app/application_delegate",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
     "//ios/chrome/app/application_delegate:tab_opening",
+    "//ios/chrome/app/application_delegate:url_opener_params",
     "//ios/chrome/app/intents",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
@@ -176,6 +185,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
+    "//ios/chrome/browser/credential_provider",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/external_files",
     "//ios/chrome/browser/favicon",
@@ -258,6 +268,13 @@ source_set("app_internal") {
   ]
 }
 
+source_set("blocking_scene_commands") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "blocking_scene_commands.h" ]
+
+  deps = [ "//base" ]
+}
+
 source_set("mode") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [ "application_mode.h" ]
@@ -279,21 +296,33 @@ source_set("main") {
     "//ios/testing/perf:startup",
   ]
 
-  if (ios_third_party_material_components_built_as_framework) {
-    if (ios_chrome_links_with_material_components_framework) {
-      deps += [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    } else {
-      assert_no_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    }
+  if (ios_chrome_links_with_material_components_framework) {
+    deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  } else {
+    assert_no_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
   }
 }
 
+source_set("multitasking_test_app_delegate") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "multitasking_test_application_delegate.h",
+    "multitasking_test_application_delegate.mm",
+  ]
+  deps = [
+    ":app_internal",
+    "//base",
+    "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/third_party/material_components_ios",
+  ]
+}
+
 ios_app_bundle("chrome") {
   output_name = chromium_short_name
 
@@ -350,18 +379,16 @@ ios_app_bundle("chrome") {
 
   assert_no_deps = ios_assert_no_deps + ios_chrome_extra_assert_no_deps
 
-  if (ios_third_party_material_components_built_as_framework) {
-    if (ios_chrome_links_with_material_components_framework) {
-      deps += [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    } else {
-      assert_no_deps += [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    }
+  if (ios_chrome_links_with_material_components_framework) {
+    deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  } else {
+    assert_no_deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
   }
 }
 
diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn
index 27f5d104251..2570282b03d 100644
--- a/chromium/ios/chrome/app/application_delegate/BUILD.gn
+++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn
@@ -33,6 +33,7 @@ source_set("unit_tests") {
     "memory_warning_helper_unittest.mm",
     "metric_kit_subscriber_unittest.mm",
     "metrics_mediator_unittest.mm",
+    "url_opener_params_unittest.mm",
     "url_opener_unittest.mm",
     "user_activity_handler_unittest.mm",
   ]
@@ -42,6 +43,7 @@ source_set("unit_tests") {
     ":metric_kit_subscriber",
     ":tab_opening",
     ":test_support",
+    ":url_opener_params",
     "//base",
     "//base/test:test_support",
     "//components/handoff",
@@ -106,6 +108,7 @@ source_set("tab_opening") {
     "//base",
     "//ios/chrome/app",
     "//ios/chrome/app:mode",
+    "//ios/chrome/browser/main:public",
     "//ui/base",
   ]
   libs = [
@@ -114,6 +117,15 @@ source_set("tab_opening") {
   ]
 }
 
+source_set("url_opener_params") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "url_opener_params.h",
+    "url_opener_params.mm",
+  ]
+  deps = [ "//base" ]
+}
+
 source_set("metric_kit_subscriber") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -148,6 +160,7 @@ source_set("application_delegate_internal") {
     ":application_delegate",
     ":ios_enable_metrickit_buildflags",
     ":tab_opening",
+    ":url_opener_params",
     "//base",
     "//build:branding_buildflags",
     "//components/crash/core/common",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index 3920120813d..16573b0e110 100644
--- a/chromium/ios/chrome/app/startup/BUILD.gn
+++ b/chromium/ios/chrome/app/startup/BUILD.gn
@@ -55,6 +55,7 @@ source_set("startup") {
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/net:net",
     "//ios/chrome/browser/ntp_snippets",
+    "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/common",
     "//ios/chrome/common/app_group",
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index 4522a597c55..0f719a8e6fc 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -100,7 +100,6 @@ source_set("browser") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/complex_tasks",
     "//ios/chrome/browser/download",
-    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/itunes_urls",
     "//ios/chrome/browser/signin:feature_flags",
     "//ios/chrome/browser/ssl:feature_flags",
@@ -185,8 +184,8 @@ source_set("pref_names") {
 source_set("browser_impl") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "application_context_impl.cc",
     "application_context_impl.h",
+    "application_context_impl.mm",
     "ios_chrome_main_parts.h",
     "ios_chrome_main_parts.mm",
   ]
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index bdf8ad7dec0..14875dfa48d 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -162,10 +162,12 @@ source_set("unit_tests") {
     "//components/autofill/ios/form_util:test_support",
     "//components/infobars/core",
     "//components/keyed_service/core",
+    "//components/password_manager/ios",
     "//components/security_state/ios",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
@@ -345,7 +347,12 @@ bundle_data("unit_tests_bundle_data") {
     "//components/test/data/autofill/heuristics/input/155_fmm-ja_inm.gob.mx.html",
     "//components/test/data/autofill/heuristics/input/156_buyAlbum_bandcamp.com_price.html",
     "//components/test/data/autofill/heuristics/input/157_bug_971402_opentable_checkout.html",
+    "//components/test/data/autofill/heuristics/input/158_i18n_ml.html",
     "//components/test/data/autofill/heuristics/input/159_bug_966406_transavia.com.html",
+    "//components/test/data/autofill/heuristics/input/160_credit_card_ignore_birthday_fields.html",
+    "//components/test/data/autofill/heuristics/input/161_i18n_tr.html",
+    "//components/test/data/autofill/heuristics/input/162_i18n_tr2.html",
+    "//components/test/data/autofill/heuristics/input/163_giftcard_hotels.com.html",
     "//components/test/data/autofill/heuristics/output/000_i18n_de.out",
     "//components/test/data/autofill/heuristics/output/001_i18n_de2.out",
     "//components/test/data/autofill/heuristics/output/002_i18n_en.out",
@@ -503,7 +510,12 @@ bundle_data("unit_tests_bundle_data") {
     "//components/test/data/autofill/heuristics/output/155_fmm-ja_inm.gob.mx.out",
     "//components/test/data/autofill/heuristics/output/156_buyAlbum_bandcamp.com_price.out",
     "//components/test/data/autofill/heuristics/output/157_bug_971402_opentable_checkout.out",
+    "//components/test/data/autofill/heuristics/output/158_i18n_ml.out",
     "//components/test/data/autofill/heuristics/output/159_bug_966406_transavia.com.out",
+    "//components/test/data/autofill/heuristics/output/160_credit_card_ignore_birthday_fields.out",
+    "//components/test/data/autofill/heuristics/output/161_i18n_tr.out",
+    "//components/test/data/autofill/heuristics/output/162_i18n_tr2.out",
+    "//components/test/data/autofill/heuristics/output/163_giftcard_hotels.com.out",
   ]
   outputs = [ "{{bundle_resources_dir}}/" +
               "{{source_root_relative_dir}}/{{source_file_part}}" ]
diff --git a/chromium/ios/chrome/browser/content_settings/BUILD.gn b/chromium/ios/chrome/browser/content_settings/BUILD.gn
index 83696d4f217..10ce926d19b 100644
--- a/chromium/ios/chrome/browser/content_settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/content_settings/BUILD.gn
@@ -8,13 +8,39 @@ source_set("content_settings") {
     "cookie_settings_factory.h",
     "host_content_settings_map_factory.cc",
     "host_content_settings_map_factory.h",
+    "ios_cookie_blocker.h",
+    "ios_cookie_blocker.mm",
+    "ios_cookie_blocker_factory.h",
+    "ios_cookie_blocker_factory.mm",
   ]
   deps = [
     "//base",
     "//components/content_settings/core/browser",
+    "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/prefs",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list/web_usage_enabler",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "ios_cookie_blocker_unittest.mm" ]
+  deps = [
+    ":content_settings",
+    "//base/test:test_support",
+    "//components/content_settings/core/browser",
+    "//components/prefs",
+    "//components/sync_preferences:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/web/public/test",
+    "//testing/gtest",
   ]
 }
diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn
index e6a44720046..e771205e75e 100644
--- a/chromium/ios/chrome/browser/crash_report/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn
@@ -25,6 +25,7 @@ source_set("crash_report") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":constants",
     "//base",
     "//components/crash/core/common",
     "//components/upload_list",
@@ -37,11 +38,17 @@ source_set("crash_report") {
   ]
 }
 
+source_set("constants") {
+  sources = [ "crash_reporter_breadcrumb_constants.h" ]
+}
+
 source_set("crash_report_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "crash_report_helper.h",
     "crash_report_helper.mm",
+    "crash_reporter_url_observer.h",
+    "crash_reporter_url_observer.mm",
     "crash_restore_helper.h",
     "crash_restore_helper.mm",
   ]
@@ -79,9 +86,11 @@ source_set("unit_tests") {
     "breakpad_helper_unittest.mm",
     "crash_loop_detection_util_unittest.mm",
     "crash_reporter_breadcrumb_observer_unittest.mm",
+    "crash_reporter_url_observer_unittest.mm",
     "crash_restore_helper_unittest.mm",
   ]
   deps = [
+    ":constants",
     ":crash_report",
     ":crash_report_internal",
     "//base",
@@ -92,6 +101,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test/ocmock",
     "//ios/testing:block_swizzler",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
index 33181e2d583..640bba38450 100644
--- a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
@@ -21,8 +21,11 @@ source_set("breadcrumbs") {
     "//components/keyed_service/ios",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/crash_report:constants",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/web_state_list",
     "//ios/net",
     "//ios/web/public",
@@ -81,9 +84,15 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/crash_report",
+    "//ios/chrome/browser/crash_report:constants",
+    "//ios/chrome/browser/download",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/web_content_area",
+    "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web:test_support",
diff --git a/chromium/ios/chrome/browser/credential_provider/BUILD.gn b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
index 83606af1cc3..1c2e1ef969d 100644
--- a/chromium/ios/chrome/browser/credential_provider/BUILD.gn
+++ b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
@@ -26,10 +26,13 @@ source_set("credential_provider") {
     "//components/keyed_service/ios",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/browser:affiliation",
+    "//components/signin/public/identity_manager",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/signin",
     "//ios/chrome/common/app_group",
     "//ios/chrome/common/credential_provider",
+    "//ios/public/provider/chrome/browser/signin",
     "//url",
   ]
   libs = [
@@ -58,9 +61,15 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/autofill/core/common",
     "//components/password_manager/core/browser:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/common/app_group",
     "//ios/chrome/common/credential_provider",
     "//ios/chrome/common/credential_provider:ui",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
+    "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/web/public/test",
     "//testing/gtest",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
index 39e2e453fd0..2ca719c0475 100644
--- a/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
+++ b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
@@ -7,14 +7,23 @@ source_set("drag_and_drop") {
   sources = [
     "drag_and_drop_flag.h",
     "drag_and_drop_flag.mm",
+    "drag_item_util.h",
+    "drag_item_util.mm",
     "drop_and_navigate_delegate.h",
     "drop_and_navigate_interaction.h",
     "drop_and_navigate_interaction.mm",
+    "table_view_url_drag_drop_handler.h",
+    "table_view_url_drag_drop_handler.mm",
+    "url_drag_drop_handler.h",
+    "url_drag_drop_handler.mm",
   ]
   deps = [
     "//base",
-    "//net:net",
-    "//url:url",
+    "//ios/chrome/browser/web:tab_id_tab_helper",
+    "//ios/chrome/browser/window_activities",
+    "//ios/web/public",
+    "//net",
+    "//url",
   ]
   libs = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn
index 07a7bf69c56..ea218522d36 100644
--- a/chromium/ios/chrome/browser/flags/BUILD.gn
+++ b/chromium/ios/chrome/browser/flags/BUILD.gn
@@ -26,6 +26,8 @@ source_set("flags") {
     "//components/omnibox/common",
     "//components/password_manager/core/common",
     "//components/payments/core",
+    "//components/policy:generated",
+    "//components/policy/core/common:common_constants",
     "//components/safe_browsing/core:features",
     "//components/search_provider_logos",
     "//components/security_state/core",
@@ -47,6 +49,7 @@ source_set("flags") {
     "//ios/chrome/browser/passwords:feature_flags",
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/download:features",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
index 1eaea91c930..3272002eb84 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
@@ -9,6 +9,8 @@ source_set("overlays") {
     "infobar_banner_overlay_request_cancel_handler.mm",
     "infobar_modal_completion_notifier.h",
     "infobar_modal_completion_notifier.mm",
+    "infobar_modal_overlay_request_cancel_handler.h",
+    "infobar_modal_overlay_request_cancel_handler.mm",
     "infobar_overlay_request_cancel_handler.h",
     "infobar_overlay_request_cancel_handler.mm",
     "infobar_overlay_request_factory.h",
@@ -20,6 +22,8 @@ source_set("overlays") {
     "infobar_overlay_tab_helper.mm",
     "translate_infobar_placeholder_overlay_request_cancel_handler.h",
     "translate_infobar_placeholder_overlay_request_cancel_handler.mm",
+    "translate_overlay_tab_helper.h",
+    "translate_overlay_tab_helper.mm",
   ]
   public_deps = [ ":overlay_type" ]
   deps = [
@@ -66,6 +70,8 @@ source_set("test_support") {
   sources = [
     "fake_infobar_overlay_request_factory.h",
     "fake_infobar_overlay_request_factory.mm",
+    "fake_translate_overlay_tab_helper.h",
+    "fake_translate_overlay_tab_helper.mm",
   ]
   deps = [
     ":overlays",
@@ -82,12 +88,14 @@ source_set("unit_tests") {
   sources = [
     "infobar_banner_overlay_request_cancel_handler_unittest.mm",
     "infobar_modal_completion_notifier_unittest.mm",
+    "infobar_modal_overlay_request_cancel_handler_unittest.mm",
     "infobar_overlay_request_cancel_handler_unittest.mm",
     "infobar_overlay_request_factory_impl_unittest.mm",
     "infobar_overlay_request_inserter_unittest.mm",
     "infobar_overlay_tab_helper_unittest.mm",
     "infobar_overlay_util_unittest.mm",
     "translate_infobar_placeholder_overlay_request_cancel_handler_unittest.mm",
+    "translate_overlay_tab_helper_unittest.mm",
   ]
   deps = [
     ":overlays",
@@ -102,6 +110,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common",
     "//ios/chrome/browser/overlays/public/common/infobars",
@@ -110,9 +119,12 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
+    "//ios/chrome/browser/translate:test_support",
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
index f6c25a75476..6c9e836dbb9 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
@@ -30,7 +30,10 @@ source_set("browser_agent_util") {
   deps = [
     ":browser_agent",
     "//base",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/infobars:feature_flags",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
index cb01bbd46bd..fa16ba157bb 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
@@ -16,6 +16,8 @@ source_set("common") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/infobars/overlays:util",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
     "//ios/chrome/browser/overlays",
@@ -29,6 +31,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "infobar_banner_interaction_handler_unittest.mm",
     "infobar_banner_overlay_request_callback_installer_unittest.mm",
     "infobar_modal_overlay_request_callback_installer_unittest.mm",
   ]
@@ -38,6 +41,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/test",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
     "//ios/chrome/browser/infobars/test",
@@ -48,6 +53,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/passwords/test",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn
new file mode 100644
index 00000000000..bc0ce8f9e88
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright 2020 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.
+
+source_set("confirm") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "confirm_infobar_banner_interaction_handler.h",
+    "confirm_infobar_banner_interaction_handler.mm",
+    "confirm_infobar_interaction_handler.h",
+    "confirm_infobar_interaction_handler.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/commands",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "confirm_infobar_banner_interaction_handler_unittest.mm" ]
+  deps = [
+    ":confirm",
+    "//base/test:test_support",
+    "//components/infobars/core:feature_flags",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn
new file mode 100644
index 00000000000..65a387ce7a4
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn
@@ -0,0 +1,70 @@
+# Copyright 2020 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.
+
+source_set("save_card") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "save_card_infobar_banner_interaction_handler.h",
+    "save_card_infobar_banner_interaction_handler.mm",
+    "save_card_infobar_banner_overlay_request_callback_installer.h",
+    "save_card_infobar_banner_overlay_request_callback_installer.mm",
+    "save_card_infobar_interaction_handler.h",
+    "save_card_infobar_interaction_handler.mm",
+    "save_card_infobar_modal_interaction_handler.h",
+    "save_card_infobar_modal_interaction_handler.mm",
+    "save_card_infobar_modal_overlay_request_callback_installer.h",
+    "save_card_infobar_modal_overlay_request_callback_installer.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/autofill/core/browser",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/web_state_list",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "save_card_infobar_banner_interaction_handler_unittest.mm",
+    "save_card_infobar_banner_overlay_request_callback_installer_unittest.mm",
+    "save_card_infobar_modal_interaction_handler_unittest.mm",
+    "save_card_infobar_modal_overlay_request_callback_installer_unittest.mm",
+  ]
+  deps = [
+    ":save_card",
+    "//base/test:test_support",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core:feature_flags",
+    "//components/prefs",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
index dd9040c54ce..cca2b0ddd2e 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
@@ -5,17 +5,30 @@
 source_set("test") {
   testonly = true
   sources = [
+    "mock_autofill_save_card_infobar_delegate_mobile.h",
+    "mock_autofill_save_card_infobar_delegate_mobile.mm",
     "mock_infobar_interaction_handler.h",
     "mock_infobar_interaction_handler.mm",
+    "mock_save_card_banner_infobar_interaction_handler.h",
+    "mock_save_card_banner_infobar_interaction_handler.mm",
+    "mock_save_card_modal_infobar_interaction_handler.h",
+    "mock_save_card_modal_infobar_interaction_handler.mm",
+    "mock_translate_infobar_interaction_handler.h",
+    "mock_translate_infobar_interaction_handler.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
     "//base",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/prefs",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/overlays/public/infobar_banner",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn
new file mode 100644
index 00000000000..06075ba9e35
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn
@@ -0,0 +1,70 @@
+# Copyright 2020 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.
+
+source_set("translate") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "translate_infobar_banner_interaction_handler.h",
+    "translate_infobar_banner_interaction_handler.mm",
+    "translate_infobar_interaction_handler.h",
+    "translate_infobar_interaction_handler.mm",
+    "translate_infobar_modal_interaction_handler.h",
+    "translate_infobar_modal_interaction_handler.mm",
+    "translate_infobar_modal_overlay_request_callback_installer.h",
+    "translate_infobar_modal_overlay_request_callback_installer.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/metrics",
+    "//components/strings:components_strings_grit",
+    "//components/translate/core/browser",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers:interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/translate:public",
+    "//ios/chrome/browser/web_state_list",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "translate_infobar_banner_interaction_handler_unittest.mm",
+    "translate_infobar_modal_interaction_handler_unittest.mm",
+    "translate_infobar_modal_overlay_request_callback_installer_unittest.mm",
+  ]
+  deps = [
+    ":translate",
+    "//base/test:test_support",
+    "//components/infobars/core:feature_flags",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/translate:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn
index b3388ff1caf..e05ce199b5c 100644
--- a/chromium/ios/chrome/browser/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/main/BUILD.gn
@@ -32,6 +32,8 @@ source_set("main") {
     "browser_list_factory.mm",
     "browser_list_impl.h",
     "browser_list_impl.mm",
+    "browser_util.h",
+    "browser_util.mm",
     "browser_web_state_list_delegate.h",
     "browser_web_state_list_delegate.mm",
   ]
@@ -56,6 +58,7 @@ source_set("main") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
@@ -79,7 +82,6 @@ source_set("test_support") {
     "//base",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
@@ -93,6 +95,7 @@ source_set("unit_tests") {
     "all_web_state_list_observation_registrar_unittest.mm",
     "browser_impl_unittest.mm",
     "browser_list_impl_unittest.mm",
+    "browser_util_unittest.mm",
   ]
   deps = [
     ":main",
@@ -101,6 +104,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn
index 3ad4c1b2340..70a6d041fa5 100644
--- a/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn
+++ b/chromium/ios/chrome/browser/overlays/public/infobar_banner/BUILD.gn
@@ -8,6 +8,10 @@ source_set("infobar_banner") {
     "confirm_infobar_banner_overlay_request_config.mm",
     "infobar_banner_overlay_responses.cc",
     "infobar_banner_overlay_responses.h",
+    "infobar_banner_placeholder_request_config.h",
+    "infobar_banner_placeholder_request_config.mm",
+    "save_card_infobar_banner_overlay_request_config.h",
+    "save_card_infobar_banner_overlay_request_config.mm",
     "save_password_infobar_banner_overlay.h",
     "save_password_infobar_banner_overlay.mm",
     "translate_infobar_banner_overlay_request_config.h",
@@ -18,12 +22,14 @@ source_set("infobar_banner") {
 
   deps = [
     "//base",
+    "//components/autofill/core/browser",
     "//components/infobars/core",
     "//components/translate/core/browser",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars/overlays:overlay_type",
     "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common",
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/ui/infobars:infobars_ui",
diff --git a/chromium/ios/chrome/browser/overlays/public/infobar_modal/BUILD.gn b/chromium/ios/chrome/browser/overlays/public/infobar_modal/BUILD.gn
index 3dd00adc7b7..0a6cb5591df 100644
--- a/chromium/ios/chrome/browser/overlays/public/infobar_modal/BUILD.gn
+++ b/chromium/ios/chrome/browser/overlays/public/infobar_modal/BUILD.gn
@@ -10,6 +10,10 @@ source_set("infobar_modal") {
     "password_infobar_modal_overlay_request_config.mm",
     "password_infobar_modal_overlay_responses.h",
     "password_infobar_modal_overlay_responses.mm",
+    "save_card_infobar_modal_overlay_request_config.h",
+    "save_card_infobar_modal_overlay_request_config.mm",
+    "save_card_infobar_modal_overlay_responses.h",
+    "save_card_infobar_modal_overlay_responses.mm",
     "translate_infobar_modal_overlay_request_config.h",
     "translate_infobar_modal_overlay_request_config.mm",
     "translate_infobar_modal_overlay_responses.h",
@@ -20,10 +24,12 @@ source_set("infobar_modal") {
 
   deps = [
     "//base",
+    "//components/autofill/core/browser",
     "//components/translate/core/browser",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/passwords:infobar_delegates",
+    "//ios/chrome/browser/ui/autofill:autofill_message",
   ]
 }
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index cfabc6f356b..dbeb216cec2 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -9,6 +9,10 @@ source_set("passwords") {
   sources = [
     "credential_manager.h",
     "credential_manager.mm",
+    "ios_chrome_bulk_leak_check_service_factory.cc",
+    "ios_chrome_bulk_leak_check_service_factory.h",
+    "ios_chrome_password_check_manager.h",
+    "ios_chrome_password_check_manager.mm",
     "ios_chrome_password_manager_client.h",
     "ios_chrome_password_manager_client.mm",
     "ios_chrome_password_manager_driver.h",
@@ -25,6 +29,8 @@ source_set("passwords") {
     "js_credential_manager.mm",
     "notify_auto_signin_view_controller.h",
     "notify_auto_signin_view_controller.mm",
+    "password_check_observer_bridge.h",
+    "password_check_observer_bridge.mm",
     "password_controller.h",
     "password_controller.mm",
     "password_form_filler.h",
@@ -158,6 +164,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "credential_manager_unittest.mm",
+    "ios_chrome_password_check_manager_unittest.mm",
     "ios_chrome_password_manager_client_unittest.mm",
     "js_credential_manager_unittest.mm",
     "password_controller_js_unittest.mm",
diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn
index ffb7aa1c158..76ea32dfdef 100644
--- a/chromium/ios/chrome/browser/policy/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/BUILD.gn
@@ -30,6 +30,8 @@ source_set("policy") {
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/search_engines",
     "//components/translate/core/browser:translate_pref_names",
+    "//components/variations",
+    "//components/variations/service",
     "//ios/chrome/browser",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index 8bcacabea99..043d7af9267 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -84,9 +84,12 @@ source_set("eg_tests") {
   testonly = true
   sources = [ "prerender_egtest.mm" ]
   deps = [
+    "//components/version_info",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
+    "//ios/web/common:user_agent",
     "//ios/web/public/test/http_server",
     "//net:test_support",
   ]
@@ -106,9 +109,12 @@ source_set("eg2_tests") {
   testonly = true
   sources = [ "prerender_egtest.mm" ]
   deps = [
+    "//components/version_info",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/common:user_agent",
     "//net:test_support",
   ]
   libs = [ "UIKit.framework" ]
diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn
index ba54c654ffa..39ba17c8e37 100644
--- a/chromium/ios/chrome/browser/providers/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/BUILD.gn
@@ -20,6 +20,7 @@ source_set("providers") {
     "//ios/chrome/browser/providers/images",
     "//ios/chrome/browser/providers/signin",
     "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/distribution",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/spotlight",
diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
index 381fb117c3e..c71a0460400 100644
--- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
@@ -7,6 +7,8 @@ import("//ios/features.gni")
 
 source_set("safe_browsing") {
   sources = [
+    "pending_unsafe_resource_storage.h",
+    "pending_unsafe_resource_storage.mm",
     "safe_browsing_blocking_page.h",
     "safe_browsing_blocking_page.mm",
     "safe_browsing_error.h",
@@ -23,7 +25,6 @@ source_set("safe_browsing") {
   ]
 
   deps = [
-    ":allow_list",
     ":util",
     "//base",
     "//build:branding_buildflags",
@@ -31,10 +32,12 @@ source_set("safe_browsing") {
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/browser",
     "//components/safe_browsing/core/common",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/safe_browsing/core/db",
     "//components/safe_browsing/core/db:database_manager",
     "//components/safe_browsing/core/db:v4_local_database_manager",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
     "//ios/chrome/browser",
@@ -55,21 +58,6 @@ source_set("safe_browsing") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("allow_list") {
-  sources = [
-    "safe_browsing_url_allow_list.h",
-    "safe_browsing_url_allow_list.mm",
-  ]
-
-  deps = [
-    "//components/safe_browsing/core/db:v4_protocol_manager_util",
-    "//ios/web/public",
-    "//url",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("test_support") {
   testonly = true
   sources = [
@@ -97,16 +85,44 @@ source_set("util") {
   deps = [
     "//base",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
+    "//ios/web/public",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "safe_browsing_egtest.mm" ]
+  deps = [
+    "//base",
+    "//components/safe_browsing/core:features",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/common:features",
+    "//ios/web/public/test:element_selector",
+    "//ios/web/public/test/http_server",
+    "//net:test_support",
+    "//ui/base",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "pending_unsafe_resource_storage_unittest.mm",
     "safe_browsing_blocking_page_unittest.mm",
     "safe_browsing_service_unittest.mm",
     "safe_browsing_tab_helper_unittest.mm",
@@ -116,7 +132,6 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":allow_list",
     ":safe_browsing",
     ":test_support",
     "//base/test:test_support",
@@ -133,6 +148,7 @@ source_set("unit_tests") {
     "//components/safe_browsing/core/db:v4_get_hash_protocol_manager",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
     "//components/safe_browsing/core/db:v4_test_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core:unsafe_resource",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/prerender",
diff --git a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
index fca8615d109..133780dfaae 100644
--- a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
+++ b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
@@ -5,8 +5,8 @@
 source_set("send_tab_to_self") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "ios_send_tab_to_self_infobar_delegate.cc",
     "ios_send_tab_to_self_infobar_delegate.h",
+    "ios_send_tab_to_self_infobar_delegate.mm",
     "send_tab_to_self_browser_agent.h",
     "send_tab_to_self_browser_agent.mm",
     "send_tab_to_self_util.h",
diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn
index 1418ea3600f..bd34fd22955 100644
--- a/chromium/ios/chrome/browser/sessions/BUILD.gn
+++ b/chromium/ios/chrome/browser/sessions/BUILD.gn
@@ -55,6 +55,7 @@ source_set("restoration_agent") {
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:page_placeholder",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 83dcebb8d60..9a3e347524f 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -117,6 +117,7 @@ source_set("test_support") {
     "//ios/chrome/browser/sync",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
+    "//ios/public/provider/chrome/browser/signin:test_support",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/sync/sessions/BUILD.gn b/chromium/ios/chrome/browser/sync/sessions/BUILD.gn
index 75f3e1a060e..dd28d3a6cba 100644
--- a/chromium/ios/chrome/browser/sync/sessions/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/sessions/BUILD.gn
@@ -17,6 +17,7 @@ source_set("sessions") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 273087236d3..aa6662b8f1e 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -9,8 +9,6 @@ source_set("tabs") {
     "tab_helper_delegate_installer.h",
     "tab_helper_util.h",
     "tab_model.h",
-    "tab_model_list.h",
-    "tab_model_list_observer.h",
     "tab_parenting_global_observer.cc",
     "tab_parenting_global_observer.h",
     "tab_title_util.h",
@@ -37,7 +35,6 @@ source_set("tabs_internal") {
     "synced_window_delegate_browser_agent.mm",
     "tab_helper_util.mm",
     "tab_model.mm",
-    "tab_model_list.mm",
     "tab_parenting_observer.h",
     "tab_parenting_observer.mm",
     "tab_title_util.h",
@@ -55,6 +52,7 @@ source_set("tabs_internal") {
     "//components/password_manager/ios",
     "//components/profile_metrics",
     "//components/safe_browsing/core:features",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_state/ios",
     "//components/strings",
     "//ios/chrome/browser",
@@ -81,6 +79,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_browser_agent",
     "//ios/chrome/browser/network_activity:tab_helper",
+    "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/open_in",
     "//ios/chrome/browser/overscroll_actions",
     "//ios/chrome/browser/passwords",
@@ -89,7 +88,6 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/safe_browsing",
-    "//ios/chrome/browser/safe_browsing:allow_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
@@ -131,7 +129,6 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "tab_helper_delegate_installer_unittest.mm",
-    "tab_model_list_unittest.mm",
     "tab_model_unittest.mm",
     "tab_title_util_unittest.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index 92e86b4e597..da76e5964dd 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -2,37 +2,28 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("activity_services_ui") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "activity_type_util.h",
-    "activity_type_util.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/app/strings:ios_strings",
-    "//ui/base",
-  ]
-  libs = [ "UIKit.framework" ]
-}
-
 source_set("activity_services") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "activity_scenario.h",
     "activity_service_coordinator.h",
     "activity_service_coordinator.mm",
+    "activity_service_histograms.h",
+    "activity_service_histograms.mm",
     "activity_service_mediator.h",
     "activity_service_mediator.mm",
+    "activity_type_util.h",
+    "activity_type_util.mm",
     "canonical_url_retriever.h",
     "canonical_url_retriever.mm",
   ]
   deps = [
-    ":activity_services_ui",
     "//base",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/prefs",
     "//components/ui_metrics",
+    "//ios/chrome/app/strings:ios_strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
@@ -62,7 +53,6 @@ source_set("unit_tests") {
   ]
   deps = [
     ":activity_services",
-    ":activity_services_ui",
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/browser",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
index a5109367733..22bde5fc79a 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
@@ -44,7 +44,6 @@ source_set("activities") {
     "//ios/chrome/browser/ui/activity_services/data",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/util",
     "//ios/web/common:user_agent",
     "//ios/web/public",
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index fb1af2924a1..d99068aa954 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -14,8 +14,6 @@ source_set("authentication") {
     "authentication_flow_performer_delegate.h",
     "authentication_ui_util.h",
     "authentication_ui_util.mm",
-    "chrome_signin_view_controller.h",
-    "chrome_signin_view_controller.mm",
     "re_signin_infobar_delegate.h",
     "re_signin_infobar_delegate.mm",
     "resized_avatar_cache.h",
@@ -44,7 +42,6 @@ source_set("authentication") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
@@ -97,7 +94,6 @@ source_set("unit_tests") {
   sources = [
     "authentication_flow_unittest.mm",
     "authentication_ui_util_unittest.mm",
-    "chrome_signin_view_controller_unittest.mm",
     "re_signin_infobar_delegate_unittest.mm",
     "signed_in_accounts_view_controller_unittest.mm",
     "signin_promo_view_mediator_unittest.mm",
@@ -119,7 +115,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main:test_support",
-    "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
@@ -167,7 +162,6 @@ source_set("eg_test_support") {
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
-    "//ios/chrome/browser/ui/signin_interaction:eg_test_support",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/test:eg_test_support",
     "//ios/chrome/test/app:test_support",
@@ -234,7 +228,6 @@ source_set("eg_test_support+eg2") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/authentication/cells:constants",
     "//ios/chrome/browser/ui/authentication/unified_consent:constants",
-    "//ios/chrome/browser/ui/signin_interaction:eg_test_support+eg2",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
index ecc50bad754..879128262a9 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
@@ -92,3 +92,65 @@ source_set("constants") {
   ]
   frameworks = [ "Foundation.framework" ]
 }
+
+source_set("eg_tests") {
+  defines = [ "CHROME_EARL_GREY_1" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "signin_coordinator_egtest.mm" ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/app:app_internal",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
+    "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/settings/google_services:constants",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:eg_test_support",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/public/provider/chrome/browser/signin:constants",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
+    "//ios/testing/earl_grey:earl_grey_support",
+    "//ios/third_party/earl_grey:earl_grey+link",
+    "//ui/base",
+    "//ui/base",
+  ]
+  libs = [ "XCTest.framework" ]
+}
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "signin_coordinator_egtest.mm" ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/public/provider/chrome/browser/signin:constants",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ui/base",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn
index d4a66cdc6ac..21a4a24de5f 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn
@@ -10,8 +10,8 @@ source_set("add_account_signin") {
     "add_account_signin_coordinator.h",
     "add_account_signin_coordinator.mm",
     "add_account_signin_enums.h",
-    "add_account_signin_mediator.h",
-    "add_account_signin_mediator.mm",
+    "add_account_signin_manager.h",
+    "add_account_signin_manager.mm",
   ]
   deps = [
     "//components/prefs",
@@ -34,7 +34,7 @@ source_set("add_account_signin") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "add_account_signin_mediator_unittest.mm" ]
+  sources = [ "add_account_signin_manager_unittest.mm" ]
   deps = [
     ":add_account_signin",
     "//base/test:test_support",
diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index b390d00e652..7b64cc707c7 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -119,6 +119,7 @@ source_set("autofill_ui") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/infobars:infobars_ui",
diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
index 7586fdcd23c..2fa6642482c 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
@@ -164,6 +164,7 @@ source_set("unit_tests") {
     "//components/autofill/ios/form_util:form_util",
     "//components/autofill/ios/form_util:test_support",
     "//components/leveldb_proto:leveldb_proto",
+    "//components/prefs",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
diff --git a/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn
new file mode 100644
index 00000000000..8d3df803250
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn
@@ -0,0 +1,18 @@
+# Copyright 2020 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.
+
+source_set("blocking_overlay") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "blocking_overlay_view_controller.h",
+    "blocking_overlay_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/app:blocking_scene_commands",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index ce103d652df..32003aea099 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -75,6 +75,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -100,9 +101,11 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/undo",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
index 423a1bdd630..f15495bd904 100644
--- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -89,7 +89,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
-    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/dialogs:dialogs_internal",
     "//ios/chrome/browser/ui/download",
@@ -211,6 +210,7 @@ source_set("unit_tests") {
     "//components/bookmarks/browser",
     "//components/bookmarks/test",
     "//components/omnibox/browser:test_support",
+    "//components/open_from_clipboard:test_support",
     "//components/prefs:test_support",
     "//components/search_engines",
     "//components/sessions",
diff --git a/chromium/ios/chrome/browser/ui/colors/BUILD.gn b/chromium/ios/chrome/browser/ui/colors/BUILD.gn
index b1381eb8fb4..42e057fbe3d 100644
--- a/chromium/ios/chrome/browser/ui/colors/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/colors/BUILD.gn
@@ -8,8 +8,6 @@ source_set("colors") {
     "MDCPalette+CrAdditions.h",
     "MDCPalette+CrAdditions.mm",
   ]
-  deps = [
-    "//ios/third_party/material_components_ios",
-    "//ios/web",
-  ]
+  deps = [ "//ios/web" ]
+  public_deps = [ "//ios/third_party/material_components_ios" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 2c13c8128ed..257fb51836c 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -28,6 +28,7 @@ source_set("content_suggestions") {
     "ntp_home_metrics.mm",
   ]
   deps = [
+    ":feature_flags",
     "//base",
     "//components/favicon/core",
     "//components/feed/core/shared_prefs:feed_shared_prefs",
@@ -41,6 +42,7 @@ source_set("content_suggestions") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -77,6 +79,7 @@ source_set("content_suggestions") {
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/ui",
@@ -125,6 +128,7 @@ source_set("content_suggestions_ui") {
     ":constants",
     ":content_suggestions_constant",
     ":content_suggestions_ui_util",
+    ":feature_flags",
     "resources:content_suggestions_no_image",
     "resources:content_suggestions_offline",
     "resources:ntp_search_icon",
@@ -419,3 +423,12 @@ source_set("test_support") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("feature_flags") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "content_suggestions_feature.h",
+    "content_suggestions_feature.mm",
+  ]
+  public_deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
index 27201983ed7..5ba5ba82fe4 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
@@ -33,6 +33,8 @@ source_set("cells_ui") {
     "content_suggestions_articles_header_item.mm",
     "content_suggestions_cell.h",
     "content_suggestions_cell.mm",
+    "content_suggestions_discover_item.h",
+    "content_suggestions_discover_item.mm",
     "content_suggestions_footer_item.h",
     "content_suggestions_footer_item.mm",
     "content_suggestions_header_item.h",
diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
deleted file mode 100644
index d02973ffc13..00000000000
--- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016 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.
-
-source_set("context_menu") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "context_menu_coordinator.h",
-    "context_menu_coordinator.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ui/base",
-    "//ui/strings",
-  ]
-}
-
-source_set("unit_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "context_menu_coordinator_unittest.mm" ]
-  deps = [
-    ":context_menu",
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/browser/main:test_support",
-    "//testing/gtest",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
index 1d4a3ec8552..f21517bcd0f 100644
--- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
@@ -18,6 +18,8 @@ source_set("elements") {
     "selector_view_controller_delegate.h",
     "text_field_configuration.h",
     "text_field_configuration.mm",
+    "text_view_selection_disabled.h",
+    "text_view_selection_disabled.mm",
     "top_aligned_image_view.h",
     "top_aligned_image_view.mm",
     "windowed_container_view.h",
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index ed539619350..0ccd207f22c 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -5,8 +5,6 @@
 source_set("first_run") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "first_run_chrome_signin_view_controller.h",
-    "first_run_chrome_signin_view_controller.mm",
     "first_run_util.h",
     "first_run_util.mm",
     "orientation_limiting_navigation_controller.h",
@@ -27,6 +25,7 @@ source_set("first_run") {
     "//components/metrics",
     "//components/prefs",
     "//components/signin/public/identity_manager",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -38,6 +37,7 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/material_components",
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index f13380b71e0..e82074921fd 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -25,7 +25,7 @@ source_set("history") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui/context_menu",
+    "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:feature_flags",
@@ -81,12 +81,13 @@ source_set("history_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
@@ -94,8 +95,10 @@ source_set("history_ui") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
index 7277a598555..cf5fedb8b80 100644
--- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
@@ -12,6 +12,7 @@ source_set("modals") {
     "infobar_password_modal_delegate.h",
     "infobar_password_table_view_controller.h",
     "infobar_password_table_view_controller.mm",
+    "infobar_save_card_modal_consumer.h",
     "infobar_save_card_modal_delegate.h",
     "infobar_save_card_table_view_controller.h",
     "infobar_save_card_table_view_controller.mm",
diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn
index 8f8c62452b9..2b7c983e03a 100644
--- a/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn
@@ -8,6 +8,11 @@ source_set("test") {
   sources = [
     "fake_infobar_password_modal_consumer.h",
     "fake_infobar_password_modal_consumer.mm",
+    "fake_infobar_translate_modal_consumer.h",
+    "fake_infobar_translate_modal_consumer.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
+    "//ios/chrome/browser/ui/infobars/modals",
   ]
-  deps = [ "//ios/chrome/browser/ui/infobars/modals" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index 4c473533908..96979190b68 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -38,6 +38,7 @@ source_set("location_bar") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state:browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/infobars:badge",
     "//ios/chrome/browser/infobars:public",
@@ -70,6 +71,7 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
+    "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index aac15b3ee53..954200864d5 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -26,6 +26,7 @@ source_set("scene_guts") {
 source_set("scene") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "connection_information.h",
     "scene_controller.h",
     "scene_controller.mm",
     "scene_delegate.h",
@@ -42,9 +43,11 @@ source_set("scene") {
     "//components/signin/public/identity_manager",
     "//components/url_formatter",
     "//ios/chrome/app:app",
+    "//ios/chrome/app:blocking_scene_commands",
     "//ios/chrome/app:mode",
     "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/application_delegate:tab_opening",
+    "//ios/chrome/app/application_delegate:url_opener_params",
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
@@ -59,17 +62,15 @@ source_set("scene") {
     "//ios/chrome/browser/ntp_snippets:ntp_snippets",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",
-    "//ios/chrome/browser/tabs:tabs",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin",
+    "//ios/chrome/browser/ui/blocking_overlay",
     "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands:commands",
     "//ios/chrome/browser/ui/first_run",
     "//ios/chrome/browser/ui/history",
-    "//ios/chrome/browser/ui/promos",
     "//ios/chrome/browser/ui/settings:settings_root",
-    "//ios/chrome/browser/ui/signin_interaction",
     "//ios/chrome/browser/ui/tab_grid",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
@@ -77,6 +78,7 @@ source_set("scene") {
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/window_activities",
+    "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/mailto",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
index a2e9ab29d83..0747f6c5ba8 100644
--- a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
@@ -6,6 +6,8 @@ source_set("test") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "fake_connection_information.h",
+    "fake_connection_information.mm",
     "fake_scene_state.h",
     "fake_scene_state.mm",
     "stub_browser_interface.h",
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index 1aeaaefe608..cccfe6d3201 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -22,9 +22,12 @@ source_set("coordinator") {
     ":ntp",
     ":ntp_internal",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/settings/privacy",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/public/provider/chrome/browser/voice",
@@ -105,11 +108,11 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions/cells",
-    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/favicon",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index aea36635b44..d8948053aff 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -160,6 +160,7 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 690d0a6931d..19d659381aa 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -38,6 +38,7 @@ source_set("popup") {
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
index e7b023eb62d..8785f23ca15 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
@@ -8,7 +8,10 @@ source_set("infobar_banner") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
-  deps = [ ":coordinators" ]
+  deps = [
+    ":coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:coordinators",
+  ]
 }
 
 source_set("coordinators") {
@@ -31,6 +34,8 @@ source_set("coordinators") {
     "//ios/chrome/browser/ui/overlays:util",
     "//ios/chrome/browser/ui/overlays/infobar_banner/confirm",
     "//ios/chrome/browser/ui/overlays/infobar_banner/passwords",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/save_card",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:mediators",
     "//ios/chrome/browser/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
new file mode 100644
index 00000000000..69c920fa654
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
@@ -0,0 +1,54 @@
+# 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.
+
+source_set("save_card") {
+  sources = [
+    "save_card_infobar_banner_overlay_mediator.h",
+    "save_card_infobar_banner_overlay_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/infobars/banners",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "save_card_infobar_banner_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":save_card",
+    "//base/test:test_support",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core",
+    "//components/prefs",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/banners/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
new file mode 100644
index 00000000000..d50f62b454c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
@@ -0,0 +1,69 @@
+# 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.
+
+source_set("coordinators") {
+  sources = [
+    "translate_infobar_placeholder_overlay_coordinator.h",
+    "translate_infobar_placeholder_overlay_coordinator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:coordinators",
+  ]
+}
+
+source_set("mediators") {
+  sources = [
+    "translate_infobar_banner_overlay_mediator.h",
+    "translate_infobar_banner_overlay_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/infobars/banners",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "translate_infobar_banner_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":mediators",
+    "//base/test:test_support",
+    "//components/infobars/core",
+    "//components/strings:components_strings_grit",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/translate:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/banners/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
index 3088738bf32..d7feb936026 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
@@ -8,7 +8,11 @@ source_set("infobar_modal") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
-  deps = [ "//ios/chrome/browser/ui/overlays/infobar_modal/passwords" ]
+  deps = [
+    "//ios/chrome/browser/ui/overlays/infobar_modal/passwords",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/translate",
+  ]
 }
 
 source_set("coordinators") {
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn
new file mode 100644
index 00000000000..802a94a1271
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn
@@ -0,0 +1,64 @@
+# Copyright 2020 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.
+
+source_set("save_card") {
+  sources = [
+    "save_card_infobar_modal_overlay_coordinator.h",
+    "save_card_infobar_modal_overlay_coordinator.mm",
+    "save_card_infobar_modal_overlay_mediator.h",
+    "save_card_infobar_modal_overlay_mediator.mm",
+    "save_card_infobar_modal_overlay_mediator_delegate.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/autofill/core/common",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/autofill:autofill_message",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:mediators",
+    "//ios/chrome/browser/ui/util",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "save_card_infobar_modal_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base/test:test_support",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core",
+    "//components/infobars/core:feature_flags",
+    "//components/prefs",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/autofill:autofill_message",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/infobars/modals/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
new file mode 100644
index 00000000000..726e1c90d04
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
@@ -0,0 +1,65 @@
+# Copyright 2020 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.
+
+source_set("translate") {
+  sources = [
+    "translate_infobar_modal_overlay_coordinator.h",
+    "translate_infobar_modal_overlay_coordinator.mm",
+    "translate_infobar_modal_overlay_mediator.h",
+    "translate_infobar_modal_overlay_mediator.mm",
+    "translate_infobar_modal_overlay_mediator_delegate.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/metrics",
+    "//components/translate/core/browser",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/translate:public",
+    "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:mediators",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "translate_infobar_modal_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":translate",
+    "//base/test:test_support",
+    "//components/infobars/core",
+    "//components/infobars/core:feature_flags",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/translate:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
+    "//ios/chrome/browser/ui/infobars/modals/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
index 78d434db320..b1c3fe590a8 100644
--- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -7,12 +7,17 @@ source_set("page_info") {
   sources = [
     "legacy_page_info_view_controller.h",
     "legacy_page_info_view_controller.mm",
+    "page_info_cookies_commands.h",
     "page_info_site_security_description.h",
     "page_info_site_security_description.mm",
     "page_info_view_controller.h",
     "page_info_view_controller.mm",
   ]
   deps = [
+    "resources:cookies_icon",
+    "resources:security_icon_dangerous",
+    "resources:security_icon_not_secure",
+    "resources:security_icon_secure",
     "//base",
     "//base:i18n",
     "//components/keyed_service/core",
@@ -23,12 +28,14 @@ source_set("page_info") {
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/popup_menu",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
@@ -73,25 +80,32 @@ source_set("coordinator") {
     "page_info_site_security_mediator.mm",
   ]
   deps = [
+    ":features",
     ":page_info",
     "resources:page_info_bad",
     "resources:page_info_good",
     "resources:page_info_info",
     "resources:page_info_offline",
     "//base",
+    "//components/content_settings/core/browser",
     "//components/security_state/core",
     "//components/ssl_errors",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen:coordinators",
     "//ios/chrome/browser/ui/page_info/requirements",
+    "//ios/chrome/browser/ui/settings/privacy",
+    "//ios/chrome/browser/ui/settings/utils",
+    "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/web_state_list",
     "//ios/components/webui:url_constants",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn
index 47541afa890..93f047d5b84 100644
--- a/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn
@@ -35,3 +35,36 @@ imageset("page_info_info") {
     "page_info_info.imageset/page_info_info@3x.png",
   ]
 }
+
+imageset("security_icon_dangerous") {
+  sources = [
+    "security_icon_dangerous.imageset/Contents.json",
+    "security_icon_dangerous.imageset/security_icon_dangerous@2x.png",
+    "security_icon_dangerous.imageset/security_icon_dangerous@3x.png",
+  ]
+}
+
+imageset("security_icon_not_secure") {
+  sources = [
+    "security_icon_not_secure.imageset/Contents.json",
+    "security_icon_not_secure.imageset/security_icon_not_secure@2x.png",
+    "security_icon_not_secure.imageset/security_icon_not_secure@3x.png",
+  ]
+}
+
+imageset("security_icon_secure") {
+  sources = [
+    "security_icon_secure.imageset/Contents.json",
+    "security_icon_secure.imageset/security_icon_secure@2x.png",
+    "security_icon_secure.imageset/security_icon_secure@3x.png",
+  ]
+}
+
+imageset("cookies_icon") {
+  sources = [
+    "cookies_icon.imageset/Contents.json",
+    "cookies_icon.imageset/cookies_icon.png",
+    "cookies_icon.imageset/cookies_icon@2x.png",
+    "cookies_icon.imageset/cookies_icon@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
index 47f3c9f7c44..ddd2b74c14d 100644
--- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
@@ -10,8 +10,6 @@ source_set("passwords") {
     "password_breach_consumer.h",
     "password_breach_coordinator.h",
     "password_breach_coordinator.mm",
-    "password_breach_learn_more_view_controller.h",
-    "password_breach_learn_more_view_controller.mm",
     "password_breach_mediator.h",
     "password_breach_mediator.mm",
     "password_breach_presenter.h",
@@ -31,6 +29,7 @@ source_set("passwords") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/util",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index c7ceec7bc94..bfa2714a22f 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -20,6 +20,7 @@ source_set("popup_menu") {
     "resources:popup_menu_close_tab",
     "resources:popup_menu_downloads",
     "resources:popup_menu_edit_bookmark",
+    "resources:popup_menu_enterprise_icon",
     "resources:popup_menu_find_in_page",
     "resources:popup_menu_help",
     "resources:popup_menu_history",
@@ -58,6 +59,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/policy",
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -84,6 +86,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/window_activities",
+    "//ios/chrome/common/ui/colors",
     "//ios/components/webui:url_constants",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/user_feedback",
@@ -167,6 +170,7 @@ source_set("eg2_tests") {
     ":constants",
     "//base/test:test_support",
     "//components/strings",
+    "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
@@ -191,6 +195,7 @@ source_set("eg_tests") {
     "//base",
     "//base/test:test_support",
     "//components/strings",
+    "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
index d7ac625f952..5240eb1bc88 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
@@ -7,6 +7,8 @@ source_set("cells") {
   sources = [
     "popup_menu_navigation_item.h",
     "popup_menu_navigation_item.mm",
+    "popup_menu_text_item.h",
+    "popup_menu_text_item.mm",
     "popup_menu_tools_item.h",
     "popup_menu_tools_item.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
index 46097a01a5b..6abd67909db 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -232,3 +232,11 @@ imageset("popup_menu_text_zoom") {
     "popup_menu_text_zoom.imageset/popup_menu_text_zoom@3x.png",
   ]
 }
+
+imageset("popup_menu_enterprise_icon") {
+  sources = [
+    "popup_menu_enterprise_icon.imageset/Contents.json",
+    "popup_menu_enterprise_icon.imageset/popup_menu_enterprise_icon@2x.png",
+    "popup_menu_enterprise_icon.imageset/popup_menu_enterprise_icon@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/promos/BUILD.gn b/chromium/ios/chrome/browser/ui/promos/BUILD.gn
deleted file mode 100644
index 6d4777be449..00000000000
--- a/chromium/ios/chrome/browser/ui/promos/BUILD.gn
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 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.
-
-source_set("promos") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    # TODO(crbug.com/738881): Just move this into ui/signin
-    "signin_promo_view_controller.h",
-    "signin_promo_view_controller.mm",
-  ]
-  deps = [
-    "//base",
-    "//components/signin/ios/browser",
-    "//components/signin/public/base",
-    "//components/version_info",
-    "//ios/chrome/app:tests_hook",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/main",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui/authentication/signin",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/common/ui/colors",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/signin",
-    "//net",
-
-    # TODO(crbug.com/971989):Remove when this class is deprecated.
-    "//ios/chrome/browser/ui/authentication/signin/user_signin",
-  ]
-  public_deps = [ "//ios/chrome/browser/ui/authentication" ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn
index 11c53fd2997..46e387de04e 100644
--- a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn
@@ -42,6 +42,7 @@ source_set("qr_generator") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//net",
     "//ui/base",
   ]
@@ -62,6 +63,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/test:test_support",
     "//ios/chrome/test/fakes",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index 835a6c66047..e9f9c68808b 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -6,7 +6,6 @@ source_set("reading_list") {
   sources = [
     "reading_list_coordinator.h",
     "reading_list_coordinator.mm",
-    "reading_list_list_item.h",
     "reading_list_list_item_custom_action_factory.h",
     "reading_list_list_item_custom_action_factory.mm",
     "reading_list_list_item_factory.h",
@@ -57,6 +56,7 @@ source_set("reading_list") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/favicon",
     "//ios/web",
     "//ios/web/public",
@@ -86,6 +86,7 @@ source_set("reading_list_ui") {
     "number_badge_view.mm",
     "reading_list_data_sink.h",
     "reading_list_data_source.h",
+    "reading_list_list_item.h",
     "reading_list_list_item_accessibility_delegate.h",
     "reading_list_list_item_updater.h",
     "reading_list_list_view_controller_audience.h",
@@ -110,6 +111,7 @@ source_set("reading_list_ui") {
     "//components/url_formatter",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/keyboard",
@@ -122,6 +124,7 @@ source_set("reading_list_ui") {
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
+    "//net",
     "//ui/base",
     "//ui/strings:ui_strings_grit",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn
index 2854787356d..dc5b44617c0 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn
@@ -18,6 +18,7 @@ source_set("context_menu") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ui/base",
     "//ui/strings:ui_strings_grit",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 6364cf491f7..7930d1a11cb 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -71,16 +71,17 @@ source_set("recent_tabs_ui") {
     "//components/sync",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/signin_interaction/public",
     "//ios/chrome/browser/ui/table_view",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index efe0a7e20ae..1c8652c3ada 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -73,6 +73,7 @@ source_set("settings") {
     ":settings_root",
     "resources:app_icon_placeholder",
     "resources:encryption_error",
+    "resources:enterprise_icon",
     "resources:settings_about_chrome",
     "resources:settings_accounts_add_account",
     "resources:settings_addresses",
@@ -82,11 +83,14 @@ source_set("settings") {
     "resources:settings_content_settings",
     "resources:settings_debug",
     "resources:settings_error",
+    "resources:settings_info",
     "resources:settings_language_settings",
     "resources:settings_passwords",
     "resources:settings_payment_methods",
     "resources:settings_privacy",
+    "resources:settings_safe_state",
     "resources:settings_search_engine",
+    "resources:settings_unsafe_state",
     "resources:settings_voice_search",
     "resources:sync_and_google_services",
     "resources:sync_and_google_services_sync_error",
@@ -106,6 +110,7 @@ source_set("settings") {
     "//components/keyed_service/core",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
+    "//components/prefs",
     "//components/prefs/ios",
     "//components/resources",
     "//components/search_engines",
@@ -151,11 +156,13 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/language:language",
     "//ios/chrome/browser/ui/settings/language:language_ui",
     "//ios/chrome/browser/ui/settings/password",
     "//ios/chrome/browser/ui/settings/privacy",
+    "//ios/chrome/browser/ui/settings/safety_check",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
index ed05c753e5b..d21536b39f7 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -52,6 +52,7 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/settings/autofill/cells",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/credit_card_scanner",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index 0be2e7306bb..4c8285696b8 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -20,6 +20,10 @@ source_set("cells") {
     "settings_image_detail_text_item.mm",
     "settings_multiline_detail_item.h",
     "settings_multiline_detail_item.mm",
+    "settings_password_check_cell.h",
+    "settings_password_check_cell.mm",
+    "settings_password_check_item.h",
+    "settings_password_check_item.mm",
     "settings_switch_cell.h",
     "settings_switch_cell.mm",
     "settings_switch_item.h",
@@ -82,6 +86,7 @@ source_set("unit_tests") {
     "passphrase_error_item_unittest.mm",
     "search_engine_item_unittest.mm",
     "settings_multiline_detail_item_unittest.mm",
+    "settings_password_check_item_unittest.mm",
     "version_item_unittest.mm",
   ]
 
diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
new file mode 100644
index 00000000000..e0a189a1467
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2020 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.
+
+# import("//build/config/ios/ios_sdk.gni")
+
+source_set("enterprise_info_popover_view_controller") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "enterprise_info_popover_view_controller.h",
+    "enterprise_info_popover_view_controller.mm",
+  ]
+
+  libs = [ "UIKit.framework" ]
+
+  deps = [
+    "//base:base",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/common:common",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index ea6b65e0497..4be6baa2f2a 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -109,7 +109,6 @@ source_set("eg_tests") {
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/bookmarks:eg_test_support",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index fc5883e6fad..9fdc149070a 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -10,6 +10,9 @@ source_set("password") {
     "password_details_table_view_controller_delegate.h",
     "password_exporter.h",
     "password_exporter.mm",
+    "passwords_consumer.h",
+    "passwords_mediator.h",
+    "passwords_mediator.mm",
     "passwords_table_view_controller.h",
     "passwords_table_view_controller.mm",
   ]
@@ -35,6 +38,7 @@ source_set("password") {
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/cells:public",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
@@ -45,6 +49,7 @@ source_set("password") {
     "//ios/chrome/common/ui/util",
     "//ios/third_party/material_components_ios",
     "//ui/base",
+    "//ui/base/clipboard:clipboard_types",
     "//url",
   ]
 }
@@ -90,6 +95,7 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
index 9839e7f195c..db6bd6b97e0 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -7,6 +7,9 @@ source_set("privacy_ui") {
   sources = [
     "cookies_commands.h",
     "cookies_consumer.h",
+    "cookies_status_consumer.h",
+    "cookies_status_description.h",
+    "cookies_status_description.mm",
     "cookies_view_controller.h",
     "cookies_view_controller.mm",
     "handoff_table_view_controller.h",
@@ -16,6 +19,8 @@ source_set("privacy_ui") {
     "privacy_table_view_controller.mm",
   ]
   deps = [
+    "resources:accessory_checkmark",
+    "resources:accessory_no_checkmark",
     "//base",
     "//components/handoff",
     "//components/prefs",
@@ -42,6 +47,7 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ui/base",
   ]
 }
@@ -53,17 +59,29 @@ source_set("privacy") {
     "cookies_coordinator.mm",
     "cookies_mediator.h",
     "cookies_mediator.mm",
+    "cookies_status_mediator.h",
+    "cookies_status_mediator.mm",
     "privacy_coordinator.h",
     "privacy_coordinator.mm",
   ]
   deps = [
     ":privacy_ui",
+    "//components/content_settings/core/browser",
+    "//components/content_settings/core/common",
+    "//components/prefs",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/utils",
+    "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ui/base",
   ]
   libs = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn
new file mode 100644
index 00000000000..6dc98952b58
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2020 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.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("accessory_checkmark") {
+  sources = [
+    "accessory_checkmark.imageset/Contents.json",
+    "accessory_checkmark.imageset/accessory_checkmark@2x.png",
+    "accessory_checkmark.imageset/accessory_checkmark@3x.png",
+  ]
+}
+
+imageset("accessory_no_checkmark") {
+  sources = [
+    "accessory_no_checkmark.imageset/Contents.json",
+    "accessory_no_checkmark.imageset/accessory_no_checkmark@2x.png",
+    "accessory_no_checkmark.imageset/accessory_no_checkmark@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
index e1eea0408e8..3fe05c78784 100644
--- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
@@ -26,6 +26,14 @@ imageset("encryption_error") {
   ]
 }
 
+imageset("enterprise_icon") {
+  sources = [
+    "enterprise_icon.imageset/Contents.json",
+    "enterprise_icon.imageset/enterprise_icon@2x.png",
+    "enterprise_icon.imageset/enterprise_icon@3x.png",
+  ]
+}
+
 imageset("settings_accounts_add_account") {
   sources = [
     "settings_accounts_add_account.imageset/Contents.json",
@@ -182,3 +190,27 @@ imageset("sync_and_google_services_sync_on") {
     "sync_and_google_services_sync_on.imageset/sync_and_google_services_sync_on@3x.png",
   ]
 }
+
+imageset("settings_unsafe_state") {
+  sources = [
+    "settings_unsafe_state.imageset/Contents.json",
+    "settings_unsafe_state.imageset/settings_unsafe_state@2x.png",
+    "settings_unsafe_state.imageset/settings_unsafe_state@3x.png",
+  ]
+}
+
+imageset("settings_safe_state") {
+  sources = [
+    "settings_safe_state.imageset/Contents.json",
+    "settings_safe_state.imageset/settings_safe_state@2x.png",
+    "settings_safe_state.imageset/settings_safe_state@3x.png",
+  ]
+}
+
+imageset("settings_info") {
+  sources = [
+    "settings_info.imageset/Contents.json",
+    "settings_info.imageset/settings_info@2x.png",
+    "settings_info.imageset/settings_info@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
new file mode 100644
index 00000000000..d07416fda68
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -0,0 +1,56 @@
+# Copyright 2020 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.
+
+source_set("safety_check_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safety_check_navigation_commands.h",
+    "safety_check_table_view_controller.h",
+    "safety_check_table_view_controller.mm",
+  ]
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/table_view",
+    "//ui/base",
+  ]
+}
+
+source_set("safety_check") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safety_check_coordinator.h",
+    "safety_check_coordinator.mm",
+  ]
+  deps = [
+    ":safety_check_ui",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/settings:settings_root",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "safety_check_table_view_controller_unittest.mm" ]
+  deps = [
+    ":safety_check_ui",
+    "//base/test:test_support",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn
deleted file mode 100644
index 52b8152d312..00000000000
--- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2017 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.
-
-source_set("signin_interaction") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "signin_interaction_controller.h",
-    "signin_interaction_controller.mm",
-    "signin_interaction_coordinator.h",
-    "signin_interaction_coordinator.mm",
-    "signin_interaction_presenting.h",
-  ]
-  deps = [
-    "//base",
-    "//components/prefs",
-    "//components/signin/public/identity_manager",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/main",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication/signin",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/signin",
-  ]
-}
-
-source_set("eg_test_support") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "signin_interaction_controller_app_interface.h",
-    "signin_interaction_controller_app_interface.mm",
-    "signin_interaction_controller_egtest_util.h",
-    "signin_interaction_controller_egtest_util.mm",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/testing/earl_grey:earl_grey_support",
-  ]
-}
-
-source_set("eg_test_support+eg2") {
-  defines = [ "CHROME_EARL_GREY_2" ]
-  configs += [
-    "//build/config/compiler:enable_arc",
-    "//build/config/ios:xctest_config",
-  ]
-  testonly = true
-  sources = [
-    "signin_interaction_controller_app_interface.h",
-    "signin_interaction_controller_egtest_util.h",
-    "signin_interaction_controller_egtest_util.mm",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
-    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
-    "//ios/testing/earl_grey:eg_test_support+eg2",
-    "//ios/third_party/earl_grey2:test_lib",
-  ]
-}
-
-source_set("eg_tests") {
-  defines = [ "CHROME_EARL_GREY_1" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "signin_interaction_controller_egtest.mm" ]
-  deps = [
-    ":eg_test_support",
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/app:app_internal",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication:eg_test_support",
-    "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
-    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
-    "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/settings/google_services:constants",
-    "//ios/chrome/browser/ui/table_view/cells",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/test:eg_test_support",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/public/provider/chrome/browser/signin:constants",
-    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
-    "//ios/testing/earl_grey:earl_grey_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ui/base",
-    "//ui/base",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
-source_set("eg_app_support+eg2") {
-  defines = [ "CHROME_EARL_GREY_2" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "signin_interaction_controller_app_interface.h",
-    "signin_interaction_controller_app_interface.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser/ui/authentication",
-  ]
-}
-
-source_set("eg2_tests") {
-  defines = [ "CHROME_EARL_GREY_2" ]
-  configs += [
-    "//build/config/compiler:enable_arc",
-    "//build/config/ios:xctest_config",
-  ]
-  testonly = true
-  sources = [ "signin_interaction_controller_egtest.mm" ]
-  deps = [
-    ":eg_test_support+eg2",
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
-    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
-    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
-    "//ios/public/provider/chrome/browser/signin:constants",
-    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
-    "//ios/testing/earl_grey:eg_test_support+eg2",
-    "//ios/third_party/earl_grey2:test_lib",
-    "//ui/base",
-  ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
index 747da879577..f3d7636a3b0 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
@@ -25,6 +25,7 @@ source_set("tab_grid") {
     "//components/sessions",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
@@ -40,11 +41,13 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_grid/transitions",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
+    "//ios/chrome/browser/window_activities",
     "//ios/web",
     "//ui/base",
     "//ui/gfx",
@@ -92,6 +95,8 @@ source_set("tab_grid_ui") {
     "resources:new_tab_toolbar_button",
     "resources:new_tab_toolbar_button_incognito",
     "resources:page_control_assets",
+    "resources:tab_grid_incognito_tabs_empty",
+    "resources:tab_grid_regular_tabs_empty",
     "//base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
index 6ce37896c41..8076b06d35c 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
@@ -18,6 +18,7 @@ source_set("grid_ui") {
     "grid_cell.mm",
     "grid_commands.h",
     "grid_consumer.h",
+    "grid_drag_drop_handler.h",
     "grid_empty_view.h",
     "grid_image_data_source.h",
     "grid_item.h",
@@ -39,6 +40,7 @@ source_set("grid_ui") {
     "//base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/tab_grid/transitions",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn
index a25c583233c..18b23c9de3f 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn
@@ -88,6 +88,20 @@ imageset("page_control_remote_tabs_selected") {
   ]
 }
 
+imageset("tab_grid_incognito_tabs_empty") {
+  sources = [
+    "tab_grid_incognito_tabs_empty.imageset/Contents.json",
+    "tab_grid_incognito_tabs_empty.imageset/tab_grid_incognito_tabs_empty.pdf",
+  ]
+}
+
+imageset("tab_grid_regular_tabs_empty") {
+  sources = [
+    "tab_grid_regular_tabs_empty.imageset/Contents.json",
+    "tab_grid_regular_tabs_empty.imageset/tab_grid_regular_tabs_empty.pdf",
+  ]
+}
+
 group("page_control_assets") {
   public_deps = [
     ":page_control_incognito_tabs",
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
index cb27a0787b4..fb2aaf1a1dd 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -18,6 +18,10 @@ source_set("cells") {
     "table_view_header_footer_item.mm",
     "table_view_image_item.h",
     "table_view_image_item.mm",
+    "table_view_info_button_cell.h",
+    "table_view_info_button_cell.mm",
+    "table_view_info_button_item.h",
+    "table_view_info_button_item.mm",
     "table_view_item.h",
     "table_view_item.mm",
     "table_view_link_header_footer_item.h",
@@ -47,6 +51,7 @@ source_set("cells") {
     "resources:table_view_cell_edit_icon",
     "resources:table_view_cell_error_icon",
     "resources:table_view_cell_favicon_background",
+    "resources:table_view_cell_info",
     "//base",
     "//base:i18n",
     "//ios/chrome/app/strings",
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
index 23f52d3c2c2..09bba6cd77e 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
@@ -45,3 +45,11 @@ imageset("table_view_cell_error_icon") {
     "table_view_cell_error_icon.imageset/table_view_cell_error_icon@3x.png",
   ]
 }
+
+imageset("table_view_cell_info") {
+  sources = [
+    "table_view_cell_info.imageset/Contents.json",
+    "table_view_cell_info.imageset/table_view_cell_info@2x.png",
+    "table_view_cell_info.imageset/table_view_cell_info@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index 6a9ace608c0..7a4bdd80998 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -35,6 +35,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
diff --git a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
index 50ecde24eaf..91e2151558d 100644
--- a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
@@ -17,13 +17,13 @@ source_set("interstitials") {
     "//base",
     "//components/resources",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/safe_browsing",
-    "//ios/chrome/browser/safe_browsing:allow_list",
     "//ios/chrome/browser/ssl",
     "//ios/components/security_interstitials",
     "//ios/web/public/security",
diff --git a/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn
new file mode 100644
index 00000000000..b7bae1905ef
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn
@@ -0,0 +1,12 @@
+# Copyright 2015 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.
+
+source_set("utils") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "default_browser_utils.h",
+    "default_browser_utils.mm",
+  ]
+  deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index e0a83d22535..bdc90626e3a 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -186,14 +186,7 @@ js_compile_bundle("chrome_bundle_main_frame") {
     "resources/chrome_bundle_main_frame.js",
     "resources/image_fetch.js",
   ]
-  deps = [
-    ":credential_manager",
-    ":payment_request",
-  ]
-}
-
-js_compile_checked("payment_request") {
-  sources = [ "resources/payment_request.js" ]
+  deps = [ ":credential_manager" ]
 }
 
 js_compile_checked("credential_manager") {
@@ -324,6 +317,7 @@ source_set("unit_tests_internal") {
     "//components/content_settings/core/browser",
     "//components/infobars/core",
     "//components/payments/core",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core:unsafe_resource",
     "//components/strings:components_strings_grit",
     "//ios/chrome/browser",
@@ -334,7 +328,6 @@ source_set("unit_tests_internal") {
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/safe_browsing",
-    "//ios/chrome/browser/safe_browsing:allow_list",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/web",
     "//ios/chrome/test/fakes",
@@ -495,6 +488,7 @@ source_set("eg2_tests") {
     "stop_loading_egtest.mm",
     "tab_order_egtest.mm",
     "visible_url_egtest.mm",
+    "web_share_egtest.mm",
     "window_open_by_dom_egtest.mm",
   ]
 
diff --git a/chromium/ios/chrome/browser/window_activities/BUILD.gn b/chromium/ios/chrome/browser/window_activities/BUILD.gn
index 3bd9cecb07b..c3aa2d6fb9e 100644
--- a/chromium/ios/chrome/browser/window_activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/window_activities/BUILD.gn
@@ -10,7 +10,7 @@ source_set("window_activities") {
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/url_loading",
     "//ios/web/public/navigation",
     "//net",
diff --git a/chromium/ios/chrome/common/credential_provider/BUILD.gn b/chromium/ios/chrome/common/credential_provider/BUILD.gn
index 0b45f903f51..db564d0d8c8 100644
--- a/chromium/ios/chrome/common/credential_provider/BUILD.gn
+++ b/chromium/ios/chrome/common/credential_provider/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/buildflag_header.gni")
 import("//build/config/ios/ios_sdk.gni")
-import("//ios/build/chrome_build.gni")
 
 source_set("credential_provider") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -39,29 +38,6 @@ source_set("ui") {
   libs = [ "Foundation.framework" ]
 }
 
-source_set("account_verification_provider") {
-  public_deps = [ ":account_verification_provider_header" ]
-  deps = [ ios_account_verification_provider_target ]
-  assert_no_deps = [ "//ios/chrome/browser/*" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  libs = [ "Foundation.framework" ]
-}
-
-source_set("account_verification_provider_header") {
-  sources = [ "account_verification_provider.h" ]
-  assert_no_deps = [ "//ios/chrome/browser/*" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  libs = [ "Foundation.framework" ]
-}
-
-source_set("account_verification_provider_implementation") {
-  sources = [ "account_verification_provider.mm" ]
-  deps = [ ":account_verification_provider_header" ]
-  assert_no_deps = [ "//ios/chrome/browser/*" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-  libs = [ "Foundation.framework" ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/common/ui/elements/BUILD.gn b/chromium/ios/chrome/common/ui/elements/BUILD.gn
index ff79c82b299..71d8ef614b4 100644
--- a/chromium/ios/chrome/common/ui/elements/BUILD.gn
+++ b/chromium/ios/chrome/common/ui/elements/BUILD.gn
@@ -17,3 +17,19 @@ source_set("elements") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("popover_label_view_controller") {
+  sources = [
+    "popover_label_view_controller.h",
+    "popover_label_view_controller.mm",
+  ]
+
+  libs = [ "UIKit.framework" ]
+
+  deps = [
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/util",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/credential_provider_extension/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/BUILD.gn
index 52ffbb6049d..d95238e9938 100644
--- a/chromium/ios/chrome/credential_provider_extension/BUILD.gn
+++ b/chromium/ios/chrome/credential_provider_extension/BUILD.gn
@@ -50,6 +50,7 @@ ios_appex_bundle("credential_provider_extension") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":account_verification_provider",
     ":metrics_util",
     ":password_util",
     ":reauthentication_handler",
@@ -59,10 +60,10 @@ ios_appex_bundle("credential_provider_extension") {
     "//ios/chrome/common/credential_provider",
     "//ios/chrome/common/credential_provider:ui",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/credential_provider_extension/resources",
     "//ios/chrome/credential_provider_extension/ui",
-    ios_account_verification_provider_target,
   ]
   bundle_deps_filter = [ "//third_party/icu:icudata" ]
 
@@ -78,6 +79,7 @@ ios_appex_bundle("credential_provider_extension") {
     "CHROME_CHANNEL_SCHEME=$url_channel_scheme",
     "CHROMIUM_SHORT_NAME=$chromium_short_name",
     "CREDENTIAL_PROVIDER_EXTENSION_BUNDLE_ID=$chromium_bundle_id.CredentialProviderExtension",
+    "CHROMIUM_BUNDLE_ID=$chromium_bundle_id",
   ]
 
   entitlements_target = ":entitlements"
@@ -98,6 +100,22 @@ generate_localizable_strings("system_strings") {
   deps = [ _packed_resources_target ]
 }
 
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "metrics_util_unittest.mm",
+    "password_util_unittest.mm",
+  ]
+  deps = [
+    ":metrics_util",
+    ":password_util",
+    "//base",
+    "//ios/chrome/common/app_group",
+    "//testing/gtest",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("reauthentication_handler") {
   sources = [
     "reauthentication_handler.h",
@@ -140,3 +158,26 @@ source_set("metrics_util") {
   ]
   libs = [ "Foundation.framework" ]
 }
+
+source_set("account_verification_provider") {
+  public_deps = [ ":account_verification_provider_header" ]
+  deps = [ ios_account_verification_provider_target ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
+
+source_set("account_verification_provider_header") {
+  sources = [ "account_verification_provider.h" ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
+
+source_set("account_verification_provider_implementation") {
+  sources = [ "account_verification_provider.mm" ]
+  deps = [ ":account_verification_provider_header" ]
+  assert_no_deps = [ "//ios/chrome/browser/*" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  libs = [ "Foundation.framework" ]
+}
diff --git a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
index 1daeeb66f5f..473500732d1 100644
--- a/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
+++ b/chromium/ios/chrome/credential_provider_extension/ui/BUILD.gn
@@ -33,6 +33,7 @@ source_set("ui") {
     "//ios/chrome/common/credential_provider:ui",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/util",
     "//ios/chrome/credential_provider_extension:metrics_util",
     "//ios/chrome/credential_provider_extension:password_util",
diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 596b0aec0ae..ce102d9c3c8 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/build/chrome_build.gni")
 import("//ios/build/config.gni")
 import("//ios/chrome/features.gni")
 import("//ios/public/provider/chrome/browser/build_config.gni")
-import("//ios/third_party/features.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ -130,18 +130,16 @@ source_set("run_all_unittests") {
     "//mojo/core/embedder",
   ]
 
-  if (ios_third_party_material_components_built_as_framework) {
-    if (ios_chrome_links_with_material_components_framework) {
-      public_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    } else {
-      assert_no_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    }
+  if (ios_chrome_links_with_material_components_framework) {
+    public_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  } else {
+    assert_no_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
   }
 }
 
@@ -161,7 +159,16 @@ test("ios_chrome_perftests") {
   assert_no_deps = ios_assert_no_deps
 }
 
+bundle_data_ib_file("base_scene_storyboard") {
+  source = "BaseScene.storyboard"
+}
+
 test("ios_chrome_unittests") {
+  # Use the plist with the scene manifest if either multiwindow flag is enabled
+  if (ios_enable_multi_window || ios_enable_scene_startup) {
+    info_plist = "//ios/chrome/test/unittest-scene-lifecycle-Info.plist"
+  }
+
   deps = [
     # Ensure that all unit tests are run, use fake hooks and pack resources.
     ":run_all_unittests",
@@ -180,6 +187,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/browser_state:unit_tests",
     "//ios/chrome/browser/browsing_data:unit_tests",
     "//ios/chrome/browser/complex_tasks:unit_tests",
+    "//ios/chrome/browser/content_settings:unit_tests",
     "//ios/chrome/browser/crash_report:unit_tests",
     "//ios/chrome/browser/crash_report/breadcrumbs:unit_tests",
     "//ios/chrome/browser/credential_provider:unit_tests",
@@ -195,7 +203,10 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/infobars/overlays:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate:unit_tests",
     "//ios/chrome/browser/itunes_urls:unit_tests",
     "//ios/chrome/browser/json_parser:unit_tests",
     "//ios/chrome/browser/language:unit_tests",
@@ -254,7 +265,6 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/content_suggestions:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/cells:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/identifier:unit_tests",
-    "//ios/chrome/browser/ui/context_menu:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests_internal",
     "//ios/chrome/browser/ui/download:unit_tests",
@@ -281,8 +291,12 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/overlays/infobar_banner:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_banner/confirm:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_banner/passwords:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/save_card:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_modal:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_modal/passwords:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/translate:unit_tests",
     "//ios/chrome/browser/ui/overlays/test_modality:unit_tests",
     "//ios/chrome/browser/ui/overlays/web_content_area/alerts:unit_tests",
     "//ios/chrome/browser/ui/popup_menu:unit_tests",
@@ -327,6 +341,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/common/ui/reauthentication:unit_tests",
     "//ios/chrome/common/ui/util:unit_tests",
     "//ios/chrome/content_widget_extension:unit_tests",
+    "//ios/chrome/credential_provider_extension:unit_tests",
     "//ios/chrome/search_widget_extension:unit_tests",
     "//ios/testing:http_server_bundle_data",
   ]
diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn
index cd239288e4c..94bb8b7912e 100644
--- a/chromium/ios/chrome/test/app/BUILD.gn
+++ b/chromium/ios/chrome/test/app/BUILD.gn
@@ -91,6 +91,7 @@ source_set("test_support") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web/public/security",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index 57b1ee85987..2dfe1d59e6e 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -61,7 +61,7 @@ chrome_ios_eg_test("ios_chrome_bookmarks_egtests") {
 }
 
 chrome_ios_eg_test("ios_chrome_signin_egtests") {
-  deps = [ "//ios/chrome/browser/ui/signin_interaction:eg_tests" ]
+  deps = [ "//ios/chrome/browser/ui/authentication/signin:eg_tests" ]
 }
 
 chrome_ios_eg_test("ios_chrome_settings_egtests") {
@@ -74,11 +74,6 @@ chrome_ios_eg_test("ios_chrome_settings_egtests") {
     "//ios/chrome/browser/ui/settings/password:eg_tests",
     "//ios/chrome/browser/ui/settings/sync:eg_tests",
   ]
-
-  executable_args = [
-    "--args-json",
-    "{\"test_args\": [\"--enable-features=ClearSyncedData\"]}",
-  ]
   xctest = false
 }
 
@@ -121,16 +116,11 @@ chrome_ios_eg_test("ios_chrome_web_egtests") {
 }
 
 chrome_ios_eg_test("ios_chrome_multitasking_egtests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "//ios/chrome/app/multitasking_test_application_delegate.h",
-    "//ios/chrome/app/multitasking_test_application_delegate.mm",
-  ]
-
   deps = [
     ":test_support",
     "//base",
     "//ios/chrome/app:app_internal",
+    "//ios/chrome/app:multitasking_test_app_delegate",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
 
     # Depends on all EarlGrey test suites to create multitasking tests suite.
@@ -251,6 +241,7 @@ source_set("test_support") {
     "//components/browsing_data/core",
     "//components/content_settings/core/browser",
     "//components/metrics:demographic_metrics_provider",
+    "//components/prefs",
     "//components/strings",
     "//components/sync/base",
     "//components/translate/core/browser",
@@ -313,6 +304,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/test/app:test_support",
@@ -395,6 +387,7 @@ source_set("eg_app_support+eg2") {
     "//components/browsing_data/core",
     "//components/content_settings/core/browser",
     "//components/metrics:demographic_metrics_provider",
+    "//components/prefs",
     "//components/strings",
     "//components/sync/base",
     "//components/translate/core/browser",
@@ -469,7 +462,6 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/settings/sync",
-    "//ios/chrome/browser/ui/signin_interaction:eg_app_support+eg2",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/browser/ui/table_view:feature_flags",
@@ -477,6 +469,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/toolbar:eg_app_support+eg2",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:eg_app_support+eg2",
     "//ios/chrome/browser/web:eg_app_support+eg2",
diff --git a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
index 94ee25855e4..69697ec058a 100644
--- a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
+++ b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
@@ -73,6 +73,12 @@ template("chrome_ios_eg_test") {
       if (ios_chrome_info_plist_additions != []) {
         info_plists += ios_chrome_info_plist_additions
       }
+      if (ios_chrome_info_plist_addition_targets != []) {
+        if (!defined(deps)) {
+          deps = []
+        }
+        deps += ios_chrome_info_plist_addition_targets
+      }
       if (defined(invoker.extra_info_plists)) {
         info_plists += invoker.extra_info_plists
       }
diff --git a/chromium/ios/chrome/test/earl_grey2/BUILD.gn b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
index 4331a7b9e60..35f4350a026 100644
--- a/chromium/ios/chrome/test/earl_grey2/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
@@ -13,7 +13,9 @@ group("all_tests") {
     ":ios_chrome_bookmarks_eg2tests_module",
     ":ios_chrome_device_check_eg2tests_module",
     ":ios_chrome_eg2tests",
+    ":ios_chrome_flaky_eg2tests_module",
     ":ios_chrome_integration_eg2tests_module",
+    ":ios_chrome_multitasking_eg2tests_module",
     ":ios_chrome_settings_eg2tests_module",
     ":ios_chrome_signin_eg2tests_module",
     ":ios_chrome_smoke_eg2tests_module",
@@ -25,6 +27,11 @@ group("all_tests") {
 chrome_ios_eg2_test_app_host("ios_chrome_eg2tests") {
 }
 
+chrome_ios_eg2_test_app_host("ios_chrome_multitasking_eg2tests") {
+  deps = [ "//ios/chrome/app:multitasking_test_app_delegate" ]
+  eg_main_application_delegate = "MultitaskingTestApplicationDelegate"
+}
+
 chrome_ios_eg2_test("ios_chrome_autofill_automation_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -46,6 +53,21 @@ chrome_ios_eg2_test("ios_chrome_device_check_eg2tests_module") {
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
+chrome_ios_eg2_test("ios_chrome_flaky_eg2tests_module") {
+  xcode_test_application_name = "ios_chrome_eg2tests"
+
+  deps = [
+    ":ios_chrome_bookmarks_eg2tests_module_deps_group",
+    ":ios_chrome_integration_eg2tests_module_deps_group",
+    ":ios_chrome_settings_eg2tests_module_deps_group",
+    ":ios_chrome_signin_eg2tests_module_deps_group",
+    ":ios_chrome_smoke_eg2tests_module_deps_group",
+    ":ios_chrome_ui_eg2tests_module_deps_group",
+    ":ios_chrome_web_eg2tests_module_deps_group",
+  ]
+  data_deps = [ ":ios_chrome_eg2tests" ]
+}
+
 chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -61,6 +83,7 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
     "//ios/chrome/browser/policy:eg2_tests",
     "//ios/chrome/browser/policy_url_blocking:eg2_tests",
     "//ios/chrome/browser/prerender:eg2_tests",
+    "//ios/chrome/browser/safe_browsing:eg2_tests",
     "//ios/chrome/browser/translate:eg2_tests",
     "//ios/chrome/browser/ui/autofill:eg2_tests",
     "//ios/chrome/browser/ui/autofill/manual_fill:eg2_tests",
@@ -70,6 +93,21 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
+chrome_ios_eg2_test("ios_chrome_multitasking_eg2tests_module") {
+  xcode_test_application_name = "ios_chrome_multitasking_eg2tests"
+
+  deps = [
+    ":ios_chrome_bookmarks_eg2tests_module_deps_group",
+    ":ios_chrome_integration_eg2tests_module_deps_group",
+    ":ios_chrome_settings_eg2tests_module_deps_group",
+    ":ios_chrome_signin_eg2tests_module_deps_group",
+    ":ios_chrome_smoke_eg2tests_module_deps_group",
+    ":ios_chrome_ui_eg2tests_module_deps_group",
+    ":ios_chrome_web_eg2tests_module_deps_group",
+  ]
+  data_deps = [ ":ios_chrome_multitasking_eg2tests" ]
+}
+
 chrome_ios_eg2_test("ios_chrome_smoke_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -95,7 +133,7 @@ chrome_ios_eg2_test("ios_chrome_settings_eg2tests_module") {
 chrome_ios_eg2_test("ios_chrome_signin_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
-  deps = [ "//ios/chrome/browser/ui/signin_interaction:eg2_tests" ]
+  deps = [ "//ios/chrome/browser/ui/authentication/signin:eg2_tests" ]
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
diff --git a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
index 9e7f101d9e7..a0685c3e06c 100644
--- a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
+++ b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
@@ -33,6 +33,12 @@ template("chrome_ios_eg2_test_app_host") {
       if (ios_chrome_info_plist_additions != []) {
         info_plists += ios_chrome_info_plist_additions
       }
+      if (ios_chrome_info_plist_addition_targets != []) {
+        if (!defined(deps)) {
+          deps = []
+        }
+        deps += ios_chrome_info_plist_addition_targets
+      }
       if (defined(invoker.extra_info_plists)) {
         info_plists += invoker.extra_info_plists
       }
@@ -129,6 +135,20 @@ set_defaults("chrome_ios_eg_v2_test_app_host") {
 }
 
 template("chrome_ios_eg2_test") {
+  _deps_group_name = target_name + "_deps_group"
+  group(_deps_group_name) {
+    testonly = true
+
+    public_deps = []
+    if (defined(invoker.deps)) {
+      public_deps += invoker.deps
+    }
+
+    if (defined(invoker.public_deps)) {
+      public_deps += invoker.public_deps
+    }
+  }
+
   assert(defined(invoker.xcode_test_application_name),
          "xcode_test_application_name must be defined for $target_name")
   assert(
diff --git a/chromium/ios/public/provider/chrome/browser/BUILD.gn b/chromium/ios/public/provider/chrome/browser/BUILD.gn
index 667b3ad0b4d..d43f81369ad 100644
--- a/chromium/ios/public/provider/chrome/browser/BUILD.gn
+++ b/chromium/ios/public/provider/chrome/browser/BUILD.gn
@@ -38,6 +38,7 @@ source_set("test_support") {
   deps = [
     ":browser",
     "//base",
+    "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/distribution",
     "//ios/public/provider/chrome/browser/images:test_support",
     "//ios/public/provider/chrome/browser/mailto:test_support",
diff --git a/chromium/ios/public/provider/chrome/browser/discover_feed/BUILD.gn b/chromium/ios/public/provider/chrome/browser/discover_feed/BUILD.gn
new file mode 100644
index 00000000000..41c20563958
--- /dev/null
+++ b/chromium/ios/public/provider/chrome/browser/discover_feed/BUILD.gn
@@ -0,0 +1,12 @@
+# Copyright 2020 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.
+
+source_set("discover_feed") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "discover_feed_provider.h",
+    "discover_feed_provider.mm",
+  ]
+  deps = [ "//base" ]
+}
diff --git a/chromium/ios/showcase/BUILD.gn b/chromium/ios/showcase/BUILD.gn
index 4551e4838c2..7a0ea0a5e36 100644
--- a/chromium/ios/showcase/BUILD.gn
+++ b/chromium/ios/showcase/BUILD.gn
@@ -43,10 +43,7 @@ group("features") {
 
 group("all_tests") {
   testonly = true
-  deps = [
-    ":ios_showcase_eg2tests",
-    ":ios_showcase_egtests",
-  ]
+  deps = [ ":ios_showcase_eg2tests" ]
 }
 
 ios_eg2_test_app_host("ios_showcase_eg2tests") {
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."
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index d202ba7c4b9..b980395dbf7 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -45,6 +45,7 @@ source_set("web") {
     "//ios/web/favicon",
     "//ios/web/init",
     "//ios/web/navigation",
+    "//ios/web/navigation:wk_navigation_util",
     "//ios/web/net",
     "//ios/web/public",
     "//ios/web/public/security",
@@ -240,7 +241,7 @@ source_set("ios_web_general_unittests") {
   ]
 
   sources = [
-    "browser_state_unittest.cc",
+    "browser_state_unittest.mm",
     "crw_navigation_item_storage_unittest.mm",
     "history_state_util_unittest.mm",
     "network_context_owner_unittest.cc",
@@ -503,6 +504,7 @@ source_set("ios_web_web_state_ui_unittests") {
     "web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm",
     "web_state/ui/html_element_fetch_request_unittest.mm",
     "web_state/ui/web_view_js_utils_unittest.mm",
+    "web_state/ui/wk_content_rule_list_util_unittest.mm",
     "web_state/ui/wk_web_view_configuration_provider_unittest.mm",
   ]
 }
@@ -581,7 +583,9 @@ test("ios_web_inttests") {
   ]
   sources = [
     "browser_state_web_view_partition_inttest.mm",
+    "cookie_blocking_inttest.mm",
     "find_in_page/find_in_page_manager_inttest.mm",
+    "navigation/crw_wk_navigation_handler_inttest.mm",
     "navigation/error_page_helper_inttest.mm",
     "navigation/history_state_operations_inttest.mm",
     "navigation/meta_tag_inttest.mm",
@@ -624,7 +628,9 @@ js_compile_bundle("all_frames_web_bundle") {
     "web_state/js/resources/all_frames_web_bundle.js",
     "web_state/js/resources/base.js",
     "web_state/js/resources/common.js",
+    "web_state/js/resources/cookie.js",
     "web_state/js/resources/find_in_page.js",
+    "web_state/js/resources/share_workaround.js",
   ]
 }
 
diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn
index 51d0f5f60a3..338bac02fab 100644
--- a/chromium/ios/web/common/BUILD.gn
+++ b/chromium/ios/web/common/BUILD.gn
@@ -21,6 +21,7 @@ source_set("common") {
 
   deps = [
     "//base",
+    "//ios/third_party/webkit",
     "//ios/web/public/navigation",
     "//net",
     "//services/network/public/cpp",
diff --git a/chromium/ios/web/download/BUILD.gn b/chromium/ios/web/download/BUILD.gn
index a6665e43e60..97b6af85329 100644
--- a/chromium/ios/web/download/BUILD.gn
+++ b/chromium/ios/web/download/BUILD.gn
@@ -33,6 +33,7 @@ source_set("download_cookies") {
   visibility = [ ":*" ]
 
   deps = [
+    "//base",
     "//ios/net",
     "//net",
   ]
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index d186c122e23..873de4df891 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -57,8 +57,6 @@ source_set("navigation") {
     "navigation_item_impl_list.mm",
     "navigation_item_storage_builder.h",
     "navigation_item_storage_builder.mm",
-    "nscoder_util.h",
-    "nscoder_util.mm",
     "serializable_user_data_manager_impl.h",
     "serializable_user_data_manager_impl.mm",
     "session_storage_builder.h",
@@ -86,6 +84,7 @@ source_set("core") {
     "//base",
     "//components/url_formatter:url_formatter",
     "//ios/web/common:features",
+    "//ios/web/common:user_agent",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/public/deprecated:deprecated_navigation_util",
@@ -119,6 +118,8 @@ source_set("wk_navigation_util") {
   ]
 
   sources = [
+    "nscoder_util.h",
+    "nscoder_util.mm",
     "wk_navigation_util.h",
     "wk_navigation_util.mm",
   ]
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index bdfdd918b19..fe158c19610 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -7,6 +7,7 @@ import("//ios/build/config.gni")
 source_set("public") {
   public_deps = [
     ":web_state_observer",
+    "//ios/web/public/browsing_data",
     "//ios/web/public/favicon",
     "//ios/web/public/navigation",
     "//ios/web/public/thread",
diff --git a/chromium/ios/web/public/browsing_data/BUILD.gn b/chromium/ios/web/public/browsing_data/BUILD.gn
index b64bd947690..2ee6ef21e98 100644
--- a/chromium/ios/web/public/browsing_data/BUILD.gn
+++ b/chromium/ios/web/public/browsing_data/BUILD.gn
@@ -7,8 +7,11 @@ import("//ios/build/config.gni")
 source_set("browsing_data") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
+  deps = [ "//base" ]
+
   sources = [
     "browsing_data_removing_util.h",
+    "cookie_blocking_mode.h",
     "system_cookie_store_util.h",
   ]
 }
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 59e41103b92..9a6f8abb406 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -82,6 +82,8 @@ source_set("util") {
   sources = [
     "error_test_util.h",
     "error_test_util.mm",
+    "js_test_storage_util.h",
+    "js_test_storage_util.mm",
     "js_test_util.h",
     "js_test_util.mm",
     "navigation_test_util.h",
diff --git a/chromium/ios/web/session/BUILD.gn b/chromium/ios/web/session/BUILD.gn
index 3cdd37c5fc7..62c50691c49 100644
--- a/chromium/ios/web/session/BUILD.gn
+++ b/chromium/ios/web/session/BUILD.gn
@@ -6,6 +6,8 @@ source_set("session") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
     "//base",
+    "//ios/web/common:features",
+    "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/public/security",
     "//ios/web/public/session",
diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn
index 7d293ddc9f3..bc89e7f700c 100644
--- a/chromium/ios/web/shell/test/BUILD.gn
+++ b/chromium/ios/web/shell/test/BUILD.gn
@@ -11,7 +11,6 @@ group("all_tests") {
   deps = [
     ":ios_web_shell_eg2tests",
     ":ios_web_shell_eg2tests_module",
-    ":ios_web_shell_egtests",
   ]
 }
 
@@ -29,6 +28,7 @@ ios_eg_test("ios_web_shell_egtests") {
     "//base/test:test_support",
     "//ios/testing:http_server_bundle_data",
     "//ios/testing/earl_grey:earl_grey_support",
+    "//ios/third_party/webkit",
     "//ios/web",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn
index 8134126797e..16539ceebe1 100644
--- a/chromium/ios/web/test/BUILD.gn
+++ b/chromium/ios/web/test/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/web/js_compile.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
@@ -50,9 +51,11 @@ source_set("test_support") {
   public_deps = [ "//testing/gtest" ]
 
   deps = [
+    ":all_frames_web_test_bundle",
     ":test_constants",
     "//base",
     "//base/test:test_support",
+    "//components/crash/core/common",
     "//ios/testing:verify_custom_webkit",
     "//ios/web",
     "//ios/web/common:web_view_creation_util",
@@ -87,3 +90,13 @@ source_set("test_constants") {
     "test_url_constants.h",
   ]
 }
+
+js_compile_bundle("all_frames_web_test_bundle") {
+  testonly = true
+  closure_entry_point = "__crWeb.allFramesWebTestBundle"
+
+  sources = [
+    "resources/all_frames_web_test_bundle.js",
+    "resources/cookie_test.js",
+  ]
+}
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index fa4bb9b18e4..3bf748f8dca 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -122,6 +122,7 @@ source_set("user_interaction") {
 
   deps = [
     "//base",
+    "//ios/third_party/webkit",
     "//url",
   ]
 
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index 5f89ebeb49f..216fcbb8679 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -47,6 +47,8 @@ source_set("ui") {
   ]
 
   sources = [
+    "cookie_blocking_error_logger.h",
+    "cookie_blocking_error_logger.mm",
     "crw_swipe_recognizer_provider.h",
     "crw_touch_tracking_recognizer.h",
     "crw_touch_tracking_recognizer.mm",
@@ -124,6 +126,10 @@ source_set("wk_web_view_configuration_provider") {
   ]
 
   sources = [
+    "wk_content_rule_list_provider.h",
+    "wk_content_rule_list_provider.mm",
+    "wk_content_rule_list_util.h",
+    "wk_content_rule_list_util.mm",
     "wk_web_view_configuration_provider.h",
     "wk_web_view_configuration_provider.mm",
     "wk_web_view_configuration_provider_observer.h",
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index 627cb45bafe..23240a5d1fa 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/ios/rules.gni")
 import("//build/config/locales.gni")
+import("//build/mac/tweak_info_plist.gni")
 import("//components/cronet/native/include/headers.gni")
 import("//components/grpc_support/include/headers.gni")
 import("//ios/build/config.gni")
@@ -278,6 +279,7 @@ source_set("web_view_sources") {
     "//components/pref_registry",
     "//components/prefs",
     "//components/proxy_config",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/security_state/ios",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
@@ -303,6 +305,7 @@ source_set("web_view_sources") {
     "//ios/components/webui:url_constants",
     "//ios/components/webui/sync_internals",
     "//ios/net",
+    "//ios/third_party/webkit",
     "//ios/web",
     "//ios/web/common",
     "//ios/web/common:user_agent",
@@ -327,8 +330,32 @@ source_set("web_view_sources") {
   ]
 }
 
-# Generate the umbrella header.
-action("web_view_umbrella_header") {
+# Two umbrella headers may be generated:
+# - One that matches ios_web_view_output_name, e.g. CronetChromeWebView.h
+# - Another that is hardcoded as ChromeWebView.h
+#
+# This is needed to fix the issue where the generated .modulemap points to a
+# non-existent umbrella header.
+#
+# TODO(crbug.com/1084855): Remove :web_view_umbrella_header_old after all
+# clients migrate off of it.
+if (ios_web_view_generate_extra_umbrella_header) {
+  action("web_view_umbrella_header") {
+    script = "//build/config/ios/generate_umbrella_header.py"
+
+    full_header_path = target_gen_dir + "/" + ios_web_view_output_name + ".h"
+    outputs = [ full_header_path ]
+
+    args = [
+      "--output-path",
+      rebase_path(full_header_path, root_build_dir),
+    ]
+
+    args += rebase_path(ios_web_view_public_headers, root_build_dir)
+  }
+}
+
+action("web_view_umbrella_header_old") {
   script = "//build/config/ios/generate_umbrella_header.py"
 
   full_header_path = target_gen_dir + "/ChromeWebView.h"
@@ -342,12 +369,19 @@ action("web_view_umbrella_header") {
   args += rebase_path(ios_web_view_public_headers, root_build_dir)
 }
 
+tweak_info_plist("info_plist") {
+  info_plists = [ "Info.plist" ]
+}
+
 ios_framework_bundle("web_view") {
   output_name = ios_web_view_output_name
-  info_plist = "Info.plist"
+  info_plist_target = ":info_plist"
 
-  public_headers = ios_web_view_public_headers
-  public_headers += get_target_outputs(":web_view_umbrella_header")
+  public_headers = get_target_outputs(":web_view_umbrella_header_old")
+  if (ios_web_view_generate_extra_umbrella_header) {
+    public_headers += get_target_outputs(":web_view_umbrella_header")
+  }
+  public_headers += ios_web_view_public_headers
   if (ios_web_view_include_cronet) {
     public_headers += [ "//components/cronet/ios/Cronet.h" ]
     public_headers += grpc_public_headers
@@ -362,10 +396,14 @@ ios_framework_bundle("web_view") {
 
   deps = [
     ":web_view_sources",
-    ":web_view_umbrella_header",
+    "//ios/third_party/webkit",
     "//ios/web/public/init",
     "//testing/gtest:ios_coverage_utils",
   ]
+  deps += [ ":web_view_umbrella_header_old" ]
+  if (ios_web_view_generate_extra_umbrella_header) {
+    deps += [ ":web_view_umbrella_header" ]
+  }
   if (ios_web_view_include_cronet) {
     deps += [ "//components/cronet/ios:cronet_sources" ]
   }
diff --git a/chromium/ios/web_view/features.gni b/chromium/ios/web_view/features.gni
index 6d731811537..772ba8f1f98 100644
--- a/chromium/ios/web_view/features.gni
+++ b/chromium/ios/web_view/features.gni
@@ -9,3 +9,14 @@ declare_args() {
   # Controls the output name of the built framework.
   ios_web_view_output_name = "ChromeWebView"
 }
+
+declare_args() {
+  # If ios_web_view_output_name is overriden, e.g. to CronetChromeWebView, we
+  # need to generate an extra umbrella header to match the output name of the
+  # framework bundle.
+  #
+  # TODO(crbug.com/1084855): Remove this after all clients migrate to the
+  # umbrella header that matches the framework.
+  ios_web_view_generate_extra_umbrella_header =
+      ios_web_view_output_name != "ChromeWebView"
+}
diff --git a/chromium/ios/web_view/shell/BUILD.gn b/chromium/ios/web_view/shell/BUILD.gn
index 70bb0f1199e..3920690e072 100644
--- a/chromium/ios/web_view/shell/BUILD.gn
+++ b/chromium/ios/web_view/shell/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/ios/rules.gni")
-import("//ios/third_party/features.gni")
 
 declare_args() {
   # Authorization service implementation used in ios_web_view_shell. Uses a fake
@@ -40,18 +39,16 @@ ios_app_bundle("ios_web_view_shell") {
   ]
   entitlements_path = ios_web_view_shell_entitlements_path
 
-  if (ios_third_party_material_components_built_as_framework) {
-    if (ios_web_view_shell_links_with_material_components_framework) {
-      deps += [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    } else {
-      assert_no_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    }
+  if (ios_web_view_shell_links_with_material_components_framework) {
+    deps += [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  } else {
+    assert_no_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
   }
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/web_view/shell/test/BUILD.gn b/chromium/ios/web_view/shell/test/BUILD.gn
index 63c4ddf4815..b717678567f 100644
--- a/chromium/ios/web_view/shell/test/BUILD.gn
+++ b/chromium/ios/web_view/shell/test/BUILD.gn
@@ -4,8 +4,8 @@
 
 import("//ios/build/config.gni")
 import("//ios/third_party/earl_grey/ios_eg_test.gni")
-import("//ios/third_party/features.gni")
 
+# TODO(crbug.com/698657): Remove these EarlGrey tests or convert to EarlGrey 2.
 group("all_tests") {
   testonly = true
   deps = [ ":ios_web_view_shell_egtests" ]
@@ -19,19 +19,14 @@ ios_eg_test("ios_web_view_shell_egtests") {
   deps = [
     ":earl_grey_test_support",
     "//ios/testing:http_server_bundle_data",
+    "//ios/third_party/material_components_ios:material_components_ios+bundle",
+    "//ios/third_party/material_components_ios:material_components_ios+link",
     "//ios/web_view:web_view+link",
     "//ios/web_view/shell:shell",
     "//ios/web_view/test:test_support",
     "//net:test_support",
   ]
 
-  if (ios_third_party_material_components_built_as_framework) {
-    deps += [
-      "//ios/third_party/material_components_ios:material_components_ios+bundle",
-      "//ios/third_party/material_components_ios:material_components_ios+link",
-    ]
-  }
-
   configs += [ "//build/config/compiler:enable_arc" ]
 
   assert_no_deps = ios_assert_no_deps
diff --git a/chromium/ios/web_view/test/BUILD.gn b/chromium/ios/web_view/test/BUILD.gn
index be963be4a49..7a84ea756f1 100644
--- a/chromium/ios/web_view/test/BUILD.gn
+++ b/chromium/ios/web_view/test/BUILD.gn
@@ -61,6 +61,7 @@ source_set("test_support") {
   deps = [
     "//base:base",
     "//base/test:test_support",
+    "//ios/third_party/webkit",
     "//testing/gtest",
     "//ui/base",
   ]
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-12 14:27:29 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-13 09:35:20 +0000
commit	c30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
tree	e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ios
parent	7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
download	qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz