BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2021-05-20 09:47:09 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2021-06-07 11:15:42 +0000
commit: 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree: 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/ios/chrome/browser
parent: 8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
download: qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
112 files changed, 895 insertions, 309 deletions
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index f73b093fe6e..8f21db1b25f 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -188,15 +188,16 @@ source_set("browser_impl") {
     ":browser",
     "//base",
     "//base/allocator:buildflags",
+    "//components/breadcrumbs/core",
     "//components/component_updater",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
+    "//components/crash/core/common:reporter_running_ios",
     "//components/flags_ui",
     "//components/gcm_driver",
     "//components/history/core/browser",
     "//components/keyed_service/core",
     "//components/language/core/browser",
-    "//components/language_usage_metrics",
     "//components/metrics",
     "//components/metrics:child_call_stack_profile_builder",
     "//components/metrics_services_manager",
@@ -204,7 +205,6 @@ source_set("browser_impl") {
     "//components/network_time",
     "//components/open_from_clipboard",
     "//components/prefs",
-    "//components/rappor",
     "//components/safe_browsing/core:features",
     "//components/sessions",
     "//components/translate/core/browser",
@@ -219,6 +219,7 @@ source_set("browser_impl") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/component_updater",
+    "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/crash_report/breadcrumbs:application_breadcrumbs_logger",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
diff --git a/chromium/ios/chrome/browser/accessibility/BUILD.gn b/chromium/ios/chrome/browser/accessibility/BUILD.gn
new file mode 100644
index 00000000000..2847e0cdb35
--- /dev/null
+++ b/chromium/ios/chrome/browser/accessibility/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.
+
+source_set("accessibility") {
+  sources = [
+    "window_accessibility_change_notifier_app_agent.h",
+    "window_accessibility_change_notifier_app_agent.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//ios/chrome/app/application_delegate:app_state_header",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/main:scene_state_header",
+    "//ui/base",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index 0b2debc220c..4331cad83bc 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -70,7 +70,6 @@ source_set("autofill") {
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ios/web/common",
-    "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//third_party/leveldatabase",
     "//third_party/libaddressinput",
@@ -179,7 +178,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/webdata_services",
     "//ios/testing:block_swizzler",
-    "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//ios/web/public/test",
     "//testing/gtest",
@@ -364,6 +362,10 @@ bundle_data("unit_tests_bundle_data") {
     "//components/test/data/autofill/heuristics/input/171_i18n_ru_structured_address_2.html",
     "//components/test/data/autofill/heuristics/input/172_i18n_pt_structured_address_1.html",
     "//components/test/data/autofill/heuristics/input/173_i18n_pt_structured_address_2.html",
+    "//components/test/data/autofill/heuristics/input/174_i18n_id.html",
+    "//components/test/data/autofill/heuristics/input/175_id_address_alfacart.com.html",
+    "//components/test/data/autofill/heuristics/input/176_id_payment_shopee.co.id.html",
+    "//components/test/data/autofill/heuristics/input/177_reichelt.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",
@@ -537,6 +539,10 @@ bundle_data("unit_tests_bundle_data") {
     "//components/test/data/autofill/heuristics/output/171_i18n_ru_structured_address_2.out",
     "//components/test/data/autofill/heuristics/output/172_i18n_pt_structured_address_1.out",
     "//components/test/data/autofill/heuristics/output/173_i18n_pt_structured_address_2.out",
+    "//components/test/data/autofill/heuristics/output/174_i18n_id.out",
+    "//components/test/data/autofill/heuristics/output/175_id_address_alfacart.com.out",
+    "//components/test/data/autofill/heuristics/output/176_id_payment_shopee.co.id.out",
+    "//components/test/data/autofill/heuristics/output/177_reichelt.out",
   ]
   outputs = [ "{{bundle_resources_dir}}/" +
               "{{source_root_relative_dir}}/{{source_file_part}}" ]
@@ -559,7 +565,6 @@ source_set("eg2_tests") {
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
     "//ios/web/public",
-    "//ios/web/public/deprecated",
     "//ios/web/public/test:element_selector",
     "//net:test_support",
   ]
diff --git a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
index 6e44e244b11..881f1150198 100644
--- a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
@@ -16,7 +16,7 @@ source_set("manual_fill") {
     "//components/password_manager/core/browser",
     "//components/password_manager/core/browser:affiliation",
     "//ios/chrome/browser/browser_state:browser_state",
-    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/passwords:save_passwords_consumer",
   ]
   frameworks = [ "UIKit.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn
index 4da69bc80ae..f4ea5e885d1 100644
--- a/chromium/ios/chrome/browser/crash_report/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn
@@ -4,8 +4,10 @@
 
 source_set("crash_report") {
   sources = [
-    "breakpad_helper.h",
-    "breakpad_helper.mm",
+    "chrome_crash_reporter_client.cc",
+    "chrome_crash_reporter_client.h",
+    "crash_helper.h",
+    "crash_helper.mm",
     "crash_keys_helper.h",
     "crash_keys_helper.mm",
     "crash_loop_detection_util.h",
@@ -29,8 +31,11 @@ source_set("crash_report") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
-    ":constants",
     "//base",
+    "//build:branding_buildflags",
+    "//components/breadcrumbs/core",
+    "//components/crash/core/app",
+    "//components/crash/core/browser",
     "//components/crash/core/common",
     "//components/previous_session_info",
     "//components/upload_list",
@@ -39,15 +44,12 @@ source_set("crash_report") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
+    "//ios/chrome/common",
     "//ios/web",
     "//third_party/breakpad:client",
   ]
 }
 
-source_set("constants") {
-  sources = [ "crash_reporter_breadcrumb_constants.h" ]
-}
-
 source_set("crash_report_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -61,6 +63,8 @@ source_set("crash_report_internal") {
   deps = [
     ":crash_report",
     "//base",
+    "//components/breadcrumbs/core",
+    "//components/crash/core/common:crash_key_lib",
     "//components/infobars/core",
     "//components/previous_session_info",
     "//components/sessions",
@@ -78,7 +82,6 @@ source_set("crash_report_internal") {
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/main:scene_state_header",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
@@ -91,7 +94,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "breakpad_helper_unittest.mm",
+    "crash_helper_unittest.mm",
     "crash_loop_detection_util_unittest.mm",
     "crash_reporter_breadcrumb_observer_unittest.mm",
     "crash_reporter_url_observer_unittest.mm",
@@ -99,11 +102,11 @@ source_set("unit_tests") {
     "synthetic_crash_report_util_unittest.mm",
   ]
   deps = [
-    ":constants",
     ":crash_report",
     ":crash_report_internal",
     "//base",
     "//base/test:test_support",
+    "//components/breadcrumbs/core",
     "//components/previous_session_info",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
@@ -111,7 +114,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test/ocmock",
diff --git a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
index df0279000e8..360b9cc5ea0 100644
--- a/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/breadcrumbs/BUILD.gn
@@ -16,12 +16,12 @@ source_set("feature_flags") {
 source_set("breadcrumbs") {
   deps = [
     "//base",
+    "//components/breadcrumbs/core",
     "//components/infobars/core",
     "//components/keyed_service/core",
     "//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",
@@ -33,15 +33,12 @@ source_set("breadcrumbs") {
   ]
 
   sources = [
-    "breadcrumb_manager.cc",
-    "breadcrumb_manager.h",
     "breadcrumb_manager_browser_agent.h",
     "breadcrumb_manager_browser_agent.mm",
     "breadcrumb_manager_keyed_service.cc",
     "breadcrumb_manager_keyed_service.h",
     "breadcrumb_manager_keyed_service_factory.cc",
     "breadcrumb_manager_keyed_service_factory.h",
-    "breadcrumb_manager_observer.h",
     "breadcrumb_manager_observer_bridge.h",
     "breadcrumb_manager_observer_bridge.mm",
     "breadcrumb_manager_tab_helper.h",
@@ -67,6 +64,7 @@ source_set("application_breadcrumbs_logger") {
     ":breadcrumbs",
     ":generate_not_user_triggered_actions",
     "//base",
+    "//components/breadcrumbs/core",
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/crash_report/breadcrumbs",
   ]
@@ -80,10 +78,10 @@ source_set("unit_tests") {
     ":breadcrumbs",
     ":generate_not_user_triggered_actions",
     "//base/test:test_support",
+    "//components/breadcrumbs/core",
     "//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",
diff --git a/chromium/ios/chrome/browser/download/BUILD.gn b/chromium/ios/chrome/browser/download/BUILD.gn
index f322a06388d..3e90fa074d8 100644
--- a/chromium/ios/chrome/browser/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/download/BUILD.gn
@@ -37,7 +37,6 @@ source_set("download") {
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings:ios_strings",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/network_activity",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/confirmation",
     "//ios/chrome/browser/overlays/public/common/confirmation:util",
@@ -87,7 +86,6 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/download",
-    "//ios/chrome/browser/network_activity",
     "//ios/chrome/test/fakes",
     "//ios/web/public",
     "//ios/web/public/download",
diff --git a/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
index f9f4aec8ff0..4a3f22d7c74 100644
--- a/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
+++ b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
@@ -5,13 +5,8 @@
 source_set("drag_and_drop") {
   configs += [ "//build/config/compiler:enable_arc" ]
   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",
@@ -27,14 +22,3 @@ source_set("drag_and_drop") {
   ]
   frameworks = [ "UIKit.framework" ]
 }
-
-source_set("unit_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "drop_and_navigate_interaction_unittest.mm" ]
-  deps = [
-    ":drag_and_drop",
-    "//base",
-    "//testing/gtest",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn
index dc7c85a93e4..115936624b9 100644
--- a/chromium/ios/chrome/browser/flags/BUILD.gn
+++ b/chromium/ios/chrome/browser/flags/BUILD.gn
@@ -22,7 +22,6 @@ source_set("flags") {
     "//components/feature_engagement/public",
     "//components/flags_ui",
     "//components/flags_ui:switches",
-    "//components/infobars/core:feature_flags",
     "//components/invalidation/impl:feature_list",
     "//components/ntp_tiles",
     "//components/omnibox/browser",
@@ -35,6 +34,7 @@ source_set("flags") {
     "//components/search_provider_logos",
     "//components/security_state/core",
     "//components/send_tab_to_self",
+    "//components/shared_highlighting/core/common",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
     "//components/signin/public/base",
@@ -57,11 +57,12 @@ source_set("flags") {
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
-    "//ios/chrome/browser/ui/page_info:features",
-    "//ios/chrome/browser/ui/settings/autofill:feature_flags",
+    "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/ui/start_surface:feature_flags",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid:features",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
+    "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/public/provider/chrome/browser",
     "//ios/web/common",
diff --git a/chromium/ios/chrome/browser/geolocation/BUILD.gn b/chromium/ios/chrome/browser/geolocation/BUILD.gn
index 08e9aaf5f3f..61094ae3cc3 100644
--- a/chromium/ios/chrome/browser/geolocation/BUILD.gn
+++ b/chromium/ios/chrome/browser/geolocation/BUILD.gn
@@ -55,10 +55,12 @@ source_set("unit_tests") {
   sources = [
     "CLLocation+XGeoHeaderTest.mm",
     "location_manager_unittest.mm",
+    "omnibox_geolocation_controller_unittest.mm",
     "omnibox_geolocation_local_state_unittest.mm",
   ]
   deps = [
     ":geolocation",
+    ":geolocation_internal",
     "//base",
     "//components/prefs:test_support",
     "//ios/chrome/test:test_support",
@@ -81,6 +83,7 @@ source_set("geolocation_internal") {
     "//base",
     "//components/google/core/common",
     "//components/version_info",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/tabs",
diff --git a/chromium/ios/chrome/browser/history/BUILD.gn b/chromium/ios/chrome/browser/history/BUILD.gn
index d05ebacaa4b..3426dac1c12 100644
--- a/chromium/ios/chrome/browser/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/history/BUILD.gn
@@ -4,6 +4,8 @@
 
 source_set("history") {
   sources = [
+    "domain_diversity_reporter_factory.h",
+    "domain_diversity_reporter_factory.mm",
     "history_backend_client_impl.cc",
     "history_backend_client_impl.h",
     "history_client_impl.cc",
@@ -24,6 +26,7 @@ source_set("history") {
     "//components/dom_distiller/core",
     "//components/history/core/browser",
     "//components/history/ios/browser",
+    "//components/history/metrics",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/pref_registry",
@@ -37,6 +40,7 @@ source_set("history") {
     "//net",
     "//url",
   ]
+  configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("tab_helper") {
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
index bc0ce8f9e88..f108929b7e5 100644
--- 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
@@ -33,7 +33,6 @@ source_set("unit_tests") {
   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",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn
index 92bd5a5dc6f..a491a40960f 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn
@@ -44,7 +44,6 @@ source_set("unit_tests") {
   deps = [
     ":passwords",
     "//base/test:test_support",
-    "//components/infobars/core:feature_flags",
     "//components/password_manager/core/browser:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
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
index 65a387ce7a4..fb17ad2cf31 100644
--- 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
@@ -46,7 +46,6 @@ source_set("unit_tests") {
     ":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",
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
index 06075ba9e35..6e851242a5b 100644
--- 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
@@ -45,7 +45,6 @@ source_set("unit_tests") {
   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",
diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn
index 981c7e1579f..ae4eb734604 100644
--- a/chromium/ios/chrome/browser/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/main/BUILD.gn
@@ -52,6 +52,7 @@ source_set("main") {
     "//ios/chrome/browser/device_sharing",
     "//ios/chrome/browser/infobars/overlays/browser_agent:browser_agent_util",
     "//ios/chrome/browser/metrics:metrics_browser_agent",
+    "//ios/chrome/browser/policy",
     "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
@@ -61,6 +62,7 @@ source_set("main") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index 744a6492397..869ffec56ed 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -63,7 +63,6 @@ source_set("metrics") {
     "//components/omnibox/browser",
     "//components/prefs",
     "//components/previous_session_info",
-    "//components/rappor",
     "//components/signin/core/browser",
     "//components/sync",
     "//components/sync_device_info",
@@ -87,7 +86,6 @@ source_set("metrics") {
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/variations",
     "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory",
@@ -180,8 +178,6 @@ source_set("metrics_browser_agent") {
 source_set("metrics_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "drag_and_drop_recorder.h",
-    "drag_and_drop_recorder.mm",
     "first_user_action_recorder.cc",
     "first_user_action_recorder.h",
     "new_tab_page_uma.h",
diff --git a/chromium/ios/chrome/browser/network_activity/BUILD.gn b/chromium/ios/chrome/browser/network_activity/BUILD.gn
deleted file mode 100644
index 5f41c2e8178..00000000000
--- a/chromium/ios/chrome/browser/network_activity/BUILD.gn
+++ /dev/null
@@ -1,42 +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.
-
-source_set("network_activity") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "network_activity_indicator_manager.h",
-    "network_activity_indicator_manager.mm",
-  ]
-  deps = [ "//base" ]
-}
-
-source_set("tab_helper") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "network_activity_indicator_tab_helper.h",
-    "network_activity_indicator_tab_helper.mm",
-  ]
-  deps = [
-    ":network_activity",
-    "//base",
-    "//ios/web/public",
-  ]
-}
-
-source_set("unit_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "network_activity_indicator_manager_unittest.mm",
-    "network_activity_indicator_tab_helper_unittest.mm",
-  ]
-  deps = [
-    ":network_activity",
-    ":tab_helper",
-    "//ios/web/public",
-    "//ios/web/public/test",
-    "//ios/web/public/test/fakes",
-    "//testing/gtest",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index 4e091b9c548..d961c58e393 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -7,8 +7,8 @@ import("//ios/web/js_compile.gni")
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "credentials_cleaner_runner_factory.cc",
-    "credentials_cleaner_runner_factory.h",
+    "ios_chrome_affiliation_service_factory.cc",
+    "ios_chrome_affiliation_service_factory.h",
     "ios_chrome_bulk_leak_check_service_factory.cc",
     "ios_chrome_bulk_leak_check_service_factory.h",
     "ios_chrome_change_password_url_service_factory.cc",
@@ -21,8 +21,6 @@ source_set("passwords") {
     "ios_chrome_password_manager_client.mm",
     "ios_chrome_password_manager_driver.h",
     "ios_chrome_password_manager_driver.mm",
-    "ios_chrome_password_store_factory.cc",
-    "ios_chrome_password_store_factory.h",
     "ios_password_requirements_service_factory.cc",
     "ios_password_requirements_service_factory.h",
     "notify_auto_signin_view_controller.h",
@@ -37,13 +35,12 @@ source_set("passwords") {
     "password_store_observer_bridge.mm",
     "password_tab_helper.h",
     "password_tab_helper.mm",
-    "save_passwords_consumer.h",
-    "save_passwords_consumer.mm",
     "well_known_change_password_tab_helper.h",
     "well_known_change_password_tab_helper.mm",
   ]
   deps = [
     ":infobar_delegates",
+    ":store_factory",
     "//base",
     "//base:i18n",
     "//components/autofill/core/browser",
@@ -75,8 +72,11 @@ source_set("passwords") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/safe_browsing",
+    "//ios/chrome/browser/safe_browsing:features",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ssl",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/translate:translate",
     "//ios/chrome/browser/ui:feature_flags",
@@ -95,18 +95,55 @@ source_set("passwords") {
     "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
     "//ios/web/common",
-    "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//net",
     "//third_party/material_design_icons:ic_account_circle",
     "//ui/base",
     "//url",
   ]
-  public_deps = [ ":passwords_generation_utils" ]
+  public_deps = [
+    ":passwords_generation_utils",
+    ":store_factory",
+  ]
 
   allow_circular_includes_from = [ ":passwords_generation_utils" ]
 }
 
+source_set("save_passwords_consumer") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "save_passwords_consumer.h",
+    "save_passwords_consumer.mm",
+  ]
+  deps = [ "//components/password_manager/core/browser" ]
+}
+
+source_set("store_factory") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "credentials_cleaner_runner_factory.cc",
+    "credentials_cleaner_runner_factory.h",
+    "ios_chrome_password_store_factory.cc",
+    "ios_chrome_password_store_factory.h",
+  ]
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/common",
+    "//components/signin/public/identity_manager",
+    "//components/sync",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync/glue",
+    "//ios/chrome/browser/webdata_services",
+    "//ios/web/public",
+    "//services/network/public/cpp",
+  ]
+}
+
 source_set("infobar_delegates") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -202,16 +239,21 @@ source_set("eg2_tests") {
     "//build/config/ios:xctest_config",
   ]
   testonly = true
+  sources = [ "password_controller_egtest.mm" ]
   deps = [
     ":eg_test_support+eg2",
     "//base",
     "//base/test:test_support",
     "//components/password_manager/core/common",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/infobars/banners:public",
+    "//ios/chrome/test:eg_test_support+eg2",
     "//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/public/test/http_server",
     "//net:test_support",
+    "//ui/base:base",
   ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -230,6 +272,7 @@ source_set("eg_app_support+eg2") {
   deps = [
     ":passwords",
     "//base",
+    "//base/test:test_support",
     "//components/autofill/core/common",
     "//components/keyed_service/core",
     "//components/password_manager/core/browser",
diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn
index 891b6744add..54057725bf8 100644
--- a/chromium/ios/chrome/browser/policy/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/BUILD.gn
@@ -8,6 +8,8 @@ source_set("policy") {
     "browser_dm_token_storage_ios.mm",
     "browser_policy_connector_ios.h",
     "browser_policy_connector_ios.mm",
+    "browser_signin_policy_handler.cc",
+    "browser_signin_policy_handler.h",
     "browser_state_policy_connector.h",
     "browser_state_policy_connector.mm",
     "browser_state_policy_connector_factory.h",
@@ -20,6 +22,8 @@ source_set("policy") {
     "device_management_service_configuration_ios.mm",
     "policy_conversions_client_ios.h",
     "policy_conversions_client_ios.mm",
+    "policy_watcher_browser_agent.h",
+    "policy_watcher_browser_agent.mm",
     "reporting/browser_report_generator_ios.h",
     "reporting/browser_report_generator_ios.mm",
     "reporting/profile_report_generator_ios.h",
@@ -48,14 +52,19 @@ source_set("policy") {
     "//components/safe_browsing/core/common:safe_browsing_policy_handler",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/search_engines",
+    "//components/signin/public/base",
+    "//components/strings:components_strings_grit",
     "//components/translate/core/browser:translate_pref_names",
+    "//components/unified_consent:unified_consent",
     "//components/variations",
     "//components/variations/service",
     "//components/version_info:version_info",
     "//ios/chrome/browser",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser/signin",
     "//services/network/public/cpp",
@@ -69,6 +78,20 @@ source_set("policy") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("policy_util") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "policy_util.h",
+    "policy_util.mm",
+  ]
+  deps = [
+    ":feature_flags",
+    "//base",
+    "//components/prefs",
+    "//ios/chrome/browser:pref_names",
+  ]
+}
+
 source_set("feature_flags") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -135,6 +158,7 @@ source_set("unit_tests") {
   sources = [
     "browser_dm_token_storage_ios_unittest.mm",
     "policy_unittest.mm",
+    "policy_watcher_browser_agent_unittest.mm",
     "reporting/browser_report_generator_ios_unittest.mm",
     "reporting/profile_report_generator_ios_unittest.mm",
     "reporting/report_generator_ios_unittest.mm",
@@ -149,17 +173,26 @@ source_set("unit_tests") {
     "//components/enterprise",
     "//components/enterprise:test_support",
     "//components/policy/core/browser:test_support",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/signin/public/base",
+    "//components/sync_preferences",
+    "//components/sync_preferences:test_support",
     "//ios/chrome/browser:chrome_paths",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/prefs",
+    "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin:signin",
     "//ios/chrome/browser/signin:test_support",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/web/public/test:test",
     "//testing/gtest",
+    "//third_party/ocmock",
   ]
 }
 
@@ -173,6 +206,7 @@ source_set("eg2_tests") {
 
   sources = [
     "policy_egtest.mm",
+    "policy_incognito_mode_availability_egtest.mm",
     "policy_platform_provider_egtest.mm",
   ]
 
@@ -187,6 +221,7 @@ source_set("eg2_tests") {
     "//components/policy/core/common:common_constants",
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/translate:eg_test_support+eg2",
@@ -197,6 +232,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/settings/language:language_ui_constants",
     "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
+    "//ios/chrome/browser/ui/toolbar/public: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",
diff --git a/chromium/ios/chrome/browser/policy/resources/BUILD.gn b/chromium/ios/chrome/browser/policy/resources/BUILD.gn
new file mode 100644
index 00000000000..5e3709b497b
--- /dev/null
+++ b/chromium/ios/chrome/browser/policy/resources/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2021 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("enterprise_icon_blue_large") {
+  sources = [
+    "enterprise_icon_blue_large.imageset/Contents.json",
+    "enterprise_icon_blue_large.imageset/enterprise_icon_blue_large@2x.png",
+    "enterprise_icon_blue_large.imageset/enterprise_icon_blue_large@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index c7689cf4d06..c50c596999c 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -33,9 +33,11 @@ source_set("browser_prefs") {
   deps = [
     "//components/autofill/core/browser",
     "//components/browsing_data/core",
+    "//components/component_updater/installer_policies:installer_policies",
     "//components/content_settings/core/browser",
     "//components/dom_distiller/core",
     "//components/enterprise",
+    "//components/feed/core/common:feed_core_common",
     "//components/feed/core/shared_prefs:feed_shared_prefs",
     "//components/flags_ui",
     "//components/gcm_driver",
@@ -56,7 +58,6 @@ source_set("browser_prefs") {
     "//components/pref_registry",
     "//components/prefs",
     "//components/proxy_config",
-    "//components/rappor",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/search_engines",
     "//components/sessions",
@@ -78,6 +79,7 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/memory",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/net",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication",
@@ -85,6 +87,7 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/first_run:field_trial",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index f5d7eb810bd..438c97a2f69 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -56,8 +56,6 @@ source_set("prerender") {
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
-    "//ios/web/public/deprecated",
-    "//ios/web/public/deprecated:deprecated_web_util",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn
index 899826a0ebc..a0506645c01 100644
--- a/chromium/ios/chrome/browser/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn
@@ -45,6 +45,7 @@ source_set("reading_list") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/components/webui:url_constants",
     "//ios/web/public",
diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
index 52ec7bd7bf6..a9b81927017 100644
--- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
@@ -4,9 +4,17 @@
 
 import("//ios/build/config.gni")
 import("//ios/features.gni")
+import("//ios/web/js_compile.gni")
 
 source_set("safe_browsing") {
   sources = [
+    "chrome_password_protection_service.h",
+    "chrome_password_protection_service.mm",
+    "chrome_password_protection_service_factory.h",
+    "chrome_password_protection_service_factory.mm",
+    "input_event_observer.h",
+    "password_protection_java_script_feature.h",
+    "password_protection_java_script_feature.mm",
     "pending_unsafe_resource_storage.h",
     "pending_unsafe_resource_storage.mm",
     "real_time_url_lookup_service_factory.h",
@@ -26,35 +34,52 @@ source_set("safe_browsing") {
     "safe_browsing_unsafe_resource_container.mm",
     "url_checker_delegate_impl.h",
     "url_checker_delegate_impl.mm",
+    "user_population.h",
+    "user_population.mm",
     "verdict_cache_manager_factory.h",
     "verdict_cache_manager_factory.mm",
   ]
 
   deps = [
+    ":password_protection_js",
     ":util",
     "//base",
     "//build:branding_buildflags",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
+    "//components/omnibox/common",
+    "//components/password_manager/core/browser",
     "//components/prefs",
+    "//components/safe_browsing/core:csd_proto",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core:verdict_cache_manager",
     "//components/safe_browsing/core/browser",
+    "//components/safe_browsing/core/browser/sync",
     "//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/core/password_protection:password_protection_metrics_util",
     "//components/safe_browsing/core/realtime:url_lookup_service",
     "//components/safe_browsing/ios/browser:allow_list",
+    "//components/safe_browsing/ios/password_protection",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
+    "//components/strings:components_strings_grit",
+    "//components/sync/base",
+    "//components/sync/protocol",
+    "//components/sync_user_events",
+    "//components/unified_consent",
+    "//components/variations/service",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/net",
+    "//ios/chrome/browser/passwords:store_factory",
+    "//ios/chrome/browser/policy",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
@@ -63,6 +88,7 @@ source_set("safe_browsing") {
     "//ios/web/common:user_agent",
     "//ios/web/public",
     "//ios/web/public/init",
+    "//ios/web/public/js_messaging",
     "//mojo/public/cpp/bindings",
     "//net",
     "//services/network:network_service",
@@ -74,6 +100,27 @@ source_set("safe_browsing") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+js_compile_bundle("password_protection_js") {
+  visibility = [ ":safe_browsing" ]
+  closure_entry_point = "__crWeb.passwordProtection"
+
+  sources = [ "resources/password_protection.js" ]
+}
+
+source_set("features") {
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//components/password_manager/core/common",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("test_support") {
   testonly = true
   sources = [
@@ -88,6 +135,7 @@ source_set("test_support") {
     "//ios/web/public",
     "//services/network:test_support",
     "//services/network/public/cpp",
+    "//services/network/public/mojom",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -141,6 +189,7 @@ source_set("eg2_tests") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "chrome_password_protection_service_unittest.mm",
     "pending_unsafe_resource_storage_unittest.mm",
     "real_time_url_lookup_service_factory_unittest.mm",
     "safe_browsing_blocking_page_unittest.mm",
@@ -156,7 +205,11 @@ source_set("unit_tests") {
   deps = [
     ":safe_browsing",
     ":test_support",
+    "//base",
     "//base/test:test_support",
+    "//components/keyed_service/core",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/browser:test_support",
     "//components/prefs:test_support",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core:realtimeapi_proto",
@@ -172,23 +225,35 @@ 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/core/password_protection:password_protection_metrics_util",
     "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
+    "//components/signin/public/identity_manager",
+    "//components/signin/public/identity_manager:test_support",
+    "//components/strings:components_strings_grit",
+    "//components/sync/protocol",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
+    "//components/sync_user_events:test_support",
     "//components/unified_consent",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/prerender:test_support",
+    "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/web:test_support",
     "//ios/chrome/test:test_support",
     "//ios/web/public",
     "//ios/web/public/test",
     "//net:test_support",
     "//net/traffic_annotation:test_support",
     "//services/network/public/cpp",
+    "//services/network/public/mojom",
     "//testing/gmock",
     "//testing/gtest",
+    "//ui/base",
+    "//url",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/search_engines/BUILD.gn b/chromium/ios/chrome/browser/search_engines/BUILD.gn
index 6b216a227b8..967caabf1dd 100644
--- a/chromium/ios/chrome/browser/search_engines/BUILD.gn
+++ b/chromium/ios/chrome/browser/search_engines/BUILD.gn
@@ -101,4 +101,10 @@ source_set("unit_tests") {
 
 js_compile_checked("search_engine_js") {
   sources = [ "resources/search_engine.js" ]
+
+  js_modules = [
+    "//ios/web/web_state/js/resources/base.js",
+    "//ios/web/web_state/js/resources/common.js",
+    "//ios/web/js_messaging/resources/message.js",
+  ]
 }
diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn
index f6858310e94..433f1d5ffe9 100644
--- a/chromium/ios/chrome/browser/sessions/BUILD.gn
+++ b/chromium/ios/chrome/browser/sessions/BUILD.gn
@@ -56,7 +56,6 @@ source_set("restoration_agent") {
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:page_placeholder",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 272e9d132ba..5eac67b02f7 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -70,6 +70,7 @@ source_set("signin") {
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/reading_list:reading_list_remover",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common",
diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn
index d0743b17300..8bb0729f50d 100644
--- a/chromium/ios/chrome/browser/snapshots/BUILD.gn
+++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn
@@ -26,11 +26,11 @@ source_set("snapshots") {
   ]
   deps = [
     "//base",
+    "//base/ios",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/third_party/webkit",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index 2445c913cb4..797395f6049 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -77,7 +77,7 @@ source_set("sync") {
     "//ios/chrome/browser/gcm/instance_id",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/invalidation",
-    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/passwords:store_factory",
     "//ios/chrome/browser/policy",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -100,7 +100,7 @@ source_set("sync") {
   ]
   allow_circular_includes_from = [
     "//ios/chrome/browser/history",
-    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/passwords:store_factory",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync/glue",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 1796a6e25b2..7afdd5c188a 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -74,7 +74,6 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/metrics",
-    "//ios/chrome/browser/network_activity:tab_helper",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/open_in",
     "//ios/chrome/browser/overscroll_actions",
diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn
index 3ddba5a5a09..95bbe1a4e14 100644
--- a/chromium/ios/chrome/browser/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/translate/BUILD.gn
@@ -68,7 +68,6 @@ source_set("translate") {
     "//ios/chrome/browser/ui/translate:translate_ui",
     "//ios/chrome/browser/ui/util",
     "//ios/components/webui:url_constants",
-    "//ios/web/public/deprecated",
     "//third_party/metrics_proto",
     "//ui/base",
     "//ui/gfx",
@@ -82,7 +81,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "js_language_detection_manager_unittest.mm",
+    "language_detection_javascript_unittest.mm",
     "translate_infobar_delegate_observer_bridge_unittest.mm",
     "translate_service_ios_unittest.cc",
   ]
@@ -96,10 +95,10 @@ source_set("unit_tests") {
     "//components/translate/ios/browser",
     "//ios/chrome/browser",
     "//ios/chrome/browser/web:test_support",
+    "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser:test_support",
     "//ios/web/public",
-    "//ios/web/public/deprecated",
     "//ios/web/public/test:util",
     "//skia",
     "//testing/gmock",
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index c58ed29e75d..e250f4d1be9 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -29,7 +29,6 @@ source_set("authentication") {
     "resources:signin_confirmation_more",
     "resources:signin_promo_close_gray",
     "unified_consent",
-    "//base",
     "//components/consent_auditor",
     "//components/infobars/core",
     "//components/prefs",
@@ -50,6 +49,7 @@ source_set("authentication") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -66,6 +66,7 @@ source_set("authentication") {
     "//ui/gfx",
   ]
   public_deps = [
+    "//base",
     "//ios/chrome/browser/ui/authentication/signin:constants",
     "//ios/chrome/browser/ui/collection_view",
   ]
@@ -107,8 +108,10 @@ source_set("unit_tests") {
     "//components/consent_auditor",
     "//components/consent_auditor:test_support",
     "//components/pref_registry",
+    "//components/prefs",
     "//components/signin/public/base",
     "//components/signin/public/identity_manager",
+    "//components/sync/driver:test_support",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//components/version_info",
@@ -121,6 +124,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
index 2b0c670c683..f1433e329f4 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
@@ -43,6 +43,7 @@ source_set("signin_impl") {
   deps = [
     ":signin_headers",
     ":signin_protected",
+    "//components/prefs",
     "//components/signin/ios/browser",
     "//components/version_info",
     "//ios/chrome/app:tests_hook",
@@ -101,14 +102,21 @@ source_set("eg2_tests") {
     "//build/config/ios:xctest_config",
   ]
   testonly = true
-  sources = [ "signin_coordinator_egtest.mm" ]
+  sources = [
+    "signin_coordinator_egtest.mm",
+    "signin_coordinator_mice_egtest.mm",
+  ]
   deps = [
     "//base",
     "//base/test:test_support",
+    "//components/signin/public/base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/authentication/unified_consent:constants",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
+    "//ios/chrome/browser/ui/settings:constants",
+    "//ios/chrome/browser/ui/settings/google_services: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",
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 21a4a24de5f..d70fea9d1f6 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
@@ -14,14 +14,18 @@ source_set("add_account_signin") {
     "add_account_signin_manager.mm",
   ]
   deps = [
+    "//components/google/core/common",
     "//components/prefs",
+    "//components/signin/ios/browser:features",
     "//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/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin:signin_protected",
+    "//ios/chrome/browser/ui/commands",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
   ]
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn
index 0a1a7173de0..8edc13c8c33 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn
@@ -32,6 +32,7 @@ source_set("advanced_settings_signin") {
     "//ios/chrome/browser/ui/authentication/signin:signin_protected",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/google_services:constants",
+    "//ios/chrome/common/ui/colors",
     "//ios/web/public",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn
index eb775e052a3..293e3a3a0b8 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn
@@ -9,6 +9,11 @@ source_set("user_signin") {
   sources = [
     "gradient_view.h",
     "gradient_view.mm",
+    "policy_signout_commands.h",
+    "user_policy_signout_coordinator.h",
+    "user_policy_signout_coordinator.mm",
+    "user_policy_signout_view_controller.h",
+    "user_policy_signout_view_controller.mm",
     "user_signin_constants.h",
     "user_signin_constants.mm",
     "user_signin_coordinator.h",
@@ -24,7 +29,9 @@ source_set("user_signin") {
     "//components/sync/base",
     "//components/unified_consent",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy/resources:enterprise_icon_blue_large",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
@@ -38,6 +45,7 @@ source_set("user_signin") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/unified_consent",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/confirmation_alert:confirmation_alert",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser/signin",
     "//ui/base",
@@ -51,7 +59,10 @@ source_set("user_signin") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "user_signin_mediator_unittest.mm" ]
+  sources = [
+    "user_signin_coordinator_unittest.mm",
+    "user_signin_mediator_unittest.mm",
+  ]
   deps = [
     ":user_signin",
     "//base/test:test_support",
@@ -70,6 +81,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
     "//ios/chrome/browser/unified_consent",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
index d570c1a5402..3ef812b985b 100644
--- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
@@ -19,7 +19,6 @@ source_set("identity_chooser") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
   ]
 }
@@ -71,3 +70,26 @@ source_set("identity_chooser_ui") {
   ]
   public_deps = [ "//ios/chrome/browser/ui/table_view" ]
 }
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "identity_chooser_coordinator_unittest.mm" ]
+  deps = [
+    ":identity_chooser",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/test:test_support",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
+    "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+  ]
+}
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 2bde43aeb4a..80933d3dab7 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
@@ -56,7 +56,6 @@ source_set("manual_fill") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model:list_model",
-    "//ios/chrome/browser/ui/settings/autofill:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:table_view",
     "//ios/chrome/browser/ui/util",
@@ -64,7 +63,6 @@ source_set("manual_fill") {
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/web/public",
-    "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//ui/base",
   ]
@@ -176,7 +174,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test:test_support",
-    "//ios/web/public/deprecated:test_doubles",
     "//ios/web/public/js_messaging",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
@@ -234,7 +231,6 @@ source_set("eg2_tests") {
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/ui/autofill:eg_test_support+eg2",
-    "//ios/chrome/browser/ui/settings/autofill:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:eg_test_support+eg2",
     "//ios/chrome/test:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index e4c0672d558..3650383f7eb 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -56,6 +56,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
@@ -67,8 +68,10 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/bookmarks/cells",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/sharing",
@@ -76,8 +79,8 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view:views",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/window_activities",
@@ -180,6 +183,7 @@ source_set("bookmarks_ui") {
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view:views",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
@@ -275,11 +279,11 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/authentication/signin:constants",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view:feature_flags",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//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",
+    "//ios/web/public/test/http_server:http_server",
     "//net",
     "//net:test_support",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index d5f73ba52f0..b3664db2080 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -8,14 +8,10 @@ source_set("cells") {
     "bookmark_folder_item.mm",
     "bookmark_home_node_item.h",
     "bookmark_home_node_item.mm",
-    "bookmark_home_promo_item.h",
-    "bookmark_home_promo_item.mm",
     "bookmark_parent_folder_item.h",
     "bookmark_parent_folder_item.mm",
     "bookmark_table_cell_title_edit_delegate.h",
     "bookmark_table_cell_title_editing.h",
-    "bookmark_table_signin_promo_cell.h",
-    "bookmark_table_signin_promo_cell.mm",
     "bookmark_text_field_item.h",
     "bookmark_text_field_item.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn b/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn
index bd8340838a7..4484fa664f6 100644
--- a/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn
@@ -12,6 +12,7 @@ source_set("broadcaster") {
   ]
   deps = [
     "//base",
+    "//base/ios",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
   ]
 
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
index 3a0251318cf..eaaac7432df 100644
--- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -25,6 +25,7 @@ source_set("browser_view") {
     "//components/image_fetcher/ios",
     "//components/language/ios/browser",
     "//components/omnibox/browser",
+    "//components/profile_metrics",
     "//components/reading_list/core",
     "//components/search_engines",
     "//components/sessions",
@@ -42,6 +43,8 @@ source_set("browser_view") {
     "//ios/chrome/browser/autofill:autofill_internal",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/browser_state_metrics",
+    "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
@@ -60,6 +63,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overscroll_actions",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
@@ -78,12 +82,14 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication/signin/user_signin",
     "//ios/chrome/browser/ui/autofill:autofill",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
     "//ios/chrome/browser/ui/badges:badges_popup_menu",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/browser_container",
     "//ios/chrome/browser/ui/browser_container:ui",
+    "//ios/chrome/browser/ui/browser_view/hider",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -101,6 +107,9 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/image_util:web",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui",
     "//ios/chrome/browser/ui/infobars",
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars:public",
@@ -109,6 +118,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/main_content:main_content_ui",
     "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util",
+    "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:coordinator",
     "//ios/chrome/browser/ui/ntp:util",
@@ -118,7 +128,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/overlays",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/page_info:coordinator",
-    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/passwords",
     "//ios/chrome/browser/ui/popup_menu",
@@ -143,7 +152,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/text_zoom",
     "//ios/chrome/browser/ui/text_zoom:text_zoom_ui",
     "//ios/chrome/browser/ui/thumb_strip",
-    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/accessory",
@@ -155,7 +163,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
     "//ios/chrome/browser/ui/translate:legacy_translate",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/ui/whats_new",
     "//ios/chrome/browser/upgrade",
@@ -239,6 +246,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/browser_container:ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/test",
@@ -248,11 +256,11 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
+    "//ios/chrome/common/ui/reauthentication:reauthentication",
     "//ios/chrome/test:block_cleanup_test",
     "//ios/chrome/test:test_support",
     "//ios/net",
     "//ios/web/public",
-    "//ios/web/public/deprecated",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/web_state:web_state_impl_header",
diff --git a/chromium/ios/chrome/browser/ui/browser_view/hider/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/hider/BUILD.gn
new file mode 100644
index 00000000000..19188e61be7
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/browser_view/hider/BUILD.gn
@@ -0,0 +1,28 @@
+# 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("hider") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "browser_view_hider_coordinator.h",
+    "browser_view_hider_coordinator.mm",
+    "browser_view_hider_view_controller.h",
+    "browser_view_hider_view_controller.mm",
+  ]
+  deps = [
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/location_bar",
+    "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/ui/toolbar/public:constants",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
index 5b0a5a774c5..00ded8401c5 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -28,6 +28,7 @@ source_set("commands") {
     "open_new_tab_command.mm",
     "page_info_commands.h",
     "password_breach_commands.h",
+    "password_protection_commands.h",
     "popup_menu_commands.h",
     "qr_generation_commands.h",
     "qr_scanner_commands.h",
@@ -40,6 +41,7 @@ source_set("commands") {
     "show_signin_command.mm",
     "snackbar_commands.h",
     "text_zoom_commands.h",
+    "thumb_strip_commands.h",
     "toolbar_commands.h",
     "whats_new_commands.h",
   ]
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index a522030da7b..624a1ab14af 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -49,6 +49,7 @@ source_set("content_suggestions") {
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -61,6 +62,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/ntp_tiles",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
@@ -78,6 +80,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
@@ -87,7 +90,6 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web_state_list",
@@ -160,12 +162,14 @@ source_set("content_suggestions_ui") {
     "//components/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/elements",
+    "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp_tile_views",
diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn
index 8e60eb51dbc..bf0cdac6c8e 100644
--- a/chromium/ios/chrome/browser/ui/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn
@@ -64,6 +64,7 @@ source_set("download") {
     "//ui/gfx",
   ]
   frameworks = [
+    "ARKit.framework",
     "StoreKit.framework",
     "UIKit.framework",
   ]
@@ -129,7 +130,6 @@ source_set("eg2_tests") {
   ]
 
   deps = [
-    "//components/infobars/core:feature_flags",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/download:mime_types",
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index 4cd8b1ac9bf..5f4a1f59a78 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -49,6 +49,7 @@ source_set("first_run") {
     "//base",
     "//base:i18n",
     "//components/metrics",
+    "//components/policy/core/common:common_constants",
     "//components/prefs",
     "//components/signin/public/identity_manager",
     "//ios/chrome/app:tests_hook",
@@ -68,6 +69,7 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/material_components",
+    "//ios/chrome/browser/ui/settings/resources:enterprise_icon",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
index 28884ea9ac5..cf6a2487e7d 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -10,6 +10,7 @@ source_set("fullscreen") {
     "fullscreen_controller_observer.h",
     "fullscreen_ui_updater.h",
     "scoped_fullscreen_disabler.h",
+    "scoped_fullscreen_disabler.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -39,7 +40,6 @@ source_set("feature_flags") {
   deps = [
     "//base",
     "//components/flags_ui",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/gestures/BUILD.gn b/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
index 298734b7443..72627e43211 100644
--- a/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
@@ -8,11 +8,18 @@ source_set("gestures") {
   sources = [
     "layout_switcher.h",
     "layout_switcher_provider.h",
+    "pan_handler_scroll_view.h",
+    "pan_handler_scroll_view.mm",
+    "view_controller_trait_collection_observer.h",
     "view_revealing_animatee.h",
     "view_revealing_vertical_pan_handler.h",
     "view_revealing_vertical_pan_handler.mm",
   ]
-  deps = [ "//base" ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/util",
+    "//ios/web/public/ui",
+  ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index f8a5e220808..b735fee371c 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -24,6 +24,7 @@ source_set("history") {
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/alert_coordinator",
@@ -34,7 +35,6 @@ source_set("history") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
   ]
   frameworks = [
     "MobileCoreServices.framework",
@@ -92,6 +92,7 @@ source_set("history_ui") {
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
@@ -101,10 +102,10 @@ source_set("history_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//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",
@@ -170,7 +171,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants",
     "//ios/chrome/browser/ui/table_view:constants",
     "//ios/chrome/browser/ui/table_view:feature_flags",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/common",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
index 121431eb119..e148df8747d 100644
--- a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
@@ -31,5 +31,6 @@ source_set("web") {
     "//ios/web",
     "//ui/base",
   ]
+  frameworks = [ "Photos.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/incognito_reauth/BUILD.gn b/chromium/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
new file mode 100644
index 00000000000..713dcc8a16c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/incognito_reauth/BUILD.gn
@@ -0,0 +1,102 @@
+# 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("//ios/build/chrome_build.gni")
+
+source_set("incognito_reauth_commands") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "incognito_reauth_commands.h" ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("incognito_reauth_util") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "incognito_reauth_util.h",
+    "incognito_reauth_util.mm",
+  ]
+  deps = [
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ui/base",
+  ]
+  frameworks = [
+    "UIKit.framework",
+    "LocalAuthentication.framework",
+  ]
+}
+
+source_set("incognito_reauth_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "incognito_reauth_consumer.h",
+    "incognito_reauth_view.h",
+    "incognito_reauth_view.mm",
+    "incognito_reauth_view_label.h",
+    "incognito_reauth_view_label.mm",
+  ]
+  deps = [
+    ":incognito_reauth_util",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/incognito_reauth/resources:incognito_logo_reauth",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("incognito_reauth_scene_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "incognito_reauth_mediator.h",
+    "incognito_reauth_mediator.mm",
+    "incognito_reauth_scene_agent.h",
+    "incognito_reauth_scene_agent.mm",
+  ]
+  deps = [
+    ":incognito_reauth_commands",
+    ":incognito_reauth_ui",
+    ":incognito_reauth_util",
+    "//base",
+    "//base/ios",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/main:browser_interface_provider",
+    "//ios/chrome/browser/ui/main:observing_scene_agent",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/common/ui/reauthentication",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "incognito_reauth_scene_agent_unittest.mm" ]
+  deps = [
+    ":incognito_reauth_scene_agent",
+    "//base",
+    "//base/test:test_support",
+    "//components/prefs:test_support",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/browser_view",
+    "//ios/chrome/browser/ui/main:browser_interface_provider",
+    "//ios/chrome/browser/ui/main/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/browser/web_state_list:web_state_list",
+    "//ios/chrome/common/ui/reauthentication",
+    "//ios/chrome/test:block_cleanup_test",
+    "//ios/web/public/test",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/incognito_reauth/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/incognito_reauth/resources/BUILD.gn
new file mode 100644
index 00000000000..f85baf0d123
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/incognito_reauth/resources/BUILD.gn
@@ -0,0 +1,13 @@
+# 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.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("incognito_logo_reauth") {
+  sources = [
+    "incognito_logo_reauth.imageset/Contents.json",
+    "incognito_logo_reauth.imageset/incognito_logo_reauth@2x.png",
+    "incognito_logo_reauth.imageset/incognito_logo_reauth@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index 9cad2a91bce..79b1f58540b 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -55,7 +55,6 @@ source_set("feature_flags") {
   ]
   public_deps = [ "//base" ]
   deps = [
-    "//components/infobars/core:feature_flags",
     "//components/version_info",
     "//ios/chrome/common",
   ]
@@ -160,7 +159,6 @@ source_set("eg2_tests") {
     ":eg_test_support+eg2",
     "//base",
     "//base/test:test_support",
-    "//components/infobars/core:feature_flags",
     "//components/strings:components_strings_grit",
     "//components/translate/core/browser:translate_pref_names",
     "//components/translate/core/common",
diff --git a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn
index 78ba4e05c6a..5086f904f2c 100644
--- a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn
@@ -51,12 +51,15 @@ source_set("eg2_tests") {
   deps = [
     "//base",
     "//base/test:test_support",
+    "//components/shared_highlighting/core/common",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui:feature_flags",
     "//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/navigation:navigation",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//net",
     "//net:test_support",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index da7bd0bcece..feed2c855f1 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -13,6 +13,9 @@ source_set("location_bar") {
     "location_bar_mediator.mm",
     "location_bar_steady_view.h",
     "location_bar_steady_view.mm",
+    "location_bar_steady_view_consumer.h",
+    "location_bar_steady_view_mediator.h",
+    "location_bar_steady_view_mediator.mm",
     "location_bar_url_loader.h",
     "location_bar_view_controller.h",
     "location_bar_view_controller.mm",
@@ -28,6 +31,7 @@ source_set("location_bar") {
     "//base",
     "//components/omnibox/browser",
     "//components/open_from_clipboard:",
+    "//components/profile_metrics:profile_metrics",
     "//components/search_engines",
     "//components/security_state/ios",
     "//components/strings",
@@ -37,6 +41,7 @@ source_set("location_bar") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state:browser_state",
+    "//ios/chrome/browser/browser_state_metrics:browser_state_metrics",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/infobars:badge",
@@ -140,7 +145,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "location_bar_coordinator_unittest.mm",
-    "location_bar_mediator_unittest.mm",
+    "location_bar_steady_view_mediator_unittest.mm",
   ]
   deps = [
     ":location_bar",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn
index 9993a1f6b47..4a63ef56153 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn
@@ -6,8 +6,8 @@ source_set("test") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "fake_location_bar_consumer.h",
-    "fake_location_bar_consumer.mm",
+    "fake_location_bar_steady_view_consumer.h",
+    "fake_location_bar_steady_view_consumer.mm",
   ]
   deps = [ "//ios/chrome/browser/ui/location_bar" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index 89cf158fd9c..0cd423c6bd8 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -17,6 +17,22 @@ source_set("scene_state_observer") {
   frameworks = [ "UIKit.framework" ]
 }
 
+source_set("observing_scene_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "observing_scene_state_agent.h",
+    "observing_scene_state_agent.mm",
+  ]
+
+  frameworks = [ "UIKit.framework" ]
+
+  public_deps = [
+    ":scene_state_header",
+    ":scene_state_observer",
+  ]
+}
+
 source_set("scene_state_header") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -40,7 +56,6 @@ source_set("incognito_blocker_scene_agent") {
   deps = [
     ":scene_state_header",
     "//base",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
   ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -51,6 +66,8 @@ source_set("scene") {
     "connection_information.h",
     "default_browser_scene_agent.h",
     "default_browser_scene_agent.mm",
+    "policy_signout_scene_agent.h",
+    "policy_signout_scene_agent.mm",
     "scene_controller.h",
     "scene_controller.mm",
     "scene_delegate.h",
@@ -63,8 +80,10 @@ source_set("scene") {
   deps = [
     ":incognito_blocker_scene_agent",
     ":main",
+    ":observing_scene_agent",
     ":scene_testing",
     "//base",
+    "//base/ios",
     "//components/infobars/core",
     "//components/previous_session_info",
     "//components/signin/public/identity_manager",
@@ -91,6 +110,8 @@ source_set("scene") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/ntp:features",
+    "//ios/chrome/browser/policy",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/screenshot",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",
@@ -98,25 +119,28 @@ source_set("scene") {
     "//ios/chrome/browser/ui/appearance",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin",
+    "//ios/chrome/browser/ui/authentication/signin/user_signin:user_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/first_run:field_trial",
     "//ios/chrome/browser/ui/history",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/sync",
+    "//ios/chrome/browser/ui/start_surface",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid",
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
     "//ios/chrome/browser/web_state_list:session_metrics",
     "//ios/chrome/browser/window_activities",
+    "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/mailto",
@@ -185,6 +209,8 @@ source_set("main") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/download",
+    "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/page_info:coordinator",
     "//ios/chrome/browser/ui/print",
     "//ios/chrome/browser/ui/qr_scanner:coordinator",
@@ -192,9 +218,9 @@ source_set("main") {
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/snackbar",
+    "//ios/chrome/browser/ui/thumb_strip",
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/translate:legacy_translate",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading:url_loading_params_header",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:tab_helper_delegates",
@@ -241,10 +267,13 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/sessions:restoration_agent",
+    "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/test:block_cleanup_test",
+    "//ios/testing:block_swizzler",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/menu/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
index 76684d633ca..66b7ebfa159 100644
--- a/chromium/ios/chrome/browser/ui/menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
@@ -18,6 +18,7 @@ source_set("menu") {
     "resources:mark_read",
     "resources:move_folder",
     "resources:offline",
+    "resources:open",
     "resources:open_in_incognito",
     "resources:open_in_new_tab",
     "resources:open_new_window",
@@ -25,7 +26,10 @@ source_set("menu") {
     "resources:share",
     "//base",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/window_activities",
@@ -47,6 +51,7 @@ source_set("unit_tests") {
     "resources:mark_read",
     "resources:move_folder",
     "resources:offline",
+    "resources:open",
     "resources:open_in_incognito",
     "resources:open_in_new_tab",
     "resources:open_new_window",
diff --git a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
index 6385e87a45e..4c8e025fd80 100644
--- a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
@@ -91,3 +91,11 @@ imageset("offline") {
     "offline.imageset/offline@3x.png",
   ]
 }
+
+imageset("open") {
+  sources = [
+    "open.imageset/Contents.json",
+    "open.imageset/open@2x.png",
+    "open.imageset/open@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index d59c1973708..1251b59bf47 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -4,11 +4,15 @@
 
 source_set("ntp") {
   sources = [
+    "new_tab_page_commands.h",
+    "new_tab_page_content_delegate.h",
     "new_tab_page_controller_delegate.h",
     "new_tab_page_header_constants.h",
     "new_tab_page_header_constants.mm",
+    "new_tab_page_omnibox_positioning.h",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
+  public_deps = [ ":feature_flags" ]
   deps = [ "//ios/chrome/browser/ui/util" ]
 }
 
@@ -19,16 +23,33 @@ source_set("coordinator") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
+    ":feature_flags",
     ":ntp",
     ":ntp_internal",
+    "//components/feed/core/shared_prefs:feed_shared_prefs",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/prefs/ios",
+    "//components/search_engines",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/main:scene_state_observer",
+    "//ios/chrome/browser/ui/overscroll_actions",
+    "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/common/ui/util",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/web/public",
   ]
@@ -50,12 +71,16 @@ source_set("util") {
 source_set("ntp_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "discover_feed_wrapper_view_controller.h",
+    "discover_feed_wrapper_view_controller.mm",
     "incognito_view.h",
     "incognito_view.mm",
     "incognito_view_controller.h",
     "incognito_view_controller.mm",
     "metrics.h",
     "metrics.mm",
+    "new_tab_page_view_controller.h",
+    "new_tab_page_view_controller.mm",
     "notification_promo_whats_new.h",
     "notification_promo_whats_new.mm",
     "ntp_tile_saver.h",
@@ -85,8 +110,6 @@ source_set("ntp_internal") {
     "//components/keyed_service/core",
     "//components/metrics",
     "//components/ntp_tiles",
-    "//components/rappor",
-    "//components/search_engines",
     "//components/strings",
     "//components/suggestions",
     "//ios/chrome/app/strings",
@@ -105,10 +128,10 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//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/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
@@ -127,7 +150,6 @@ source_set("ntp_internal") {
     "//ios/public/provider/chrome/browser/voice",
     "//ios/third_party/material_components_ios",
     "//ios/web",
-    "//ios/web/public/deprecated",
     "//net",
     "//skia",
     "//ui/base",
@@ -151,6 +173,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":coordinator",
+    ":feature_flags",
     ":ntp",
     ":ntp_internal",
     "//base",
@@ -232,3 +255,13 @@ source_set("perf_tests") {
     "//ios/chrome/browser/ui/commands",
   ]
 }
+
+source_set("feature_flags") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "new_tab_page_feature.h",
+    "new_tab_page_feature.mm",
+  ]
+  deps = [ "//ios/chrome/browser/ui/content_suggestions:feature_flags" ]
+  public_deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index 6da67d33b0d..fa3027624fd 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -160,7 +160,6 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
@@ -238,6 +237,7 @@ source_set("eg2_tests") {
     ":test_support+eg2",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/omnibox/popup:popup_accessibility_identifier_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",
@@ -263,6 +263,7 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ui/util",
     "//testing/gtest",
     "//third_party/ocmock",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn
index 7c2225a7343..1fb41e8b179 100644
--- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn
@@ -2,14 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("open_in") {
+source_set("open_in_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "open_in_controller.h",
     "open_in_controller.mm",
     "open_in_controller_testing.h",
-    "open_in_mediator.h",
-    "open_in_mediator.mm",
     "open_in_toolbar.h",
     "open_in_toolbar.mm",
   ]
@@ -21,12 +19,31 @@ source_set("open_in") {
     "//ios/chrome/browser/open_in",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/colors",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ios/web/public",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("open_in") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "open_in_coordinator.h",
+    "open_in_coordinator.mm",
+    "open_in_mediator.h",
+    "open_in_mediator.mm",
+  ]
+  deps = [
+    ":open_in_ui",
+    "//base",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/open_in",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public",
     "//net",
     "//services/network/public/cpp",
     "//ui/base",
@@ -45,6 +62,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":open_in",
+    ":open_in_ui",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/web_state_list",
@@ -72,6 +90,8 @@ source_set("eg2_tests") {
   deps = [
     "//base",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/open_in:features",
+    "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn
index f23ddeb7ec8..00847bddee1 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn
@@ -34,7 +34,6 @@ source_set("unit_tests") {
     ":passwords",
     "//base/test:test_support",
     "//components/infobars/core",
-    "//components/infobars/core:feature_flags",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/overlays",
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
index 802a94a1271..c903c27a3a7 100644
--- 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
@@ -41,7 +41,6 @@ source_set("unit_tests") {
     "//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",
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
index 2a473b70208..ab1a2f87b2b 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
@@ -45,7 +45,6 @@ source_set("unit_tests") {
     ":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",
diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
index 268c079001a..b59dff33bab 100644
--- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -5,8 +5,6 @@
 source_set("page_info") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "legacy_page_info_view_controller.h",
-    "legacy_page_info_view_controller.mm",
     "page_info_site_security_description.h",
     "page_info_site_security_description.mm",
     "page_info_view_controller.h",
@@ -29,12 +27,12 @@ source_set("page_info") {
     "//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/table_view:utils",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
@@ -58,27 +56,15 @@ source_set("constants") {
   ]
 }
 
-source_set("features") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "features.h",
-    "features.mm",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("coordinator") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "page_info_coordinator.h",
     "page_info_coordinator.mm",
-    "page_info_legacy_coordinator.h",
-    "page_info_legacy_coordinator.mm",
     "page_info_site_security_mediator.h",
     "page_info_site_security_mediator.mm",
   ]
   deps = [
-    ":features",
     ":page_info",
     "resources:page_info_bad",
     "resources:page_info_good",
@@ -121,11 +107,11 @@ source_set("eg2_tests") {
     "//build/config/ios:xctest_config",
   ]
   testonly = true
-  sources = [ "legacy_page_info_egtest.mm" ]
+  sources = [ "page_info_egtest.mm" ]
   deps = [
     ":constants",
-    "//ios/chrome/browser/ui/page_info:features",
-    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//components/strings",
+    "//ios/chrome/app/strings",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
index 351a87d5181..5e4c71e6909 100644
--- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
@@ -5,8 +5,6 @@
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "password_breach_constants.h",
-    "password_breach_constants.mm",
     "password_breach_consumer.h",
     "password_breach_coordinator.h",
     "password_breach_coordinator.mm",
@@ -15,12 +13,19 @@ source_set("passwords") {
     "password_breach_presenter.h",
     "password_breach_view_controller.h",
     "password_breach_view_controller.mm",
+    "password_constants.h",
+    "password_constants.mm",
+    "password_protection_coordinator.h",
+    "password_protection_coordinator.mm",
+    "password_protection_view_controller.h",
+    "password_protection_view_controller.mm",
   ]
   deps = [
     "resources",
     "//base",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
+    "//components/safe_browsing/core/password_protection:password_protection_metrics_util",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main:public",
@@ -66,8 +71,8 @@ source_set("test_support+eg2") {
   testonly = true
   sources = [
     "password_breach_app_interface.h",
-    "password_breach_constants.h",
-    "password_breach_constants.mm",
+    "password_constants.h",
+    "password_constants.mm",
   ]
   deps = [ "//base" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index df859d08835..cfea1ed6741 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -7,7 +7,7 @@ source_set("popup_menu") {
   sources = [
     "popup_menu_action_handler.h",
     "popup_menu_action_handler.mm",
-    "popup_menu_action_handler_commands.h",
+    "popup_menu_action_handler_delegate.h",
     "popup_menu_coordinator.h",
     "popup_menu_coordinator.mm",
     "popup_menu_mediator.h",
@@ -51,11 +51,13 @@ source_set("popup_menu") {
     "//components/open_from_clipboard",
     "//components/prefs",
     "//components/prefs/ios",
+    "//components/profile_metrics",
     "//components/translate/core/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/browser_state_metrics",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/main:public",
@@ -63,6 +65,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/policy",
     "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/translate",
@@ -76,7 +79,6 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp_tile_views:constants",
-    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/popup_menu/cells",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
@@ -84,7 +86,6 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index 609c5d78247..8954eb3fa51 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -44,6 +44,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/scanner",
     "//ios/chrome/browser/ui/toolbar/public",
   ]
@@ -90,10 +91,12 @@ source_set("eg_app_support+eg2") {
   deps = [
     ":qr_scanner",
     "//base",
+    "//components/search_engines",
     "//components/version_info",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/scanner",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index e49fc780290..bb2332dad18 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -10,6 +10,7 @@ source_set("reading_list") {
     "reading_list_list_item_custom_action_factory.mm",
     "reading_list_list_item_factory.h",
     "reading_list_list_item_factory.mm",
+    "reading_list_list_item_factory_delegate.h",
     "reading_list_list_item_util.h",
     "reading_list_list_item_util.mm",
     "reading_list_mediator.h",
@@ -39,13 +40,17 @@ source_set("reading_list") {
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/reading_list/context_menu",
     "//ios/chrome/browser/ui/reading_list/resources:distillation_fail_new",
@@ -57,7 +62,6 @@ source_set("reading_list") {
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//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",
@@ -126,6 +130,7 @@ source_set("reading_list_ui") {
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
     "//ios/chrome/browser/ui/util",
@@ -187,7 +192,6 @@ source_set("eg2_tests") {
     "//base",
     "//base/test:test_support",
     "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view:constants",
     "//ios/chrome/browser/ui/util",
@@ -199,6 +203,7 @@ source_set("eg2_tests") {
     "//net",
     "//net:test_support",
     "//ui/base",
+    "//ui/base:test_support",
   ]
   frameworks = [ "UIKit.framework" ]
 }
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 dc5b44617c0..011f147ad29 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
@@ -15,10 +15,11 @@ source_set("context_menu") {
     "//base",
     "//components/feature_engagement/public",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy:policy_util",
     "//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 dee52c79a40..b6e8e5c7fa8 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -39,7 +39,6 @@ source_set("recent_tabs") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ui/base",
@@ -74,6 +73,7 @@ source_set("recent_tabs_ui") {
     ":recent_tabs_ui_constants",
     "resources:recent_tabs_other_devices_empty",
     "//base",
+    "//components/prefs",
     "//components/sessions",
     "//components/strings",
     "//components/sync",
@@ -90,11 +90,13 @@ source_set("recent_tabs_ui") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
@@ -154,7 +156,6 @@ source_set("app_support+eg2") {
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui/list_model",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/test/app:test_support",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
index db264fda7de..373a97e9b34 100644
--- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
@@ -21,6 +21,7 @@ source_set("sad_tab") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ios/third_party/material_components_ios",
@@ -70,6 +71,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/sad_tab",
     "//ios/chrome/browser/ui/sad_tab:coordinator",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web",
     "//ios/chrome/common/ui/util",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 70b1d9c244c..f4c10b5e748 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -23,6 +23,7 @@ source_set("settings_root") {
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
@@ -146,6 +147,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/autofill/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -176,6 +178,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
@@ -271,6 +274,7 @@ source_set("unit_tests") {
     "search_engine_table_view_controller_unittest.mm",
     "settings_navigation_controller_unittest.mm",
     "settings_root_table_view_controller_unittest.mm",
+    "settings_table_view_controller_mice_unittest.mm",
     "settings_table_view_controller_unittest.mm",
     "translate_table_view_controller_unittest.mm",
     "voice_search_table_view_controller_unittest.mm",
@@ -290,6 +294,7 @@ source_set("unit_tests") {
     "//components/pref_registry",
     "//components/prefs:test_support",
     "//components/search_engines",
+    "//components/signin/ios/browser",
     "//components/strings",
     "//components/sync/driver:test_support",
     "//components/sync_preferences",
@@ -316,13 +321,13 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/translate",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
index 864c66235cc..6cd4765934b 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -27,7 +27,6 @@ source_set("autofill") {
   ]
   deps = [
     ":constants",
-    ":feature_flags",
     "//components/autofill/core/browser",
     "//components/autofill/core/common",
     "//components/autofill/ios/browser",
@@ -51,9 +50,9 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/settings:settings_root",
     "//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:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
@@ -70,15 +69,6 @@ source_set("constants") {
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "features.h",
-    "features.mm",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -123,7 +113,6 @@ source_set("eg2_tests") {
   ]
   deps = [
     ":constants",
-    ":feature_flags",
     "//base",
     "//components/autofill/core/browser:test_support",
     "//components/strings:components_strings_grit",
diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn
index a423ca844d1..70fa2171680 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn
@@ -4,8 +4,10 @@
 
 source_set("cells") {
   sources = [
-    "autofill_data_item.h",
-    "autofill_data_item.mm",
+    "autofill_card_item.h",
+    "autofill_card_item.mm",
+    "autofill_profile_item.h",
+    "autofill_profile_item.mm",
   ]
 
   deps = [
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index 8cdc8bfac86..c980ca490ca 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -22,8 +22,6 @@ source_set("cells") {
     "settings_image_detail_text_cell.mm",
     "settings_image_detail_text_item.h",
     "settings_image_detail_text_item.mm",
-    "settings_multiline_detail_item.h",
-    "settings_multiline_detail_item.mm",
     "settings_switch_cell.h",
     "settings_switch_cell.mm",
     "settings_switch_item.h",
@@ -39,6 +37,7 @@ source_set("cells") {
   deps = [
     ":public",
     "//components/autofill/core/browser",
+    "//components/signin/public/base",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browsing_data",
@@ -46,6 +45,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
@@ -87,7 +87,6 @@ source_set("unit_tests") {
     "search_engine_item_unittest.mm",
     "settings_check_item_unittest.mm",
     "settings_image_detail_text_item_unittest.mm",
-    "settings_multiline_detail_item_unittest.mm",
     "version_item_unittest.mm",
   ]
 
diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
index 0506d181e42..8a3b131a60a 100644
--- a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
@@ -52,6 +52,7 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common",
@@ -131,6 +132,7 @@ source_set("eg2_tests") {
   deps = [
     "//base/test:test_support",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn
deleted file mode 100644
index 58bebe60653..00000000000
--- a/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn
+++ /dev/null
@@ -1,53 +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.
-
-source_set("credit_card_scanner") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "credit_card_consumer.h",
-    "credit_card_scanned_image_delegate.h",
-    "credit_card_scanner_camera_controller.h",
-    "credit_card_scanner_camera_controller.mm",
-    "credit_card_scanner_camera_controller_delegate.h",
-    "credit_card_scanner_coordinator.h",
-    "credit_card_scanner_coordinator.mm",
-    "credit_card_scanner_image_processor.h",
-    "credit_card_scanner_image_processor.mm",
-    "credit_card_scanner_mediator.h",
-    "credit_card_scanner_mediator.mm",
-    "credit_card_scanner_mediator_delegate.h",
-    "credit_card_scanner_string_util.h",
-    "credit_card_scanner_string_util.mm",
-    "credit_card_scanner_view.h",
-    "credit_card_scanner_view.mm",
-    "credit_card_scanner_view_controller.h",
-    "credit_card_scanner_view_controller.mm",
-  ]
-  deps = [
-    "//components/autofill/core/browser",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/qr_scanner",
-    "//ios/chrome/browser/ui/scanner",
-    "//ios/chrome/browser/ui/util",
-    "//ui/base",
-  ]
-  frameworks = [
-    "UIKit.framework",
-    "Vision.framework",
-    "CoreMedia.framework",
-    "CoreVideo.framework",
-  ]
-}
-
-source_set("unit_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "credit_card_scanner_string_util_unittest.mm" ]
-  deps = [
-    "//ios/chrome/browser/ui/settings/credit_card_scanner",
-    "//testing/gtest",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
index 0836d50a09d..db9d6ed5462 100644
--- a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
@@ -13,7 +13,9 @@ source_set("default_browser") {
     "resources:default_browser_world",
     "resources:settings",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/common/ui/colors",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
index e084bd0b32b..35a0919630f 100644
--- a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
@@ -18,6 +18,7 @@ source_set("enterprise_info_popover_view_controller") {
     ":constants",
     "//base:base",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/common:common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
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 ded64559c40..0a7ffb706cb 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -44,6 +44,7 @@ source_set("google_services") {
     "//components/prefs",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/signin/ios/browser",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
@@ -60,11 +61,12 @@ source_set("google_services") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/authentication/signin:signin_protected",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
@@ -72,6 +74,7 @@ source_set("google_services") {
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
@@ -134,6 +137,7 @@ source_set("eg2_tests") {
   testonly = true
   sources = [
     "accounts_table_egtest.mm",
+    "accounts_table_mice_egtest.mm",
     "google_services_settings_egtest.mm",
   ]
   deps = [
@@ -143,6 +147,8 @@ source_set("eg2_tests") {
     "//components/password_manager/core/common",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/signin/ios/browser:features",
+    "//components/signin/public/base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
index a6087b2655a..c3a2d28da6b 100644
--- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
@@ -55,6 +55,7 @@ source_set("language_ui") {
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/language/cells",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//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/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index 164b096ad00..6c27d6d6644 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -26,12 +26,14 @@ source_set("password") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/passwords:save_passwords_consumer",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/settings/password/password_details",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/reauthentication",
@@ -86,6 +88,7 @@ source_set("password_ui") {
     "//ios/chrome/browser/ui/settings/password/password_details",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
@@ -144,6 +147,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/passwords:save_passwords_consumer",
     "//ios/chrome/browser/signin:signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync:sync",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
index 589c33403f2..b48ddccadae 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn
@@ -26,6 +26,7 @@ source_set("password_details") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/reauthentication",
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
index f399603c543..4c1de3f80c1 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -24,11 +24,11 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/list_model",
-    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
@@ -37,10 +37,12 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//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",
+    "//ios/chrome/common/ui/reauthentication",
     "//ui/base",
   ]
 }
@@ -60,6 +62,7 @@ source_set("privacy") {
     "//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",
@@ -67,6 +70,7 @@ source_set("privacy") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/common/ui/reauthentication",
     "//ui/base",
   ]
   frameworks = [ "UIKit.framework" ]
diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
index a3007fc0bfc..c8e5d4f5a98 100644
--- a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -64,6 +64,7 @@ source_set("safety_check") {
     "//ios/chrome/browser/ui/settings/password",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/upgrade",
diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
index ffc333ec0f3..0e75d015789 100644
--- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
@@ -44,10 +44,10 @@ source_set("sync") {
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:utils",
     "//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/common/ui/colors",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
index a37b8226227..a6e03186b33 100644
--- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
@@ -46,6 +46,7 @@ source_set("eg2_tests") {
   deps = [
     "//base",
     "//base/test:test_support",
+    "//components/sync/invalidations",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
     "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn
index 6aaf2f167e8..9999f667a91 100644
--- a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn
@@ -19,7 +19,9 @@ source_set("utils") {
     "//components/content_settings/core/common",
     "//components/prefs",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/util",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn
new file mode 100644
index 00000000000..7912b6a05fc
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2021 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("feature_flags") {
+  sources = [
+    "start_surface_features.h",
+    "start_surface_features.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ui/base",
+  ]
+}
+
+source_set("start_surface") {
+  sources = [
+    "start_surface_scene_agent.h",
+    "start_surface_scene_agent.mm",
+    "start_surface_util.h",
+    "start_surface_util.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":feature_flags",
+    "//base",
+    "//ios/chrome/browser/ui/main:observing_scene_agent",
+    "//ios/chrome/browser/ui/main:scene_state_header",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
new file mode 100644
index 00000000000..2dbba585934
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/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.
+
+import("//ios/public/provider/chrome/browser/build_config.gni")
+
+source_set("tab_switcher") {
+  sources = [
+    "tab_switcher_item.h",
+    "tab_switcher_item.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
index ed2d5ffd5a2..15c44b91aec 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn
@@ -21,6 +21,7 @@ source_set("tab_grid") {
     "grid:grid_ui",
     "//base",
     "//components/favicon/ios",
+    "//components/prefs",
     "//components/sessions",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -28,6 +29,8 @@ source_set("tab_grid") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:serialisation",
@@ -41,10 +44,12 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/history/public",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/sharing",
+    "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/transitions",
     "//ios/chrome/browser/ui/thumb_strip",
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
@@ -80,6 +85,8 @@ source_set("tab_grid_paging") {
 
 source_set("tab_grid_ui") {
   sources = [
+    "disabled_tab_view_controller.h",
+    "disabled_tab_view_controller.mm",
     "tab_grid_bottom_toolbar.h",
     "tab_grid_bottom_toolbar.mm",
     "tab_grid_empty_state_view.h",
@@ -121,8 +128,10 @@ source_set("tab_grid_ui") {
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/transitions",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/thumb_strip",
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common",
     "//ios/chrome/common/ui/util",
     "//ios/web/public",
     "//ui/base",
@@ -163,6 +172,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/tabs:tabs_internal",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/main:scene_state_header",
+    "//ios/chrome/browser/ui/tab_switcher",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:page_placeholder",
     "//ios/chrome/browser/web:test_support",
@@ -187,6 +199,7 @@ source_set("eg2_tests") {
   testonly = true
   sources = [
     "tab_grid_egtest.mm",
+    "tab_grid_thumb_strip_egtest.mm",
     "tab_grid_transition_egtest.mm",
   ]
 
@@ -194,7 +207,11 @@ source_set("eg2_tests") {
     ":tab_grid_ui_constants",
     "//base",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid:features",
+    "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
index f0e7fd67216..623094e0898 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn
@@ -23,8 +23,6 @@ source_set("grid_ui") {
     "grid_drag_drop_handler.h",
     "grid_empty_view.h",
     "grid_image_data_source.h",
-    "grid_item.h",
-    "grid_item.mm",
     "grid_layout.h",
     "grid_layout.mm",
     "grid_theme.h",
@@ -34,8 +32,6 @@ source_set("grid_ui") {
     "horizontal_layout.mm",
     "plus_sign_cell.h",
     "plus_sign_cell.mm",
-    "reordering_layout_util.h",
-    "reordering_layout_util.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -47,7 +43,6 @@ source_set("grid_ui") {
     "resources:grid_theme_dark_selection_tint_color",
     "resources:grid_theme_selection_tint_color",
     "resources:plus_sign_grid_cell_background_color",
-    "resources:plus_sign_grid_cell_background_dark_color",
     "//base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -55,7 +50,11 @@ source_set("grid_ui") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui",
+    "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/transitions",
+    "//ios/chrome/browser/ui/thumb_strip",
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
@@ -75,6 +74,7 @@ source_set("unit_tests") {
     ":grid_ui",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/test:test_support",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/resources/BUILD.gn
index 11d9c7c566e..c4dde978ab6 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/resources/BUILD.gn
@@ -31,8 +31,3 @@ colorset("grid_theme_dark_selection_tint_color") {
 colorset("plus_sign_grid_cell_background_color") {
   sources = [ "plus_sign_grid_cell_background_color.colorset/Contents.json" ]
 }
-
-colorset("plus_sign_grid_cell_background_dark_color") {
-  sources =
-      [ "plus_sign_grid_cell_background_dark_color.colorset/Contents.json" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
index 5dbec89ee6b..2a7acb6b3e8 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
@@ -26,6 +26,7 @@ source_set("tab_strip_ui") {
     "tab_strip_cell.h",
     "tab_strip_cell.mm",
     "tab_strip_consumer.h",
+    "tab_strip_consumer_delegate.h",
     "tab_strip_mediator.h",
     "tab_strip_mediator.mm",
     "tab_strip_view_controller.h",
@@ -38,7 +39,9 @@ source_set("tab_strip_ui") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui",
+    "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/tab_switcher",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
index 25ff2706f06..1fb36421ace 100644
--- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
@@ -20,6 +20,7 @@ source_set("table_view") {
     ":styler",
     ":views",
     "//base",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/common/ui/colors",
@@ -48,6 +49,7 @@ source_set("styler") {
     "chrome_table_view_styler.mm",
   ]
   public_deps = [
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
   ]
@@ -130,3 +132,15 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 }
+
+source_set("utils") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "table_view_utils.h",
+    "table_view_utils.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/util",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index 5bd3ca957ba..e684715e113 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -55,6 +55,7 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/ui/popup_menu/public",
@@ -109,6 +110,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
diff --git a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
index 66a03c9896a..9f7e768805a 100644
--- a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
@@ -6,15 +6,23 @@ import("//build/config/chrome_build.gni")
 
 source_set("thumb_strip") {
   sources = [
-    "thumb_strip_attacher.h",
     "thumb_strip_coordinator.h",
     "thumb_strip_coordinator.mm",
+    "thumb_strip_mediator.h",
+    "thumb_strip_mediator.mm",
+    "thumb_strip_supporting.h",
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public",
+    "//ios/web/public/ui",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
@@ -29,6 +37,7 @@ source_set("feature_flags") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/util",
   ]
+  frameworks = [ "UIKit.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
@@ -45,6 +54,7 @@ source_set("eg2_tests") {
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index 5a838b82fce..b63fe516e60 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -58,6 +58,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
+    "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
index 520c206ed10..2125d7d4983 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
@@ -50,6 +50,7 @@ source_set("buttons") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/BUILD.gn
index 30ab8c0494c..a8c716b35af 100644
--- a/chromium/ios/chrome/browser/ui/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/translate/BUILD.gn
@@ -107,7 +107,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/translate/cells",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/web/public/deprecated:test_doubles",
     "//ios/web/public/test",
     "//skia",
     "//testing/gmock",
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index b8883725cdb..550b6509985 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -5,20 +5,6 @@
 import("//build/buildflag_header.gni")
 import("//ios/build/chrome_build.gni")
 
-source_set("multiwindow_util") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-
-  sources = [
-    "multi_window_support.h",
-    "multi_window_support.mm",
-  ]
-
-  deps = [
-    "//base",
-    "//base/ios:ios_multi_window_buildflags",
-  ]
-}
-
 source_set("util") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -91,6 +77,7 @@ source_set("util") {
     "//ios/chrome/common/ui/util",
     "//ios/chrome/common/ui/util:dynamic_type_util",
     "//ios/web:threads",
+    "//ios/web/common:uikit",
     "//ios/web/public/thread:thread",
     "//ios/web/thread",
     "//net",
diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
index dc4afcfa1b7..b47936189e6 100644
--- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
@@ -77,7 +77,7 @@ source_set("webui") {
     "//ios/chrome/browser/suggestions",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:terms_util",
-    "//ios/chrome/browser/web:java_script_console",
+    "//ios/chrome/browser/web/java_script_console",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
     "//ios/web/public/js_messaging",
diff --git a/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn
index 0c7b7f5ecc3..5ca3c51f353 100644
--- a/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn
@@ -8,7 +8,11 @@ source_set("utils") {
     "default_browser_utils.h",
     "default_browser_utils.mm",
   ]
-  deps = [ "//base" ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui:feature_flags",
+  ]
+  frameworks = [ "Foundation.framework" ]
 }
 
 source_set("whats_new") {
@@ -19,6 +23,8 @@ source_set("whats_new") {
     "default_browser_promo_coordinator.mm",
     "default_browser_promo_view_controller.h",
     "default_browser_promo_view_controller.mm",
+    "default_browser_string_util.h",
+    "default_browser_string_util.mm",
   ]
 
   deps = [
@@ -26,10 +32,30 @@ source_set("whats_new") {
     "//base",
     "//ios/chrome/app/strings:ios_google_chrome_strings",
     "//ios/chrome/app/strings:ios_strings",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/whats_new/resources",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ui/base",
   ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "default_browser_string_util_unittest.mm" ]
+  deps = [
+    ":whats_new",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/app/strings:ios_google_chrome_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/url_loading/BUILD.gn b/chromium/ios/chrome/browser/url_loading/BUILD.gn
index 26e738bb1c4..3b579c69ed3 100644
--- a/chromium/ios/chrome/browser/url_loading/BUILD.gn
+++ b/chromium/ios/chrome/browser/url_loading/BUILD.gn
@@ -34,10 +34,14 @@ source_set("url_loading") {
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/voice/BUILD.gn b/chromium/ios/chrome/browser/voice/BUILD.gn
index fa182036b12..eb15b632970 100644
--- a/chromium/ios/chrome/browser/voice/BUILD.gn
+++ b/chromium/ios/chrome/browser/voice/BUILD.gn
@@ -20,6 +20,7 @@ source_set("voice") {
 
   deps = [
     "//base",
+    "//base/ios",
     "//components/pref_registry",
     "//components/prefs",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 946ee188636..4a703e6db91 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -9,6 +9,8 @@ source_set("web") {
   sources = [
     "dom_altering_lock.h",
     "dom_altering_lock.mm",
+    "error_page_controller_bridge.h",
+    "error_page_controller_bridge.mm",
     "error_page_util.h",
     "error_page_util.mm",
     "font_size_tab_helper.h",
@@ -23,6 +25,9 @@ source_set("web") {
     "repost_form_tab_helper.mm",
     "sad_tab_tab_helper.h",
     "sad_tab_tab_helper.mm",
+    "web_navigation_browser_agent.h",
+    "web_navigation_browser_agent.mm",
+    "web_navigation_ntp_delegate.h",
     "web_navigation_util.h",
     "web_navigation_util.mm",
     "web_state_delegate_tab_helper.h",
@@ -44,6 +49,7 @@ source_set("web") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
@@ -53,6 +59,7 @@ source_set("web") {
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/util",
     "//ios/components/ui_util",
     "//ios/components/webui:url_constants",
@@ -121,6 +128,7 @@ source_set("unit_tests") {
     "repost_form_tab_helper_unittest.mm",
     "sad_tab_tab_helper_unittest.mm",
     "tab_id_tab_helper_unittest.mm",
+    "web_navigation_browser_agent_unittest.mm",
     "web_navigation_util_unittest.mm",
     "web_state_delegate_tab_helper_unittest.mm",
   ]
@@ -140,6 +148,8 @@ source_set("unit_tests") {
     "//components/sync_preferences:test_support",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main",
+    "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
@@ -147,6 +157,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:feature_flags",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
     "//ios/net",
     "//ios/net:test_support",
@@ -174,7 +185,6 @@ js_compile_bundle("chrome_bundle_all_frames") {
     "//components/autofill/ios/form_util/resources/form_handlers.js",
     "resources/accessibility.js",
     "resources/chrome_bundle_all_frames.js",
-    "resources/console.js",
     "resources/print.js",
   ]
 }
@@ -183,6 +193,7 @@ js_compile_bundle("chrome_bundle_main_frame") {
   closure_entry_point = "__crWeb.chromeBundleMainFrame"
   sources = [
     "//components/password_manager/ios/resources/password_controller.js",
+    "//components/translate/ios/browser/resources/language_detection.js",
     "//ios/chrome/browser/link_to_text/resources/link_to_text.js",
     "//ios/chrome/browser/search_engines/resources/search_engine.js",
     "//third_party/text-fragments-polyfill/src/src/fragment-generation-utils.js",
@@ -194,27 +205,18 @@ js_compile_bundle("chrome_bundle_main_frame") {
 
 js_compile_checked("accessibility") {
   sources = [ "resources/accessibility.js" ]
+
+  js_modules = [ "//ios/web/web_state/js/resources/base.js" ]
 }
 
 js_compile_checked("image_fetch") {
   sources = [ "resources/image_fetch.js" ]
-}
 
-source_set("java_script_console") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "java_script_console/java_script_console_message.cc",
-    "java_script_console/java_script_console_message.h",
-    "java_script_console/java_script_console_tab_helper.h",
-    "java_script_console/java_script_console_tab_helper.mm",
-    "java_script_console/java_script_console_tab_helper_delegate.h",
-  ]
-  deps = [
-    "//base",
-    "//ios/web/public",
-    "//ios/web/public/js_messaging",
+  js_modules = [
+    "//ios/web/web_state/js/resources/base.js",
+    "//ios/web/web_state/js/resources/common.js",
+    "//ios/web/js_messaging/resources/message.js",
   ]
-  frameworks = [ "Foundation.framework" ]
 }
 
 source_set("web_internal") {
@@ -237,6 +239,7 @@ source_set("web_internal") {
     "//components/dom_distiller/core",
     "//components/google/core/common",
     "//components/infobars/core",
+    "//components/password_manager/core/common",
     "//components/payments/core",
     "//components/prefs",
     "//components/resources",
@@ -259,6 +262,7 @@ source_set("web_internal") {
     "//ios/chrome/browser/ui/infobars/coordinators",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:feature_flags",
+    "//ios/chrome/browser/web/java_script_console",
     "//ios/components/security_interstitials",
     "//ios/components/security_interstitials/legacy_tls",
     "//ios/components/security_interstitials/lookalikes",
@@ -277,7 +281,6 @@ source_set("web_internal") {
     "//ui/gfx",
     "//url",
   ]
-  public_deps = [ ":java_script_console" ]
   frameworks = [
     "UIKit.framework",
     "Foundation.framework",
@@ -307,7 +310,6 @@ source_set("unit_tests_internal") {
   sources = [
     "blocked_popup_tab_helper_unittest.mm",
     "chrome_web_client_unittest.mm",
-    "java_script_console/java_script_console_tab_helper_unittest.mm",
   ]
   deps = [
     ":feature_flags",
@@ -345,6 +347,7 @@ source_set("unit_tests_internal") {
     "//net",
     "//net:test_support",
     "//services/network:test_support",
+    "//services/network/public/mojom",
     "//testing/gtest",
     "//third_party/ocmock",
     "//ui/base",
@@ -444,6 +447,7 @@ source_set("eg2_tests") {
     ":constants",
     ":eg_test_support+eg2",
     "//components/content_settings/core/common",
+    "//components/omnibox/common",
     "//components/strings",
     "//components/url_formatter",
     "//components/version_info:version_info",
diff --git a/chromium/ios/chrome/browser/web/java_script_console/BUILD.gn b/chromium/ios/chrome/browser/web/java_script_console/BUILD.gn
new file mode 100644
index 00000000000..4c0226f2354
--- /dev/null
+++ b/chromium/ios/chrome/browser/web/java_script_console/BUILD.gn
@@ -0,0 +1,51 @@
+# Copyright 2021 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("//ios/web/js_compile.gni")
+
+source_set("java_script_console") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "java_script_console_feature.h",
+    "java_script_console_feature.mm",
+    "java_script_console_feature_delegate.h",
+    "java_script_console_feature_factory.h",
+    "java_script_console_feature_factory.mm",
+    "java_script_console_message.h",
+    "java_script_console_message.mm",
+  ]
+  deps = [
+    ":console_js",
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser/browser_state",
+    "//ios/web/public",
+    "//ios/web/public/js_messaging",
+  ]
+  frameworks = [ "Foundation.framework" ]
+}
+
+js_compile_bundle("console_js") {
+  visibility = [ ":java_script_console" ]
+  closure_entry_point = "__crWeb.console"
+
+  sources = [ "resources/console.js" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "java_script_console_feature_unittest.mm" ]
+  deps = [
+    ":java_script_console",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/browser/web:test_support",
+    "//ios/chrome/test/fakes",
+    "//ios/web/public/js_messaging",
+    "//ios/web/public/test",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
index f78f880b7e0..a0cab940a85 100644
--- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
@@ -69,6 +69,7 @@ source_set("agents") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:restoration_observer",
+    "//ios/chrome/browser/ui/util",
     "//ios/web/public",
   ]
   frameworks = [ "Foundation.framework" ]
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2021-05-20 09:47:09 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2021-06-07 11:15:42 +0000
commit	189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree	6497caeff5e383937996768766ab3bb2081a40b2 /chromium/ios/chrome/browser
parent	8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
download	qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz