BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-02-02 12:21:57 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2022-02-12 08:13:00 +0000
commit: 606d85f2a5386472314d39923da28c70c60dc8e7 (patch)
tree: a8f4d7bf997f349f45605e6058259fba0630e4d7 /chromium/ios/chrome/browser
parent: 5786336dda477d04fb98483dca1a5426eebde2d7 (diff)
download: qtwebengine-chromium-606d85f2a5386472314d39923da28c70c60dc8e7.tar.gz
131 files changed, 901 insertions, 502 deletions
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index c56f7c6a8be..9b6954d27c1 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -112,7 +112,6 @@ source_set("browser") {
     "//ios/components/webui:url_constants",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/web",
     "//ios/web/common",
     "//ios/web/public",
@@ -150,7 +149,6 @@ source_set("utils") {
     "//components/variations",
     "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
   ]
 }
 
@@ -195,6 +193,7 @@ source_set("browser_impl") {
     "//components/component_updater",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
+    "//components/crash/core/common:crash_key_lib",
     "//components/crash/core/common:reporter_running_ios",
     "//components/flags_ui",
     "//components/gcm_driver",
@@ -279,8 +278,17 @@ tweak_info_plist("experimental_info_plist") {
   ]
 }
 
+bundle_data("settings_experimental_synctypeslist_plist") {
+  sources =
+      [ "resources/Settings.bundle/ExperimentalSyncTypesListDisabled.plist" ]
+  outputs = [ "{{bundle_resources_dir}}/Settings.bundle/{{source_file_part}}" ]
+}
+
 bundle_data("settings_resources_experimental_plist") {
-  public_deps = [ ":experimental_info_plist" ]
+  public_deps = [
+    ":experimental_info_plist",
+    ":settings_experimental_synctypeslist_plist",
+  ]
   sources = get_target_outputs(":experimental_info_plist")
   outputs = [ "{{bundle_resources_dir}}/Settings.bundle/Experimental.plist" ]
 }
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index 6d935183411..018f1a8535d 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -63,11 +63,11 @@ source_set("autofill") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/passwords:passwords_generation_utils",
     "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:form_input_accessory",
     "//ios/chrome/common/ui/util",
     "//ios/web/common",
     "//ios/web/public/js_messaging",
@@ -315,6 +315,7 @@ autofill_test_files = [
   "//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/input/178_zip_file_extension.html",
+  "//components/test/data/autofill/heuristics/input/179_twtcgirls.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",
@@ -493,6 +494,7 @@ autofill_test_files = [
   "//components/test/data/autofill/heuristics/output/176_id_payment_shopee.co.id.out",
   "//components/test/data/autofill/heuristics/output/177_reichelt.out",
   "//components/test/data/autofill/heuristics/output/178_zip_file_extension.out",
+  "//components/test/data/autofill/heuristics/output/179_twtcgirls.out",
 ]
 
 # Generate a file containing the list of test input files. This list will
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 1aa9ebc8763..2e64eeb5960 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -220,11 +220,11 @@ source_set("test_support") {
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/sync/glue",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/undo",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/web",
     "//net:test_support",
   ]
diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
index 7e93a75b859..04f5efdaa5a 100644
--- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
@@ -58,6 +58,7 @@ source_set("browsing_data") {
     "//ios/chrome/browser/external_files",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/language",
+    "//ios/chrome/browser/optimization_guide",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/reading_list:reading_list_remover",
     "//ios/chrome/browser/safe_browsing",
diff --git a/chromium/ios/chrome/browser/commerce/BUILD.gn b/chromium/ios/chrome/browser/commerce/BUILD.gn
new file mode 100644
index 00000000000..f3f3b2dcbab
--- /dev/null
+++ b/chromium/ios/chrome/browser/commerce/BUILD.gn
@@ -0,0 +1,55 @@
+# 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("commerce") {
+  sources = [
+    "price_alert_util.h",
+    "price_alert_util.mm",
+    "shopping_persisted_data_tab_helper.h",
+    "shopping_persisted_data_tab_helper.mm",
+  ]
+  deps = [
+    "//components/commerce/core:proto",
+    "//components/optimization_guide/core:core",
+    "//components/payments/core:core",
+    "//components/prefs:prefs",
+    "//components/unified_consent:unified_consent",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state:browser_state",
+    "//ios/chrome/browser/optimization_guide:optimization_guide",
+    "//ios/chrome/browser/signin:signin",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/web",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "price_alert_util_unittest.mm",
+    "shopping_persisted_data_tab_helper_unittest.mm",
+  ]
+  deps = [
+    ":commerce",
+    "//base/test:test_support",
+    "//components/commerce/core:proto",
+    "//components/optimization_guide/core:core",
+    "//components/optimization_guide/core:test_support",
+    "//components/sync_preferences:test_support",
+    "//components/unified_consent:unified_consent",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/optimization_guide:optimization_guide",
+    "//ios/chrome/browser/optimization_guide:unit_tests",
+    "//ios/chrome/browser/signin:signin",
+    "//ios/chrome/browser/signin:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
+    "//ios/web/public:public",
+    "//ios/web/public/test:test",
+    "//ios/web/public/test:util",
+    "//ios/web/public/test/fakes:fakes",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/context_menu/BUILD.gn b/chromium/ios/chrome/browser/context_menu/BUILD.gn
deleted file mode 100644
index 04a65d78c56..00000000000
--- a/chromium/ios/chrome/browser/context_menu/BUILD.gn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("eg2_tests") {
-  defines = [ "CHROME_EARL_GREY_2" ]
-  configs += [
-    "//build/config/compiler:enable_arc",
-    "//build/config/ios:xctest_config",
-  ]
-  testonly = true
-  sources = [ "context_menu_egtest.mm" ]
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//components/strings",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/fullscreen:feature_flags",
-    "//ios/chrome/browser/ui/fullscreen/test:eg_test_support+eg2",
-    "//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/common:features",
-    "//ios/web/public/test:element_selector",
-    "//net:test_support",
-    "//url",
-  ]
-  frameworks = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/credential_provider/BUILD.gn b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
index b7d06dac130..3e285ea92bf 100644
--- a/chromium/ios/chrome/browser/credential_provider/BUILD.gn
+++ b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
@@ -13,6 +13,16 @@ buildflag_header("buildflags") {
   ]
 }
 
+source_set("feature_flags") {
+  sources = [
+    "feature_flags.h",
+    "feature_flags.mm",
+  ]
+  deps = [ "//base" ]
+  frameworks = [ "Foundation.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 if (ios_enable_credential_provider_extension) {
   source_set("credential_provider") {
     configs += [ "//build/config/compiler:enable_arc" ]
@@ -33,12 +43,15 @@ if (ios_enable_credential_provider_extension) {
     public_deps = [ "//base" ]
     deps = [
       ":buildflags",
+      ":feature_flags",
       "//base",
       "//components/autofill/core/common",
       "//components/keyed_service/core",
       "//components/keyed_service/ios",
       "//components/password_manager/core/browser",
       "//components/password_manager/core/browser:affiliation",
+      "//components/password_manager/core/common",
+      "//components/prefs:prefs",
       "//components/signin/public/identity_manager",
       "//ios/chrome/browser/browser_state",
       "//ios/chrome/browser/passwords",
@@ -69,6 +82,9 @@ if (ios_enable_credential_provider_extension) {
       "//base/test:test_support",
       "//components/autofill/core/common",
       "//components/password_manager/core/browser:test_support",
+      "//components/password_manager/core/common",
+      "//components/prefs",
+      "//components/prefs:test_support",
       "//ios/chrome/browser/browser_state:test_support",
       "//ios/chrome/browser/signin",
       "//ios/chrome/browser/signin:test_support",
diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn
index d8b16149a78..14569c455a9 100644
--- a/chromium/ios/chrome/browser/flags/BUILD.gn
+++ b/chromium/ios/chrome/browser/flags/BUILD.gn
@@ -28,6 +28,7 @@ source_set("flags") {
     "//components/ntp_tiles",
     "//components/omnibox/browser",
     "//components/omnibox/common",
+    "//components/optimization_guide/core",
     "//components/password_manager/core/common",
     "//components/payments/core",
     "//components/policy:generated",
@@ -39,7 +40,6 @@ source_set("flags") {
     "//components/shared_highlighting/core/common",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
-    "//components/signin/public/base",
     "//components/strings:components_strings",
     "//components/sync/driver",
     "//components/translate/core/browser",
@@ -51,18 +51,20 @@ source_set("flags") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/screen_time:buildflags",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/download:features",
+    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:feature_flags",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags",
     "//ios/chrome/browser/ui/reading_list:features",
     "//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/web:feature_flags",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn
index 838b7388bd5..d96d75f2098 100644
--- a/chromium/ios/chrome/browser/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/BUILD.gn
@@ -15,7 +15,6 @@ source_set("infobars") {
   ]
   deps = [
     ":public",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/coordinators",
     "//ios/web",
     "//ui/gfx",
@@ -56,7 +55,6 @@ source_set("badge") {
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/ui/badges:public",
     "//ios/chrome/browser/ui/badges:util",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
   ]
@@ -97,7 +95,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ui/badges:public",
     "//ios/chrome/browser/ui/badges:util",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars:test_support",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
index 30e69dd0d78..563858ace76 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("overlays") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "default_infobar_overlay_request_factory.h",
+    "default_infobar_overlay_request_factory.mm",
     "infobar_banner_overlay_request_cancel_handler.h",
     "infobar_banner_overlay_request_cancel_handler.mm",
     "infobar_modal_completion_notifier.h",
@@ -14,8 +16,6 @@ source_set("overlays") {
     "infobar_overlay_request_cancel_handler.h",
     "infobar_overlay_request_cancel_handler.mm",
     "infobar_overlay_request_factory.h",
-    "infobar_overlay_request_factory_impl.h",
-    "infobar_overlay_request_factory_impl.mm",
     "infobar_overlay_request_inserter.h",
     "infobar_overlay_request_inserter.mm",
     "infobar_overlay_tab_helper.h",
@@ -86,11 +86,11 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "default_infobar_overlay_request_factory_unittest.mm",
     "infobar_banner_overlay_request_cancel_handler_unittest.mm",
     "infobar_modal_completion_notifier_unittest.mm",
     "infobar_modal_overlay_request_cancel_handler_unittest.mm",
     "infobar_overlay_request_cancel_handler_unittest.mm",
-    "infobar_overlay_request_factory_impl_unittest.mm",
     "infobar_overlay_request_inserter_unittest.mm",
     "infobar_overlay_tab_helper_unittest.mm",
     "infobar_overlay_util_unittest.mm",
@@ -121,7 +121,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
     "//ios/chrome/browser/translate:test_support",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
index 08fda1a49c0..c33a89e18db 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
@@ -37,7 +37,6 @@ source_set("browser_agent_util") {
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/autofill_address_profile/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/autofill_address_profile/BUILD.gn
index 7d547b1a62d..1702b453535 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/autofill_address_profile/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/autofill_address_profile/BUILD.gn
@@ -56,7 +56,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
index 49f6528c816..1461fb5b528 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
@@ -55,7 +55,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn
index f108929b7e5..39a74fdc2f9 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
@@ -39,7 +39,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/overlays",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords/BUILD.gn
index d08abd1d365..805c949d152 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
@@ -62,7 +62,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/reading_list/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/reading_list/BUILD.gn
index 7f5c0b32cf2..fbf373da67d 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/reading_list/BUILD.gn
@@ -60,7 +60,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/reading_list:fakes",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/reading_list:infobar",
     "//ios/chrome/browser/web_state_list",
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 666a03be1de..aa48af4b0e4 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
@@ -59,7 +59,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public/test/fakes",
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 e984289be82..ea051ade320 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
@@ -59,7 +59,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/translate:test_support",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/memory/BUILD.gn b/chromium/ios/chrome/browser/memory/BUILD.gn
index ee0d8a27fd7..a07242500c4 100644
--- a/chromium/ios/chrome/browser/memory/BUILD.gn
+++ b/chromium/ios/chrome/browser/memory/BUILD.gn
@@ -18,5 +18,6 @@ source_set("memory") {
     "//components/prefs",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index a0afaa851c3..c8d413bbf3a 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -39,6 +39,8 @@ source_set("metrics") {
     "ios_profile_session_durations_service.mm",
     "ios_profile_session_durations_service_factory.h",
     "ios_profile_session_durations_service_factory.mm",
+    "ios_profile_session_metrics_provider.h",
+    "ios_profile_session_metrics_provider.mm",
     "mobile_session_shutdown_metrics_provider.h",
     "mobile_session_shutdown_metrics_provider.mm",
     "pageload_foreground_duration_tab_helper.h",
@@ -255,7 +257,6 @@ source_set("eg2_tests") {
     ":tab_usage_recorder_metrics",
     "//base/test:test_support",
     "//components/metrics/demographics",
-    "//components/signin/public/base",
     "//components/strings:components_strings_grit",
     "//components/ukm",
     "//ios/chrome/app/strings:ios_strings_grit",
diff --git a/chromium/ios/chrome/browser/omaha/BUILD.gn b/chromium/ios/chrome/browser/omaha/BUILD.gn
index 2fb3799e616..8986a0d560e 100644
--- a/chromium/ios/chrome/browser/omaha/BUILD.gn
+++ b/chromium/ios/chrome/browser/omaha/BUILD.gn
@@ -24,8 +24,7 @@ source_set("omaha") {
     "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/omaha",
+    "//ios/public/provider/chrome/browser/omaha:omaha_api",
     "//ios/web",
     "//net",
     "//third_party/libxml:xml_writer",
@@ -49,8 +48,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
     "//ios/chrome/test:test_support",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/omaha",
+    "//ios/public/provider/chrome/browser/omaha:omaha_api",
     "//ios/web",
     "//ios/web/public/test",
     "//net:test_support",
diff --git a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
index 26ffe14faa4..5071c666c3b 100644
--- a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
+++ b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
@@ -4,10 +4,16 @@
 
 source_set("optimization_guide") {
   sources = [
-    "optimization_guide_service.cc",
+    "ios_chrome_hints_manager.h",
+    "ios_chrome_hints_manager.mm",
     "optimization_guide_service.h",
-    "optimization_guide_service_factory.cc",
+    "optimization_guide_service.mm",
     "optimization_guide_service_factory.h",
+    "optimization_guide_service_factory.mm",
+    "optimization_guide_tab_helper.h",
+    "optimization_guide_tab_helper.mm",
+    "optimization_guide_validation_tab_helper.h",
+    "optimization_guide_validation_tab_helper.mm",
     "tab_url_provider_impl.h",
     "tab_url_provider_impl.mm",
   ]
@@ -15,10 +21,13 @@ source_set("optimization_guide") {
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
+    "//components/leveldb_proto",
     "//components/optimization_guide/core",
+    "//components/optimization_guide/proto:optimization_guide_proto",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
   ]
@@ -30,18 +39,86 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "optimization_guide_service_factory_unittest.cc",
+    "optimization_guide_service_factory_unittest.mm",
+    "optimization_guide_service_unittest.mm",
+    "optimization_guide_tab_helper_unittest.mm",
+    "optimization_guide_test_utils.h",
+    "optimization_guide_test_utils.mm",
+    "optimization_guide_validation_tab_helper_unittest.mm",
     "tab_url_provider_impl_unittest.mm",
   ]
   deps = [
     ":optimization_guide",
     "//base/test:test_support",
     "//components/optimization_guide/core",
+    "//components/optimization_guide/core:test_support",
+    "//components/optimization_guide/proto:optimization_guide_proto",
+    "//components/sync_preferences",
+    "//components/sync_preferences:test_support",
+    "//components/ukm:test_support",
+    "//components/unified_consent",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public/test/fakes",
+    "//services/metrics/public/cpp:ukm_builders",
     "//testing/gtest",
   ]
 }
+
+source_set("eg_app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "optimization_guide_test_app_interface.h",
+    "optimization_guide_test_app_interface.mm",
+  ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//components/optimization_guide/core",
+    "//components/optimization_guide/core:test_support",
+    "//components/optimization_guide/proto:optimization_guide_proto",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/optimization_guide",
+    "//ios/chrome/test/app:test_support",
+  ]
+}
+
+source_set("eg_test_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "optimization_guide_test_app_interface.h" ]
+  deps = [ "//components/optimization_guide/proto:optimization_guide_proto" ]
+}
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "hints_fetcher_egtest.mm" ]
+  deps = [
+    ":eg_test_support+eg2",
+    "//base/test:test_support",
+    "//components/optimization_guide/core:eg_test_support+eg2",
+    "//ios/chrome/browser/metrics: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",
+    "//net:test_support",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index 4d55dc1109b..c59d28a1609 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -7,8 +7,6 @@ import("//ios/web/js_compile.gni")
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "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_password_check_manager.h",
@@ -19,8 +17,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_reuse_manager_factory.cc",
-    "ios_chrome_password_reuse_manager_factory.h",
     "ios_password_requirements_service_factory.cc",
     "ios_password_requirements_service_factory.h",
     "notify_auto_signin_view_controller.h",
@@ -87,14 +83,13 @@ source_set("passwords") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/elements:selector_coordinator",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/coordinators",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
     "//ios/web/common",
     "//ios/web/public/js_messaging",
@@ -125,8 +120,14 @@ source_set("store_factory") {
   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_password_reuse_manager_factory.cc",
+    "ios_chrome_password_reuse_manager_factory.h",
     "ios_chrome_password_store_factory.cc",
     "ios_chrome_password_store_factory.h",
+    "ios_password_store_utils.h",
+    "ios_password_store_utils.mm",
   ]
   deps = [
     "//base",
@@ -162,7 +163,6 @@ source_set("infobar_delegates") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ui/base",
   ]
 }
diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn
index ce5560c7dc7..def71407fc6 100644
--- a/chromium/ios/chrome/browser/policy/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/BUILD.gn
@@ -16,6 +16,8 @@ source_set("policy") {
     "browser_state_policy_connector_factory.mm",
     "chrome_browser_cloud_management_controller_ios.h",
     "chrome_browser_cloud_management_controller_ios.mm",
+    "client_data_delegate_ios.cc",
+    "client_data_delegate_ios.h",
     "configuration_policy_handler_list_factory.h",
     "configuration_policy_handler_list_factory.mm",
     "device_management_service_configuration_ios.h",
@@ -55,7 +57,6 @@ 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",
@@ -164,6 +165,7 @@ source_set("unit_tests") {
   sources = [
     "browser_dm_token_storage_ios_unittest.mm",
     "browser_signin_policy_handler_unittest.mm",
+    "client_data_delegate_ios_unittest.cc",
     "policy_unittest.mm",
     "policy_watcher_browser_agent_unittest.mm",
     "reporting/browser_report_generator_ios_unittest.mm",
@@ -183,7 +185,6 @@ source_set("unit_tests") {
     "//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/app/application_delegate:app_state_header",
@@ -196,7 +197,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin:signin",
     "//ios/chrome/browser/signin:test_support",
-    "//ios/chrome/browser/ui/authentication/signin/user_signin",
+    "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/main/test",
diff --git a/chromium/ios/chrome/browser/policy/resources/BUILD.gn b/chromium/ios/chrome/browser/policy/resources/BUILD.gn
index 5e3709b497b..9670ea58957 100644
--- a/chromium/ios/chrome/browser/policy/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/resources/BUILD.gn
@@ -11,3 +11,11 @@ imageset("enterprise_icon_blue_large") {
     "enterprise_icon_blue_large.imageset/enterprise_icon_blue_large@3x.png",
   ]
 }
+
+imageset("enterprise_grey_icon_large") {
+  sources = [
+    "enterprise_grey_icon_large.imageset/Contents.json",
+    "enterprise_grey_icon_large.imageset/enterprise_grey_icon_large@2x.png",
+    "enterprise_grey_icon_large.imageset/enterprise_grey_icon_large@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index f614c2bf467..0525a679749 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -50,6 +50,7 @@ source_set("browser_prefs") {
     "//components/ntp_snippets",
     "//components/ntp_tiles",
     "//components/omnibox/browser",
+    "//components/optimization_guide/core",
     "//components/password_manager/core/browser",
     "//components/payments/core",
     "//components/policy/core/browser",
diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn
index 4cdbb8dd017..762ef01a5b4 100644
--- a/chromium/ios/chrome/browser/providers/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/BUILD.gn
@@ -2,28 +2,23 @@
 # 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("providers") {
   sources = [
     "chromium_browser_provider.h",
     "chromium_browser_provider.mm",
     "chromium_logo_controller.h",
     "chromium_logo_controller.mm",
-    "chromium_voice_search_provider.h",
-    "chromium_voice_search_provider.mm",
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/providers/signin",
+    "//ios/chrome/browser/ui/ntp:logo",
+    "//ios/chrome/browser/voice:voice_search_language",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:font_size_java_script_feature",
     "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/public/provider/chrome/browser/user_feedback",
-    "//ios/public/provider/chrome/browser/voice",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -49,10 +44,14 @@ group("chromium_providers") {
     "//ios/chrome/browser/providers/branded_images:chromium_branded_images",
     "//ios/chrome/browser/providers/lens:chromium_lens",
     "//ios/chrome/browser/providers/modals:chromium_modals",
+    "//ios/chrome/browser/providers/omaha:chromium_omaha",
+    "//ios/chrome/browser/providers/overrides:chromium_overrides",
     "//ios/chrome/browser/providers/risk_data:chromium_risk_data",
     "//ios/chrome/browser/providers/signin:chromium_signin_error",
     "//ios/chrome/browser/providers/signin:chromium_signin_resources",
     "//ios/chrome/browser/providers/text_zoom:chromium_text_zoom",
+    "//ios/chrome/browser/providers/url_rewriters:chromium_url_rewriters",
+    "//ios/chrome/browser/providers/voice_search:chromium_voice_search",
 
     # The provider API needs to provide MaterialDesignComponent API (as the
     # internal provider provides an alternate implementation).
diff --git a/chromium/ios/chrome/browser/ui/signin/BUILD.gn b/chromium/ios/chrome/browser/providers/omaha/BUILD.gn
index 8b21489880c..d752a18ad77 100644
--- a/chromium/ios/chrome/browser/ui/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/omaha/BUILD.gn
@@ -2,7 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("signin_presenter") {
+source_set("chromium_omaha") {
   configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [ "signin_presenter.h" ]
+  sources = [ "chromium_omaha.cc" ]
+  deps = [ "//ios/public/provider/chrome/browser/omaha:omaha_api" ]
 }
diff --git a/chromium/ios/chrome/browser/providers/overrides/BUILD.gn b/chromium/ios/chrome/browser/providers/overrides/BUILD.gn
new file mode 100644
index 00000000000..071c03976a0
--- /dev/null
+++ b/chromium/ios/chrome/browser/providers/overrides/BUILD.gn
@@ -0,0 +1,9 @@
+# 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("chromium_overrides") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "chromium_overrides.cc" ]
+  deps = [ "//ios/public/provider/chrome/browser/overrides:overrides_api" ]
+}
diff --git a/chromium/ios/chrome/browser/providers/signin/BUILD.gn b/chromium/ios/chrome/browser/providers/signin/BUILD.gn
index 210e705fb34..a5088a2eec0 100644
--- a/chromium/ios/chrome/browser/providers/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/signin/BUILD.gn
@@ -2,20 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("signin") {
-  sources = [
-    "chromium_signin_resources_provider.h",
-    "chromium_signin_resources_provider.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/browser/ui/util",
-    "//ios/public/provider/chrome/browser/signin",
-  ]
-  frameworks = [ "UIKit.framework" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("chromium_signin_error") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [ "chromium_signin_error.mm" ]
diff --git a/chromium/ios/chrome/browser/providers/url_rewriters/BUILD.gn b/chromium/ios/chrome/browser/providers/url_rewriters/BUILD.gn
new file mode 100644
index 00000000000..784c7c79abd
--- /dev/null
+++ b/chromium/ios/chrome/browser/providers/url_rewriters/BUILD.gn
@@ -0,0 +1,10 @@
+# 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("chromium_url_rewriters") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "chromium_url_rewriters.cc" ]
+  deps =
+      [ "//ios/public/provider/chrome/browser/url_rewriters:url_rewriters_api" ]
+}
diff --git a/chromium/ios/chrome/browser/providers/voice_search/BUILD.gn b/chromium/ios/chrome/browser/providers/voice_search/BUILD.gn
new file mode 100644
index 00000000000..73da81f9393
--- /dev/null
+++ b/chromium/ios/chrome/browser/providers/voice_search/BUILD.gn
@@ -0,0 +1,12 @@
+# 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("chromium_voice_search") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "chromium_voice_search.mm" ]
+  deps = [
+    "//ios/chrome/browser/voice:voice_search_language",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 14ff06845b7..ada442113dd 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -16,6 +16,9 @@ source_set("signin") {
     "authentication_service_delegate.h",
     "authentication_service_factory.h",
     "authentication_service_factory.mm",
+    "authentication_service_observer.h",
+    "authentication_service_observer_bridge.h",
+    "authentication_service_observer_bridge.mm",
     "chrome_account_manager_service.h",
     "chrome_account_manager_service.mm",
     "chrome_account_manager_service_factory.h",
@@ -114,7 +117,6 @@ source_set("test_support") {
     "//base",
     "//components/image_fetcher/core:test_support",
     "//components/keyed_service/core",
-    "//components/signin/public/base",
     "//components/signin/public/base:test_support",
     "//components/signin/public/identity_manager:test_support",
     "//ios/chrome/browser/browser_state",
@@ -131,6 +133,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "authentication_service_observer_bridge_unittest.mm",
     "authentication_service_unittest.mm",
     "chrome_account_manager_service_observer_bridge_unittest.mm",
     "chrome_account_manager_service_unittest.mm",
@@ -138,6 +141,7 @@ source_set("unit_tests") {
     "gaia_auth_fetcher_ios_ns_url_session_bridge_unittests.mm",
     "gaia_auth_fetcher_ios_unittest.mm",
     "pattern_account_restriction_unittest.mm",
+    "resized_avatar_cache_unittest.mm",
     "signin_browser_state_info_updater_unittest.mm",
     "user_approved_account_list_manager_unittest.mm",
   ]
@@ -148,7 +152,6 @@ source_set("unit_tests") {
     "//components/pref_registry",
     "//components/prefs",
     "//components/prefs:test_support",
-    "//components/signin/ios/browser:features",
     "//components/signin/public/base:test_support",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager:test_support",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index d7e3b90bb8c..58fc6b90ee5 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -57,7 +57,6 @@ source_set("sync") {
     "//components/search_engines",
     "//components/send_tab_to_self",
     "//components/sessions",
-    "//components/signin/public/base",
     "//components/signin/public/identity_manager",
     "//components/sync",
     "//components/sync_device_info",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 7f8361eaeff..c70b2e93393 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -57,6 +57,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/autofill:autofill_internal",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/commerce",
     "//ios/chrome/browser/complex_tasks",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/download",
@@ -74,6 +75,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/open_in",
+    "//ios/chrome/browser/optimization_guide",
     "//ios/chrome/browser/overscroll_actions",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/policy:feature_flags",
@@ -91,7 +93,6 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/u2f",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/download:features",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:feature_flags",
diff --git a/chromium/ios/chrome/browser/test/BUILD.gn b/chromium/ios/chrome/browser/test/BUILD.gn
deleted file mode 100644
index 6e92a80e0e4..00000000000
--- a/chromium/ios/chrome/browser/test/BUILD.gn
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//ios/public/provider/chrome/browser/build_config.gni")
-
-source_set("perf_test_support") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "perf_test_with_bvc_ios.h",
-    "perf_test_with_bvc_ios.mm",
-  ]
-  deps = [
-    "//base",
-    "//components/bookmarks/test",
-    "//ios/chrome/browser/autocomplete",
-    "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/main",
-    "//ios/chrome/browser/main:test_support",
-    "//ios/chrome/browser/prerender",
-    "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/sessions:restoration_agent",
-    "//ios/chrome/browser/sessions:serialisation",
-    "//ios/chrome/browser/sessions:session_service",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/browser_container:ui",
-    "//ios/chrome/browser/ui/browser_view",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/web:web_internal",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/test:test_support",
-    "//ios/chrome/test/base:perf_test_support",
-    "//ios/public/provider/chrome/browser",
-    "//ios/web/public/test",
-  ]
-  frameworks = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn
index b5efe7072de..3cb31ef14b0 100644
--- a/chromium/ios/chrome/browser/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/translate/BUILD.gn
@@ -54,7 +54,6 @@ source_set("translate") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/language",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/components/webui:url_constants",
     "//third_party/metrics_proto",
@@ -132,6 +131,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/translate:translate",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/fakes:fakes",
+    "//ios/web/public/js_messaging",
     "//net:net",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index 5f4e2381db9..588aa6eab17 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -27,6 +27,7 @@ source_set("authentication") {
   ]
   deps = [
     ":authentication_constants",
+    ":signin_presenter",
     "resources:signin_confirmation_more",
     "resources:signin_promo_close_gray",
     "unified_consent",
@@ -34,7 +35,6 @@ source_set("authentication") {
     "//components/infobars/core",
     "//components/prefs",
     "//components/signin/ios/browser",
-    "//components/signin/public/base",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
@@ -55,7 +55,6 @@ source_set("authentication") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/infobars/resources:infobar_warning",
     "//ios/chrome/browser/ui/settings:settings_root",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/unified_consent",
     "//ios/chrome/browser/web_state_list",
@@ -95,6 +94,11 @@ source_set("authentication_constants") {
   frameworks = [ "UIKit.framework" ]
 }
 
+source_set("signin_presenter") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "signin_presenter.h" ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -108,13 +112,13 @@ source_set("unit_tests") {
   ]
   deps = [
     ":authentication",
+    ":signin_presenter",
     "//base",
     "//base/test:test_support",
     "//components/consent_auditor",
     "//components/consent_auditor:test_support",
     "//components/pref_registry",
     "//components/prefs",
-    "//components/signin/public/base",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager:test_support",
     "//components/sync/driver:test_support",
@@ -128,6 +132,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
@@ -138,7 +143,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/unified_consent",
     "//ios/chrome/test:test_support",
@@ -169,6 +173,7 @@ source_set("eg_app_support+eg2") {
   ]
   deps = [
     ":authentication",
+    ":signin_presenter",
     "unified_consent",
     "//components/bookmarks/browser",
     "//components/prefs",
@@ -178,11 +183,11 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout",
     "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main:scene",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/test/app:test_support",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
@@ -210,17 +215,18 @@ source_set("eg_test_support+eg2") {
     "signin_matchers.mm",
   ]
   deps = [
+    ":signin_presenter",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/authentication/cells:constants",
     "//ios/chrome/browser/ui/authentication/signin:constants",
+    "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin:constants",
     "//ios/chrome/browser/ui/authentication/unified_consent:constants",
     "//ios/chrome/browser/ui/authentication/views:views_constants",
     "//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/browser/ui/signin:signin_presenter",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/public/provider/chrome/browser/signin:constants",
diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
index 5d1702c9745..0a2fe85bacd 100644
--- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
@@ -82,6 +82,7 @@ source_set("unit_tests") {
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser/signin",
+    "//ios/public/provider/chrome/browser/signin:signin_resources_api",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/third_party/material_components_ios",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn
new file mode 100644
index 00000000000..58bb62b8186
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn
@@ -0,0 +1,22 @@
+# 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("enterprise_utils") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "enterprise_utils.h",
+    "enterprise_utils.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/policy:policy_code_generate",
+    "//components/prefs",
+    "//components/signin/public/base",
+    "//components/sync/base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/policy:policy_util",
+    "//ios/chrome/browser/sync",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn
new file mode 100644
index 00000000000..a66e31fe78b
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn
@@ -0,0 +1,27 @@
+# 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("enterprise_signout") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "enterprise_signout_coordinator.h",
+    "enterprise_signout_coordinator.mm",
+    "enterprise_signout_view_controller.h",
+    "enterprise_signout_view_controller.mm",
+  ]
+  deps = [
+    "//components/signin/public/base",
+    "//components/signin/public/identity_manager/objc",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/app/strings:ios_google_chrome_strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy/resources:enterprise_grey_icon_large",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/common/ui/confirmation_alert",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/user_policy_signout/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/user_policy_signout/BUILD.gn
new file mode 100644
index 00000000000..8b63ac47ea4
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/user_policy_signout/BUILD.gn
@@ -0,0 +1,24 @@
+# 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/chrome_build.gni")
+
+source_set("user_policy_signout") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "user_policy_signout_coordinator.h",
+    "user_policy_signout_coordinator.mm",
+    "user_policy_signout_view_controller.h",
+    "user_policy_signout_view_controller.mm",
+  ]
+  deps = [
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser:chrome_url_constants",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/common/ui/confirmation_alert",
+    "//ui/base",
+  ]
+  public_deps = [ "//ios/chrome/browser/ui/coordinators:chrome_coordinators" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
index ea953d3f713..bd78a0d1a46 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
@@ -51,14 +51,18 @@ source_set("signin_impl") {
     "//components/prefs",
     "//components/signin/ios/browser",
     "//ios/chrome/app:tests_hook",
+    "//ios/chrome/browser",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/authentication/signin:signin_screen_provider",
     "//ios/chrome/browser/ui/authentication/signin/add_account_signin",
     "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin",
+    "//ios/chrome/browser/ui/authentication/signin/forced_signin",
     "//ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication",
     "//ios/chrome/browser/ui/authentication/signin/user_signin",
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
@@ -77,16 +81,20 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/pref_registry",
     "//components/signin/ios/browser:features",
+    "//components/sync/base",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/authentication/signin/user_signin",
     "//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",
     "//net",
@@ -119,6 +127,9 @@ source_set("eg2_tests") {
     "//components/signin/public/base",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/metrics:eg_test_support+eg2",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
     "//ios/chrome/browser/ui/authentication/views:views_constants",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
@@ -134,3 +145,17 @@ source_set("eg2_tests") {
   ]
   frameworks = [ "UIKit.framework" ]
 }
+
+source_set("signin_screen_provider") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "signin_screen_provider.h",
+    "signin_screen_provider.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/screen:screen_provider",
+    "//ios/chrome/browser/ui/screen:screen_provider_protected",
+    "//ios/chrome/browser/ui/screen:screen_type",
+  ]
+}
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 f7c47cec893..b4cd3b9cd50 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
@@ -16,6 +16,8 @@ source_set("add_account_signin") {
   deps = [
     "//components/prefs",
     "//components/signin/public/identity_manager",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/signin",
@@ -24,6 +26,7 @@ source_set("add_account_signin") {
     "//ios/chrome/browser/ui/authentication/signin:signin_protected",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
+    "//ui/base",
   ]
   public_deps = [
     "//ios/chrome/browser/ui/authentication/signin:constants",
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 1884eede3e9..90b923d5807 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
@@ -86,7 +86,6 @@ source_set("eg2_tests") {
   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/signin/advanced_settings_signin:constants",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/BUILD.gn
index c84fd182243..ef80c02f021 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/BUILD.gn
@@ -29,8 +29,10 @@ source_set("consistency_account_chooser") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:layout",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_sheet",
+    "//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",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn
index 51a1c4dcc55..b0ef5bdc849 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn
@@ -22,6 +22,7 @@ source_set("consistency_default_account") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication:authentication",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:layout",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_sheet",
     "//ios/chrome/browser/ui/authentication/views",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
new file mode 100644
index 00000000000..8ebca4b0682
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
@@ -0,0 +1,26 @@
+# 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("forced_signin") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "forced_signin_coordinator.h",
+    "forced_signin_coordinator.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/signin/public/identity_manager:identity_manager",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
+    "//ios/chrome/browser/ui/authentication/signin:signin_protected",
+    "//ios/chrome/browser/ui/first_run:screen_delegate",
+    "//ios/chrome/browser/ui/first_run:utils",
+    "//ios/chrome/browser/ui/first_run/signin",
+    "//ios/chrome/browser/ui/first_run/sync",
+    "//ios/chrome/browser/ui/screen:screen_provider",
+    "//ios/chrome/browser/ui/screen:screen_type",
+  ]
+}
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 41aedc1fd49..d7977073882 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,10 +9,6 @@ source_set("user_signin") {
   sources = [
     "gradient_view.h",
     "gradient_view.mm",
-    "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",
@@ -29,6 +25,7 @@ source_set("user_signin") {
     "//components/unified_consent",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:chrome_url_constants",
+    "//ios/chrome/browser:utils",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/policy/resources:enterprise_icon_blue_large",
     "//ios/chrome/browser/signin",
@@ -41,8 +38,11 @@ source_set("user_signin") {
     "//ios/chrome/browser/ui/authentication/unified_consent",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/settings/sync/utils",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/unified_consent",
+    "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert:confirmation_alert",
     "//ios/chrome/common/ui/util",
@@ -106,10 +106,10 @@ source_set("eg2_tests") {
     "//base/test:test_support",
     "//components/signin/internal/identity_manager",
     "//components/signin/ios/browser:features",
-    "//components/signin/public/base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/authentication/signin:constants",
     "//ios/chrome/browser/ui/authentication/unified_consent:constants",
     "//ios/chrome/browser/ui/authentication/views:views_constants",
     "//ios/chrome/browser/ui/settings:constants",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn
index 91187e574d7..d7dae2dcd4d 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn
@@ -16,7 +16,6 @@ source_set("logging") {
   ]
   deps = [
     "//components/prefs",
-    "//components/signin/public/base",
     "//components/version_info",
     "//ios/chrome/browser/signin",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
index 19a6008431c..15646db3d3d 100644
--- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
@@ -19,6 +19,7 @@ source_set("unified_consent") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index 3a2ae40161e..5e657d22458 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -43,7 +43,6 @@ source_set("autofill") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/translate:translate",
     "//ios/chrome/browser/ui/autofill/cells",
-    "//ios/chrome/browser/ui/autofill/form_input_accessory:form_input_accessory_ui",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
     "//ios/chrome/browser/ui/collection_view/cells",
@@ -52,6 +51,7 @@ source_set("autofill") {
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common",
+    "//ios/chrome/common/ui/elements:form_input_accessory",
     "//ios/public/provider/chrome/browser/risk_data:risk_data_api",
     "//ios/third_party/material_components_ios",
     "//ios/web/common",
@@ -171,6 +171,7 @@ source_set("eg2_tests") {
     "//base",
     "//base/test:test_support",
     "//build:branding_buildflags",
+    "//components/autofill/core/common:features",
     "//components/autofill/ios/browser:autofill_test_bundle_data",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
index 8aa300aecd9..7ce10d38bcf 100644
--- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
@@ -29,6 +29,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/autofill:autofill_ui_type",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
@@ -36,7 +37,6 @@ source_set("cells") {
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn
index bb082f8156f..3750806770e 100644
--- a/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("form_input_accessory") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "form_input_accessory_chromium_text_data.h",
+    "form_input_accessory_chromium_text_data.mm",
     "form_input_accessory_consumer.h",
     "form_input_accessory_coordinator.h",
     "form_input_accessory_coordinator.mm",
@@ -14,7 +16,6 @@ source_set("form_input_accessory") {
     "form_input_accessory_view_controller.mm",
   ]
   deps = [
-    ":form_input_accessory_ui",
     "//base",
     "//components/autofill/core/browser",
     "//components/autofill/ios/browser",
@@ -40,6 +41,7 @@ source_set("form_input_accessory") {
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/common/ui/elements:form_input_accessory",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/util",
     "//ios/web/common",
@@ -51,26 +53,6 @@ source_set("form_input_accessory") {
   frameworks = [ "UIKit.framework" ]
 }
 
-source_set("form_input_accessory_ui") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "form_input_accessory_view.h",
-    "form_input_accessory_view.mm",
-  ]
-  deps = [
-    "//base",
-    "//base:i18n",
-    "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser/autofill:autofill_shared",
-    "//ios/chrome/browser/ui/image_util",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/util",
-    "//ui/base",
-  ]
-  frameworks = [ "UIKit.framework" ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
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 abc968cab01..ac9c62e4a5b 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
@@ -123,8 +123,6 @@ source_set("manual_fill_ui") {
     "//ios/chrome/browser/autofill/manual_fill:manual_fill",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_down",
-    "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_up",
     "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_keyboard",
     "//ios/chrome/browser/ui/list_model:list_model",
     "//ios/chrome/browser/ui/table_view:styler",
diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn
index 36655fe48b8..0bf14594961 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn
@@ -4,24 +4,6 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
-imageset("mf_arrow_down") {
-  sources = [
-    "mf_arrow_down.imageset/Contents.json",
-    "mf_arrow_down.imageset/mf_arrow_down.png",
-    "mf_arrow_down.imageset/mf_arrow_down@2x.png",
-    "mf_arrow_down.imageset/mf_arrow_down@3x.png",
-  ]
-}
-
-imageset("mf_arrow_up") {
-  sources = [
-    "mf_arrow_up.imageset/Contents.json",
-    "mf_arrow_up.imageset/mf_arrow_up.png",
-    "mf_arrow_up.imageset/mf_arrow_up@2x.png",
-    "mf_arrow_up.imageset/mf_arrow_up@3x.png",
-  ]
-}
-
 imageset("mf_keyboard") {
   sources = [
     "mf_keyboard.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
index 1694e09728e..30e14aad71f 100644
--- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
@@ -68,7 +68,6 @@ source_set("badges") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/resources:infobar_reading_list",
     "//ios/chrome/browser/ui/infobars/resources:infobar_save_card_icon",
     "//ios/chrome/browser/ui/infobars/resources:infobar_settings_icon",
@@ -107,7 +106,6 @@ source_set("badges_popup_menu") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
@@ -139,7 +137,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars:test_support",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index d96bd989979..e6df126b776 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -64,6 +64,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication:signin_presenter",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/bookmarks/cells",
     "//ios/chrome/browser/ui/commands",
@@ -76,9 +77,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/sharing",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/table_view",
-    "//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",
@@ -95,23 +94,6 @@ source_set("bookmarks") {
   frameworks = [ "UIKit.framework" ]
 }
 
-source_set("edit") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "bookmark_edit_coordinator.h",
-    "bookmark_edit_coordinator.mm",
-  ]
-  deps = [
-    ":bookmarks_ui",
-    ":core",
-    "//components/bookmarks/browser",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/table_view",
-    "//url",
-  ]
-  frameworks = [ "UIKit.framework" ]
-}
-
 source_set("core") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -184,7 +166,6 @@ source_set("bookmarks_ui") {
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/table_view",
-    "//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",
@@ -223,6 +204,7 @@ source_set("test_support") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
+    "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/web/public/test",
   ]
@@ -252,6 +234,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
   ]
@@ -286,7 +269,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
     "//ios/chrome/browser/ui/authentication/signin:constants",
     "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//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",
@@ -325,7 +307,6 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/test/app:test_support",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/public/provider/chrome/browser/signin:test_support",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index b3664db2080..8d462fa2f1a 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -28,11 +28,11 @@ source_set("cells") {
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
index d0417bc9cd9..4a13fd794d8 100644
--- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -32,6 +32,7 @@ source_set("browser_view") {
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
     "//components/signin/ios/browser:active_state_manager",
+    "//components/signin/public/identity_manager",
     "//components/strings",
     "//components/translate/core/browser",
     "//components/ukm/ios:ukm_url_recorder",
@@ -47,6 +48,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/browser_state_metrics",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/download",
+    "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/first_run",
@@ -83,7 +85,9 @@ 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/authentication:signin_presenter",
+    "//ios/chrome/browser/ui/authentication/enterprise/enterprise_signout",
+    "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout",
     "//ios/chrome/browser/ui/autofill:autofill",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
     "//ios/chrome/browser/ui/badges:badges_popup_menu",
@@ -96,6 +100,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo",
     "//ios/chrome/browser/ui/default_promo:default_promo_ui",
@@ -105,7 +110,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/elements:elements_internal",
     "//ios/chrome/browser/ui/find_bar",
     "//ios/chrome/browser/ui/first_run",
-    "//ios/chrome/browser/ui/first_run:first_run_ui",
     "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
@@ -126,6 +130,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:coordinator",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox/popup",
@@ -149,7 +154,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/side_swipe",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/snackbar",
     "//ios/chrome/browser/ui/tab_switcher/tab_strip",
     "//ios/chrome/browser/ui/tabs",
@@ -189,14 +193,15 @@ source_set("browser_view") {
     "//ios/chrome/browser/window_activities",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/util",
     "//ios/components/security_interstitials",
     "//ios/components/webui:url_constants",
-    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/lens:lens_api",
+    "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/text_zoom:text_zoom_api",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/webkit",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
index c2ffbcde3a0..cf60525329a 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -29,12 +29,14 @@ source_set("commands") {
     "page_info_commands.h",
     "password_breach_commands.h",
     "password_protection_commands.h",
-    "policy_signout_commands.h",
+    "policy_change_commands.h",
     "popup_menu_commands.h",
     "qr_generation_commands.h",
     "qr_scanner_commands.h",
     "reading_list_add_command.h",
     "reading_list_add_command.mm",
+    "search_image_with_lens_command.h",
+    "search_image_with_lens_command.mm",
     "security_alert_commands.h",
     "share_highlight_command.h",
     "share_highlight_command.mm",
@@ -59,7 +61,6 @@ source_set("commands") {
     "//base",
     "//components/browsing_data/core",
     "//components/password_manager/core/browser",
-    "//components/signin/public/base",
     "//ios/chrome/browser/browsing_data:browsing_data_remove_mask",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/commerce/BUILD.gn b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn
new file mode 100644
index 00000000000..c7544fb550a
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn
@@ -0,0 +1,26 @@
+# 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("price_card") {
+  sources = [
+    "price_card/price_card_constants.h",
+    "price_card/price_card_constants.mm",
+    "price_card/price_card_data_source.h",
+    "price_card/price_card_item.h",
+    "price_card/price_card_item.mm",
+    "price_card/price_card_mediator.h",
+    "price_card/price_card_mediator.mm",
+    "price_card/price_card_view.h",
+    "price_card/price_card_view.mm",
+  ]
+  deps = [
+    "price_card/resources:colors",
+    "//ios/chrome/browser/commerce:commerce",
+    "//ios/chrome/browser/web:tab_id_tab_helper",
+    "//ios/chrome/browser/web_state_list:web_state_list",
+    "//ios/chrome/common/ui/colors",
+    "//ios/web",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/commerce/price_card/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/commerce/price_card/resources/BUILD.gn
new file mode 100644
index 00000000000..ca438796d0c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/commerce/price_card/resources/BUILD.gn
@@ -0,0 +1,18 @@
+# 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")
+
+source_set("colors") {
+  sources = [
+    "semantic_color_names.h",
+    "semantic_color_names.mm",
+  ]
+  deps = [ ":price_drop_previous_price_text_color" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+colorset("price_drop_previous_price_text_color") {
+  sources = [ "price_drop_previous_price_text_color.colorset/Contents.json" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 491ce216c6f..5c9ac4955c5 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -4,23 +4,16 @@
 
 source_set("content_suggestions") {
   sources = [
-    "content_suggestions_action_handler.h",
     "content_suggestions_alert_factory.h",
     "content_suggestions_alert_factory.mm",
     "content_suggestions_category_wrapper.h",
     "content_suggestions_category_wrapper.mm",
-    "content_suggestions_consumer.h",
     "content_suggestions_coordinator.h",
     "content_suggestions_coordinator.mm",
     "content_suggestions_favicon_mediator.h",
     "content_suggestions_favicon_mediator.mm",
     "content_suggestions_mediator.h",
     "content_suggestions_mediator.mm",
-    "content_suggestions_metrics_recorder.h",
-    "content_suggestions_metrics_recorder.mm",
-    "content_suggestions_service_bridge_observer.h",
-    "content_suggestions_service_bridge_observer.mm",
-    "discover_feed_delegate.h",
     "mediator_util.h",
     "mediator_util.mm",
     "ntp_home_mediator.h",
@@ -86,6 +79,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/ntp",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/reading_list",
@@ -103,8 +97,6 @@ source_set("content_suggestions") {
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/discover_feed",
-    "//ios/public/provider/chrome/browser/signin:signin_resources_api",
-    "//ios/public/provider/chrome/browser/ui",
     "//ui/base",
     "//ui/strings",
   ]
@@ -122,13 +114,11 @@ source_set("constants") {
 
 source_set("content_suggestions_ui") {
   sources = [
-    "content_suggestions_action_handler.h",
     "content_suggestions_collection_controlling.h",
     "content_suggestions_collection_synchronizing.h",
     "content_suggestions_collection_updater.h",
     "content_suggestions_collection_updater.mm",
     "content_suggestions_commands.h",
-    "content_suggestions_consumer.h",
     "content_suggestions_data_sink.h",
     "content_suggestions_data_source.h",
     "content_suggestions_header_commands.h",
@@ -145,7 +135,6 @@ source_set("content_suggestions_ui") {
     "content_suggestions_layout.h",
     "content_suggestions_layout.mm",
     "content_suggestions_menu_provider.h",
-    "content_suggestions_metrics_recording.h",
     "content_suggestions_view_controller.h",
     "content_suggestions_view_controller.mm",
     "content_suggestions_view_controller_audience.h",
@@ -177,15 +166,13 @@ source_set("content_suggestions_ui") {
     "//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:logo",
     "//ios/chrome/browser/ui/ntp_tile_views",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
-    "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/start_surface:feature_flags",
-    "//ios/chrome/browser/ui/thumb_strip:public",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util:util",
@@ -194,8 +181,6 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/discover_feed",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/web/common",
     "//ui/base",
   ]
@@ -287,6 +272,7 @@ source_set("unit_tests") {
     "//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/ntp:logo",
     "//ios/chrome/browser/ui/start_surface:feature_flags",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/ui/util",
@@ -296,7 +282,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/public/provider/chrome/browser:test_support",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/testing:block_swizzler",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
index f0fd7bd4a78..b6d0a04c2bc 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
@@ -5,8 +5,6 @@
 source_set("cells") {
   sources = [
     "content_suggestions_gesture_commands.h",
-    "content_suggestions_item.h",
-    "content_suggestions_item.mm",
     "content_suggestions_most_visited_action_item.h",
     "content_suggestions_most_visited_action_item.mm",
     "content_suggestions_most_visited_item.h",
@@ -33,20 +31,10 @@ source_set("cells") {
 
 source_set("cells_ui") {
   sources = [
-    "content_suggestions_articles_header_item.h",
-    "content_suggestions_articles_header_item.mm",
-    "content_suggestions_cell.h",
-    "content_suggestions_cell.mm",
     "content_suggestions_discover_header_item.h",
     "content_suggestions_discover_header_item.mm",
-    "content_suggestions_discover_item.h",
-    "content_suggestions_discover_item.mm",
-    "content_suggestions_footer_item.h",
-    "content_suggestions_footer_item.mm",
     "content_suggestions_header_item.h",
     "content_suggestions_header_item.mm",
-    "content_suggestions_learn_more_item.h",
-    "content_suggestions_learn_more_item.mm",
     "content_suggestions_most_visited_action_cell.h",
     "content_suggestions_most_visited_action_cell.mm",
     "content_suggestions_most_visited_cell.h",
@@ -85,10 +73,7 @@ source_set("cells_ui") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "content_suggestions_footer_item_unittest.mm",
     "content_suggestions_header_item_unittest.mm",
-    "content_suggestions_item_unittest.mm",
-    "content_suggestions_learn_more_item_unittest.mm",
     "content_suggestions_most_visited_item_unittest.mm",
     "content_suggestions_whats_new_item_unittest.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
new file mode 100644
index 00000000000..ec9bafcd62e
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
@@ -0,0 +1,108 @@
+# 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("context_menu") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "context_menu_configuration_provider.h",
+    "context_menu_configuration_provider.mm",
+  ]
+  deps = [
+    ":context_menu_ui",
+    "//base",
+    "//components/search_engines",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/policy:policy_util",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/commands",
+    "//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/main:scene_state_header",
+    "//ios/chrome/browser/ui/menu",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:url_with_title",
+    "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/web/image_fetch",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/public/provider/chrome/browser/lens:lens_api",
+    "//ios/web/common",
+    "//ios/web/common:features",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("context_menu_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "context_menu_utils.h",
+    "context_menu_utils.mm",
+    "image_preview_view_controller.h",
+    "image_preview_view_controller.mm",
+    "link_no_preview_view.h",
+    "link_no_preview_view.mm",
+    "link_no_preview_view_controller.h",
+    "link_no_preview_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/url_formatter",
+    "//ios/chrome/browser/ui/elements",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/favicon",
+    "//ios/web/common:features",
+    "//ios/web/public/ui",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  deps = [
+    ":context_menu_ui",
+    "//base",
+    "//base/test:test_support",
+    "//components/url_formatter",
+    "//ios/web/common",
+    "//ios/web/public",
+    "//net",
+    "//testing/gtest",
+  ]
+
+  sources = [ "context_menu_utils_unittest.mm" ]
+}
+
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "context_menu_egtest.mm" ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/fullscreen/test:eg_test_support+eg2",
+    "//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/common:features",
+    "//ios/web/public/test:element_selector",
+    "//net:test_support",
+    "//url",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/context_menu/link_preview/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/link_preview/BUILD.gn
new file mode 100644
index 00000000000..952afd5cfcb
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/context_menu/link_preview/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.
+
+source_set("link_preview") {
+  sources = [
+    "link_preview_coordinator.h",
+    "link_preview_coordinator.mm",
+    "link_preview_mediator.h",
+    "link_preview_mediator.mm",
+  ]
+  deps = [
+    ":link_preview_ui",
+    "//components/url_formatter",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/history:tab_helper",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/ntp:constants",
+    "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public",
+    "//url",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("link_preview_ui") {
+  sources = [
+    "link_preview_consumer.h",
+    "link_preview_view_controller.h",
+    "link_preview_view_controller.mm",
+  ]
+  deps = [
+    ":constants",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui/colors",
+    "//ios/third_party/material_components_ios",
+    "//ui/gfx",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("constants") {
+  sources = [
+    "link_preview_constants.h",
+    "link_preview_constants.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn
index 0e159447166..15725fdcd46 100644
--- a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn
@@ -11,6 +11,7 @@ source_set("utils") {
   deps = [
     "//base",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/first_run:field_trial",
   ]
   frameworks = [ "Foundation.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn
index 26104869503..7e054041c69 100644
--- a/chromium/ios/chrome/browser/ui/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn
@@ -141,7 +141,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/download:mime_types",
     "//ios/chrome/browser/download:test_support",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners:public",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
index 53d6b7e2ed9..1a36c2220bc 100644
--- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
@@ -9,6 +9,8 @@ source_set("elements") {
     "extended_touch_target_button.mm",
     "fade_truncating_label.h",
     "fade_truncating_label.mm",
+    "favicon_container_view.h",
+    "favicon_container_view.mm",
     "gray_highlight_button.h",
     "gray_highlight_button.mm",
     "home_waiting_view.h",
@@ -36,6 +38,8 @@ source_set("elements") {
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/favicon",
+    "//ios/chrome/common/ui/util",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index 3fa19dc5cac..ff8c5e97fe7 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -5,12 +5,12 @@
 source_set("field_trial") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "default_browser_promo_field_trial.cc",
+    "default_browser_promo_field_trial.h",
     "fre_field_trial.cc",
     "fre_field_trial.h",
     "ios_first_run_field_trials.cc",
     "ios_first_run_field_trials.h",
-    "location_permissions_field_trial.cc",
-    "location_permissions_field_trial.h",
   ]
   deps = [
     "//base",
@@ -28,9 +28,6 @@ source_set("first_run") {
   sources = [
     "first_run_coordinator.h",
     "first_run_coordinator.mm",
-    "first_run_screen_provider.h",
-    "first_run_screen_provider.mm",
-    "first_run_screen_type.h",
     "location_permissions_commands.h",
     "location_permissions_coordinator.h",
     "location_permissions_coordinator.mm",
@@ -46,7 +43,7 @@ source_set("first_run") {
   deps = [
     ":constants",
     ":field_trial",
-    ":first_run_ui",
+    ":first_run_provider",
     ":screen_delegate",
     ":static_file_ui",
     ":utils",
@@ -69,6 +66,7 @@ source_set("first_run") {
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin",
@@ -84,6 +82,8 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/first_run/signin",
     "//ios/chrome/browser/ui/first_run/sync",
     "//ios/chrome/browser/ui/first_run/welcome",
+    "//ios/chrome/browser/ui/screen:screen_provider",
+    "//ios/chrome/browser/ui/screen:screen_type",
     "//ios/chrome/browser/ui/settings/resources:enterprise_icon",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/util",
@@ -92,6 +92,7 @@ source_set("first_run") {
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
@@ -102,6 +103,21 @@ source_set("first_run") {
   frameworks = [ "UIKit.framework" ]
 }
 
+source_set("first_run_provider") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "first_run_screen_provider.h",
+    "first_run_screen_provider.mm",
+  ]
+  deps = [
+    ":field_trial",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/screen:screen_provider",
+    "//ios/chrome/browser/ui/screen:screen_provider_protected",
+    "//ios/chrome/browser/ui/screen:screen_type",
+  ]
+}
+
 source_set("utils") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -138,27 +154,6 @@ source_set("screen_delegate") {
   sources = [ "first_run_screen_delegate.h" ]
 }
 
-source_set("first_run_ui") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "first_run_screen_view_controller.h",
-    "first_run_screen_view_controller.mm",
-    "first_run_screen_view_controller_delegate.h",
-    "highlighted_button.h",
-    "highlighted_button.mm",
-  ]
-  deps = [
-    "//base",
-    "//base:i18n",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/util",
-    "//ios/chrome/common/ui/util:dynamic_type_util",
-    "//ui/base",
-  ]
-}
-
 source_set("static_file_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -259,6 +254,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/app:first_run_app_state_agent",
     "//ios/chrome/browser",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/main:scene",
     "//ios/chrome/browser/ui/main:scene_testing",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn
index 26df7d35253..865388f3076 100644
--- a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn
@@ -13,6 +13,7 @@ source_set("default_browser") {
     "//base",
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
   ]
   frameworks = [ "UIKit.framework" ]
@@ -23,20 +24,19 @@ source_set("default_browser_ui") {
   sources = [
     "default_browser_screen_view_controller.h",
     "default_browser_screen_view_controller.mm",
-    "instruction_table_view.h",
-    "instruction_table_view.mm",
-    "instruction_table_view_cell.h",
-    "instruction_table_view_cell.mm",
+    "instruction_view.h",
+    "instruction_view.mm",
   ]
   deps = [
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/first_run:constants",
-    "//ios/chrome/browser/ui/first_run:first_run_ui",
     "//ios/chrome/browser/ui/first_run/resources:default_browser_screen_banner",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/promo_style",
+    "//ios/chrome/common/ui/util",
     "//ios/chrome/common/ui/util:dynamic_type_util",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn
index 00f2fd940e1..b5c7f6f9c6b 100644
--- a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn
@@ -56,6 +56,16 @@ imageset("signin_screen_banner") {
   ]
 }
 
+imageset("forced_signin_screen_banner") {
+  sources = [
+    "forced_signin_screen_banner.imageset/Contents.json",
+    "forced_signin_screen_banner.imageset/forced_signin_screen_banner_dark@2x.png",
+    "forced_signin_screen_banner.imageset/forced_signin_screen_banner_dark@3x.png",
+    "forced_signin_screen_banner.imageset/forced_signin_screen_banner_light@2x.png",
+    "forced_signin_screen_banner.imageset/forced_signin_screen_banner_light@3x.png",
+  ]
+}
+
 imageset("sync_screen_banner") {
   sources = [
     "sync_screen_banner.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn
index d66699527ad..6a31abb127d 100644
--- a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn
@@ -17,10 +17,11 @@ source_set("signin") {
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/policy",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication/signin/add_account_signin",
-    "//ios/chrome/browser/ui/authentication/signin/user_signin",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
+    "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout",
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
     "//ios/chrome/browser/ui/commands",
@@ -42,10 +43,18 @@ source_set("signin_ui") {
   ]
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/views",
+    "//ios/chrome/browser/ui/elements:elements_internal",
     "//ios/chrome/browser/ui/first_run:constants",
-    "//ios/chrome/browser/ui/first_run:first_run_ui",
+    "//ios/chrome/browser/ui/first_run/resources:forced_signin_screen_banner",
     "//ios/chrome/browser/ui/first_run/resources:signin_screen_banner",
+    "//ios/chrome/browser/ui/settings/elements:constants",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
+    "//ios/chrome/common",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",
     "//ui/base",
   ]
@@ -68,6 +77,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/unified_consent",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser:test_support",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/public/provider/chrome/browser/signin:test_support",
diff --git a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn
index 308df7e930a..e351249512c 100644
--- a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn
@@ -17,13 +17,15 @@ source_set("sync") {
     "//components/consent_auditor",
     "//components/unified_consent",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/policy",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication/signin/user_signin",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
+    "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
@@ -42,14 +44,20 @@ source_set("sync_ui") {
   ]
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/elements:elements_internal",
     "//ios/chrome/browser/ui/first_run:constants",
-    "//ios/chrome/browser/ui/first_run:first_run_ui",
     "//ios/chrome/browser/ui/first_run/resources:sync_screen_banner",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
+    "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",
+    "//net",
     "//ui/base",
+    "//url",
   ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -71,6 +79,7 @@ source_set("unit_tests") {
     "//components/unified_consent",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/policy",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync",
diff --git a/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn
index f1f7b217894..8ef88db3f64 100644
--- a/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn
@@ -48,13 +48,13 @@ source_set("welcome_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/first_run:constants",
-    "//ios/chrome/browser/ui/first_run:first_run_ui",
     "//ios/chrome/browser/ui/first_run/resources:welcome_metrics_checkmark",
     "//ios/chrome/browser/ui/first_run/resources:welcome_screen_banner",
     "//ios/chrome/browser/ui/settings/resources:enterprise_icon",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",
     "//ui/base",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
index d7b6b063611..83cbb993a0e 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -99,12 +99,12 @@ source_set("internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/broadcaster",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:timing",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/web",
     "//ios/web/common",
     "//ios/web/public/security",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn
index 337c92a11a2..a55425b0012 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn
@@ -42,9 +42,9 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/test/app:test_support",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 61ee804b28d..cd641615a1e 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -33,7 +33,6 @@ source_set("history") {
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/table_view",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/util",
   ]
   frameworks = [
@@ -130,7 +129,6 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
     "//ios/chrome/browser/ui/table_view",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/url_loading",
     "//ios/web/public",
@@ -169,7 +167,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//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/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/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index 457907cad96..9acfdc7ec9c 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -14,19 +14,6 @@ source_set("constants") {
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "infobar_feature.h",
-    "infobar_feature.mm",
-  ]
-  public_deps = [ "//base" ]
-  deps = [
-    "//components/version_info",
-    "//ios/chrome/common",
-  ]
-}
-
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
@@ -50,7 +37,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/translate:eg_test_support+eg2",
     "//ios/chrome/browser/ui/badges:public",
     "//ios/chrome/browser/ui/infobars:constants",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners:public",
     "//ios/chrome/browser/ui/infobars/modals:public",
     "//ios/chrome/browser/ui/popup_menu:constants",
diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
index 20f42bb3127..96103e2dabb 100644
--- a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
@@ -18,7 +18,6 @@ source_set("banners") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
index abdddf96fcd..e5d12476622 100644
--- a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
@@ -22,7 +22,6 @@ source_set("presentation") {
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners:public",
     "//ios/chrome/browser/ui/overlays:presentation_controller",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index b2f7a40fcba..ccd8df55a1b 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -63,7 +63,6 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/main:default_browser_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:util",
@@ -84,8 +83,7 @@ source_set("location_bar") {
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser:browser",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ios/third_party/material_components_ios",
     "//ios/web/public:public",
     "//ios/web/public/security",
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index 09649c64b6e..681d56957a5 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -98,13 +98,13 @@ source_set("scene") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "connection_information.h",
-    "policy_signout_scene_agent.h",
-    "policy_signout_scene_agent.mm",
     "scene_controller.h",
     "scene_controller.mm",
     "scene_delegate.h",
     "scene_delegate.mm",
     "scene_state.mm",
+    "signin_policy_scene_agent.h",
+    "signin_policy_scene_agent.mm",
     "ui_blocker_scene_agent.h",
     "ui_blocker_scene_agent.mm",
   ]
@@ -121,9 +121,13 @@ source_set("scene") {
     "//components/breadcrumbs/core",
     "//components/breadcrumbs/core:feature_flags",
     "//components/infobars/core",
+    "//components/prefs",
+    "//components/prefs/ios",
     "//components/previous_session_info",
     "//components/signin/ios/browser:features",
+    "//components/signin/public/base",
     "//components/signin/public/identity_manager",
+    "//components/signin/public/identity_manager/objc",
     "//components/url_formatter",
     "//components/version_info",
     "//components/web_resource",
@@ -138,6 +142,7 @@ source_set("scene") {
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report:crash_report_internal",
@@ -157,8 +162,8 @@ source_set("scene") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/appearance",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//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",
@@ -169,7 +174,9 @@ source_set("scene") {
     "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
+    "//ios/chrome/browser/ui/main:browser_interface_provider",
     "//ios/chrome/browser/ui/reading_list:features",
+    "//ios/chrome/browser/ui/scoped_ui_blocker",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/start_surface",
diff --git a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
index 0747f6c5ba8..2cc18c2e0f0 100644
--- a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn
@@ -21,6 +21,7 @@ source_set("test") {
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/main:scene",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:test_support",
     "//ios/web/public/test/fakes",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/menu/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
index 73219347860..9a811be5b49 100644
--- a/chromium/ios/chrome/browser/ui/menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
@@ -21,6 +21,7 @@ source_set("menu") {
     "resources:delete",
     "resources:download",
     "resources:edit",
+    "resources:lens_icon",
     "resources:mark_read",
     "resources:move_folder",
     "resources:offline",
@@ -73,6 +74,7 @@ source_set("unit_tests") {
     "resources:delete",
     "resources:download",
     "resources:edit",
+    "resources:lens_icon",
     "resources:mark_read",
     "resources:move_folder",
     "resources:offline",
@@ -94,6 +96,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/window_activities",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
index 6eed1497ae2..1e1ab6da3ef 100644
--- a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
@@ -60,6 +60,14 @@ imageset("edit") {
   ]
 }
 
+imageset("lens_icon") {
+  sources = [
+    "lens_icon.imageset/Contents.json",
+    "lens_icon.imageset/lens_icon@2x.png",
+    "lens_icon.imageset/lens_icon@3x.png",
+  ]
+}
+
 imageset("open_image_in_new_tab") {
   sources = [
     "open_image_in_new_tab.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index 7503352a5a1..4b8f16337f4 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -4,10 +4,11 @@
 
 source_set("ntp") {
   sources = [
+    "discover_feed_delegate.h",
+    "discover_feed_preview_delegate.h",
     "new_tab_page_commands.h",
     "new_tab_page_content_delegate.h",
     "new_tab_page_controller_delegate.h",
-    "new_tab_page_feed_delegate.h",
     "new_tab_page_omnibox_positioning.h",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -18,6 +19,15 @@ source_set("ntp") {
   deps = [ "//ios/chrome/browser/ui/util" ]
 }
 
+source_set("logo") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "logo_animation_controller.h",
+    "logo_vendor.h",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
 source_set("constants") {
   sources = [
     "discover_feed_constants.h",
@@ -38,6 +48,7 @@ source_set("coordinator") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
     ":feature_flags",
+    ":logo",
     ":ntp",
     ":ntp_internal",
     "//components/feed/core/v2/public/ios:feed_ios_public",
@@ -56,10 +67,10 @@ source_set("coordinator") {
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
+    "//ios/chrome/browser/ui/context_menu/link_preview",
     "//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/ntp/discover_feed_preview",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/url_loading",
@@ -68,7 +79,6 @@ source_set("coordinator") {
     "//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",
   ]
 }
@@ -97,14 +107,18 @@ source_set("ntp_internal") {
     "incognito_view_controller.mm",
     "metrics.h",
     "metrics.mm",
+    "new_tab_page_url_loader_delegate.h",
     "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",
     "ntp_tile_saver.mm",
+    "revamped_incognito_view.h",
+    "revamped_incognito_view.mm",
   ]
   deps = [
+    ":logo",
     ":ntp",
     "resources:incognito_icon",
     "resources:ntp_opentabs",
@@ -167,8 +181,6 @@ source_set("ntp_internal") {
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/branded_images:branded_images_api",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//net",
@@ -262,20 +274,6 @@ source_set("eg2_tests") {
   frameworks = [ "UIKit.framework" ]
 }
 
-source_set("perf_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "new_tab_page_perftest.mm" ]
-  deps = [
-    "//base/test:test_support",
-    "//ios/chrome/browser/main",
-    "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/test:perf_test_support",
-    "//ios/chrome/browser/ui/browser_view",
-    "//ios/chrome/browser/ui/commands",
-  ]
-}
-
 source_set("feature_flags") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/ntp/discover_feed_preview/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/discover_feed_preview/BUILD.gn
deleted file mode 100644
index fbdd52ccb64..00000000000
--- a/chromium/ios/chrome/browser/ui/ntp/discover_feed_preview/BUILD.gn
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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("discover_feed_preview") {
-  sources = [
-    "discover_feed_preview_coordinator.h",
-    "discover_feed_preview_coordinator.mm",
-    "discover_feed_preview_delegate.h",
-  ]
-  deps = [
-    ":discover_feed_preview_ui",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/ntp:constants",
-    "//ios/chrome/browser/ui/ntp:feature_flags",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/web/public",
-    "//url",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("discover_feed_preview_ui") {
-  sources = [
-    "discover_feed_preview_view_controller.h",
-    "discover_feed_preview_view_controller.mm",
-  ]
-  deps = []
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index ede0009d24b..4ae942b651c 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -135,7 +135,6 @@ source_set("omnibox_internal") {
     "//components/search_engines",
     "//components/security_state/core",
     "//components/strings",
-    "//ios/chrome/app/intents",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autocomplete",
@@ -161,7 +160,9 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/common",
+    "//ios/chrome/common/intents",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
@@ -279,34 +280,3 @@ bundle_data("resources_unit_tests") {
   outputs = [ "{{bundle_resources_dir}}/" +
               "ios/chrome/test/data/omnibox/{{source_file_part}}" ]
 }
-
-source_set("perf_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "omnibox_perftest.mm" ]
-  deps = [
-    ":omnibox_internal",
-    "//base",
-    "//base/test:test_support",
-    "//components/omnibox/browser:test_support",
-    "//ios/chrome/browser/autocomplete",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/main:test_support",
-    "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/tabs:tabs_internal",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/chrome/test/base:perf_test_support",
-    "//ios/web/public/test/fakes",
-    "//testing/gtest",
-    "//third_party/ocmock",
-    "//ui/base:test_support",
-  ]
-  frameworks = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn
index 62fba53627f..699ecc7c766 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn
@@ -37,8 +37,7 @@ source_set("keyboard_assist") {
     "//ios/chrome/browser/voice",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ui/base",
     "//ui/gfx",
   ]
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
index 12bba23f52f..990407411e9 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
@@ -14,6 +14,17 @@ source_set("infobar_banner") {
   ]
 }
 
+source_set("feature_flags") {
+  sources = [
+    "infobar_banner_features.h",
+    "infobar_banner_features.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [ "//base" ]
+}
+
 source_set("coordinators") {
   sources = [
     "infobar_banner_overlay_coordinator.h",
@@ -23,6 +34,7 @@ source_set("coordinators") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":feature_flags",
     ":mediators",
     "//base",
     "//ios/chrome/browser/overlays",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
index a5dfd2a904c..aa52e436000 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/autofill_address_profile/BUILD.gn
@@ -43,7 +43,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/confirm/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/confirm/BUILD.gn
index 688e4a0e789..2efedd1b113 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/confirm/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/confirm/BUILD.gn
@@ -38,7 +38,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
index 34f76c1e8b9..ee7c03c7ab9 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn
@@ -47,7 +47,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
index 7f7e3dfad5a..dd7c4c725f2 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
@@ -44,7 +44,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
index d50f62b454c..b74cc4d0bc0 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
@@ -57,7 +57,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/translate:test_support",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/banners/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays:coordinators",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/autofill_address_profile/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/autofill_address_profile/BUILD.gn
index d35b511a33e..459b732259c 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/autofill_address_profile/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/autofill_address_profile/BUILD.gn
@@ -50,7 +50,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/ui/autofill:autofill_ui_type",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/modals/autofill_address_profile:modals",
     "//ios/chrome/browser/ui/infobars/modals/test",
     "//ios/chrome/browser/ui/infobars/test",
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 00847bddee1..1172e4c2463 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
@@ -41,7 +41,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords/test",
     "//ios/chrome/browser/passwords/test",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/modals/test",
     "//ios/chrome/browser/ui/infobars/test",
     "//ios/chrome/browser/ui/overlays/test",
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 65f477f88a5..4c201acd97a 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
@@ -50,7 +50,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/ui/autofill:autofill_message",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/modals",
     "//ios/chrome/browser/ui/infobars/modals/test",
     "//ios/chrome/browser/ui/infobars/test",
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 804bdf9795e..6fd92196530 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
@@ -53,7 +53,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/translate:test_support",
-    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
     "//ios/chrome/browser/ui/infobars/modals/test",
     "//ios/chrome/browser/ui/infobars/test",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 53dd83fe88f..067715f1267 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -27,6 +27,7 @@ source_set("overscroll_actions") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/page_info:constants",
     "//ios/chrome/browser/ui/side_swipe",
     "//ios/chrome/browser/ui/toolbar/public",
@@ -34,7 +35,6 @@ source_set("overscroll_actions") {
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/common/ui/colors",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/web/common",
     "//ios/web/public",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index ca19a9884e7..85f2478167f 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -81,12 +81,16 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp_tile_views:constants",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_swift",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/browser/web/font_size",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
new file mode 100644
index 00000000000..f4da6c721f6
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
@@ -0,0 +1,45 @@
+# 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/swift_source_set.gni")
+
+source_set("overflow_menu") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "overflow_menu_mediator.h",
+    "overflow_menu_mediator.mm",
+  ]
+  deps = [
+    ":overflow_menu_swift",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/policy",
+    "//ui/base",
+  ]
+}
+
+swift_source_set("overflow_menu_swift") {
+  sources = [
+    "overflow_menu_action.swift",
+    "overflow_menu_action_list.swift",
+    "overflow_menu_action_row.swift",
+    "overflow_menu_destination.swift",
+    "overflow_menu_model.swift",
+    "overflow_menu_view.swift",
+    "overflow_menu_view_provider.swift",
+  ]
+
+  frameworks = [
+    "Foundation.framework",
+    "SwiftUI.framework",
+  ]
+}
+
+source_set("feature_flags") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "feature_flags.h",
+    "feature_flags.mm",
+  ]
+  deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
index 2cc323d1a9b..292a43f6615 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
@@ -30,9 +30,9 @@ source_set("popup_menu_ui") {
     ":ui_constants",
     "//base",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags",
     "//ios/chrome/browser/ui/popup_menu/public/",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/presenters",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index b362ed42b70..51264f83cc9 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -60,7 +60,6 @@ source_set("reading_list") {
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/side_swipe",
     "//ios/chrome/browser/ui/table_view",
-    "//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/cells",
@@ -257,6 +256,7 @@ source_set("eg2_tests") {
   sources = [ "reading_list_egtest.mm" ]
   deps = [
     ":eg_test_support+eg2",
+    ":features",
     ":reading_list_constants",
     "//base",
     "//base/test:test_support",
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 77130ef4349..125934d5303 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -38,7 +38,6 @@ source_set("recent_tabs") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/table_view",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
@@ -91,11 +90,11 @@ source_set("recent_tabs_ui") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication:signin_presenter",
     "//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/signin:signin_presenter",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
@@ -197,7 +196,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/history:constants",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view:constants",
-    "//ios/chrome/browser/ui/table_view:feature_flags",
     "//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",
diff --git a/chromium/ios/chrome/browser/ui/screen/BUILD.gn b/chromium/ios/chrome/browser/ui/screen/BUILD.gn
new file mode 100644
index 00000000000..9a7c96f1d5f
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/screen/BUILD.gn
@@ -0,0 +1,27 @@
+# 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("screen_provider") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "screen_provider.h",
+    "screen_provider.mm",
+  ]
+  deps = [
+    ":screen_type",
+    "//base",
+    "//ios/chrome/browser/ui:feature_flags",
+  ]
+}
+
+source_set("screen_provider_protected") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "screen_provider+protected.h" ]
+  deps = [ ":screen_provider" ]
+}
+
+source_set("screen_type") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "screen_type.h" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
index 858e23acb86..e14e2c9325e 100644
--- a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn
@@ -12,17 +12,22 @@ source_set("send_tab_to_self") {
     ":send_tab_to_self_ui",
     "//base",
     "//components/send_tab_to_self",
+    "//components/signin/public/identity_manager",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/send_tab_to_self",
+    "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/infobars/presentation",
     "//ios/chrome/browser/ui/util",
+    "//ios/public/provider/chrome/browser/signin",
     "//ios/third_party/material_components_ios",
     "//ui/base",
+    "//url",
   ]
 }
 source_set("send_tab_to_self_ui") {
@@ -30,6 +35,8 @@ source_set("send_tab_to_self_ui") {
   sources = [
     "send_tab_to_self_image_detail_text_item.h",
     "send_tab_to_self_image_detail_text_item.mm",
+    "send_tab_to_self_manage_devices_item.h",
+    "send_tab_to_self_manage_devices_item.mm",
     "send_tab_to_self_modal_delegate.h",
     "send_tab_to_self_modal_positioner.h",
     "send_tab_to_self_modal_presentation_controller.h",
@@ -50,6 +57,7 @@ source_set("send_tab_to_self_ui") {
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
+    "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 27160ea0a17..f4078082a2d 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -97,7 +97,6 @@ source_set("settings") {
     "resources:settings_unsafe_state",
     "resources:settings_voice_search",
     "resources:sync_and_google_services",
-    "resources:sync_and_google_services_sync_error",
     "resources:sync_and_google_services_sync_off",
     "resources:sync_and_google_services_sync_on",
     "//base",
@@ -146,7 +145,9 @@ source_set("settings") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication:signin_presenter",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/signin:signin_headers",
     "//ios/chrome/browser/ui/autofill/cells",
     "//ios/chrome/browser/ui/colors",
@@ -159,6 +160,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/ntp:feature_flags",
     "//ios/chrome/browser/ui/resources:password_key",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/cells",
@@ -168,6 +170,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/default_browser/resources:default_browser_world",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/google_services",
+    "//ios/chrome/browser/ui/settings/google_services/resources:google_services_sync_error",
     "//ios/chrome/browser/ui/settings/language:language",
     "//ios/chrome/browser/ui/settings/language:language_ui",
     "//ios/chrome/browser/ui/settings/password",
@@ -176,7 +179,6 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
-    "//ios/chrome/browser/ui/signin:signin_presenter",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view:utils",
@@ -185,6 +187,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
     "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/browser/voice",
+    "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web:web",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
@@ -195,7 +198,6 @@ source_set("settings") {
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/signin:signin_resources_api",
     "//ios/public/provider/chrome/browser/user_feedback",
-    "//ios/public/provider/chrome/browser/voice",
     "//net",
     "//ui/base",
     "//url",
@@ -275,7 +277,6 @@ 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",
@@ -298,6 +299,7 @@ source_set("unit_tests") {
     "//components/prefs:test_support",
     "//components/search_engines",
     "//components/signin/ios/browser",
+    "//components/signin/public/base",
     "//components/strings",
     "//components/sync/driver:test_support",
     "//components/sync_preferences",
@@ -334,6 +336,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/voice",
+    "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/common",
@@ -341,7 +344,6 @@ source_set("unit_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/web/public/test",
     "//net",
     "//net: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 3a35256be0a..a1d9b5a460f 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -30,6 +30,7 @@ source_set("autofill") {
     "//components/autofill/core/browser",
     "//components/autofill/core/common",
     "//components/autofill/ios/browser",
+    "//components/password_manager/core/common",
     "//components/prefs",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -42,7 +43,7 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/autofill:autofill_ui_type",
     "//ios/chrome/browser/ui/autofill/cells",
-    "//ios/chrome/browser/ui/autofill/form_input_accessory:form_input_accessory_ui",
+    "//ios/chrome/browser/ui/autofill/form_input_accessory:form_input_accessory",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/qr_scanner",
@@ -57,6 +58,7 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:form_input_accessory",
     "//ui/base",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index 902b603fb16..16262102bb4 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -37,7 +37,6 @@ source_set("cells") {
   deps = [
     ":public",
     "//components/autofill/core/browser",
-    "//components/signin/public/base",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui:feature_flags",
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 2ae2e8433f7..5fa9c102994 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
@@ -104,6 +104,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/common",
+    "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
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 305a898e02e..60891b3fcca 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -13,7 +13,6 @@ source_set("google_services") {
     "google_services_settings_coordinator.mm",
     "google_services_settings_mediator.h",
     "google_services_settings_mediator.mm",
-    "google_services_settings_mode.h",
     "google_services_settings_service_delegate.h",
     "google_services_settings_view_controller.h",
     "google_services_settings_view_controller.mm",
@@ -29,7 +28,6 @@ source_set("google_services") {
     "manage_sync_settings_table_view_controller.mm",
     "manage_sync_settings_view_controller_model_delegate.h",
     "sync_error_settings_command_handler.h",
-    "sync_settings_view_state.h",
   ]
   deps = [
     ":constants",
@@ -44,8 +42,6 @@ source_set("google_services") {
     "//components/prefs",
     "//components/safe_browsing/core/common",
     "//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",
     "//components/sync",
@@ -54,6 +50,7 @@ source_set("google_services") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui:feature_flags",
@@ -61,7 +58,7 @@ source_set("google_services") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_constants",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/authentication/signin:signin_headers",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
@@ -77,6 +74,7 @@ source_set("google_services") {
     "//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",
     "//ios/chrome/common/ui/colors",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
@@ -152,6 +150,7 @@ source_set("eg2_tests") {
     "//components/signin/public/base",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
@@ -160,6 +159,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings/google_services:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/chrome/test/earl_grey:switches",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
@@ -196,6 +196,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//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",
diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
index c3a2d28da6b..09b5c57c94f 100644
--- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn
@@ -42,6 +42,7 @@ source_set("language_ui") {
     "language_settings_table_view_controller.mm",
   ]
   deps = [
+    "//components/password_manager/core/common",
     "//components/prefs",
     "//components/translate/core/browser:translate_pref_names",
     "//ios/chrome/app/strings:ios_strings_grit",
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 b48ddccadae..f8c8343a1a1 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
@@ -5,6 +5,12 @@
 source_set("password_details") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "add_password_coordinator.h",
+    "add_password_coordinator.mm",
+    "add_password_coordinator_delegate.h",
+    "add_password_mediator.h",
+    "add_password_mediator.mm",
+    "add_password_mediator_delegate.h",
     "password_details_coordinator.h",
     "password_details_coordinator.mm",
     "password_details_coordinator_delegate.h",
@@ -15,6 +21,7 @@ source_set("password_details") {
     ":password_details_ui",
     "//base",
     "//components/autofill/core/common",
+    "//components/password_manager/core/browser/form_parsing",
     "//components/strings",
     "//components/url_formatter",
     "//ios/chrome/app/strings",
@@ -26,7 +33,6 @@ 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",
@@ -39,6 +45,8 @@ source_set("password_details") {
 source_set("password_details_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "add_password_details_consumer.h",
+    "add_password_handler.h",
     "password_details.h",
     "password_details.mm",
     "password_details_consumer.h",
@@ -69,6 +77,8 @@ source_set("password_details_ui") {
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/password:password_constants",
+    "//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",
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
index d4197580302..2432c5f7b34 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -84,12 +84,10 @@ source_set("unit_tests") {
   testonly = true
   sources = [ "privacy_table_view_controller_unittest.mm" ]
   deps = [
-    "//base/test:test_support",
     "//components/handoff",
     "//components/prefs",
     "//components/prefs/ios",
     "//components/signin/ios/browser:features",
-    "//components/signin/public/base",
     "//components/strings",
     "//components/sync/driver:test_support",
     "//components/sync_preferences",
diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
index 2a27a266480..f37ade521dd 100644
--- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
@@ -160,14 +160,6 @@ imageset("sync_and_google_services") {
   ]
 }
 
-imageset("sync_and_google_services_sync_error") {
-  sources = [
-    "sync_and_google_services_sync_error.imageset/Contents.json",
-    "sync_and_google_services_sync_error.imageset/sync_and_google_services_sync_error@2x.png",
-    "sync_and_google_services_sync_error.imageset/sync_and_google_services_sync_error@3x.png",
-  ]
-}
-
 imageset("sync_and_google_services_sync_off") {
   sources = [
     "sync_and_google_services_sync_off.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
index b66ca6499a0..db15f0e02ea 100644
--- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
@@ -110,7 +110,6 @@ source_set("eg2_tests") {
   sources = [ "sync_encryption_passphrase_table_view_controller_egtest.mm" ]
   deps = [
     "//base/test:test_support",
-    "//components/signin/public/base",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
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 0e66592a172..3ba21e7b5e6 100644
--- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn
@@ -17,7 +17,7 @@ source_set("utils") {
     "//base",
     "//components/browser_sync",
     "//components/infobars/core",
-    "//components/strings",
+    "//components/strings:components_strings_grit",
     "//components/sync",
     "//google_apis",
     "//ios/chrome/app/strings",
@@ -27,6 +27,7 @@ source_set("utils") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/settings/google_services/resources:google_services_sync_error",
     "//ui/base",
     "//ui/gfx",
   ]
@@ -40,8 +41,6 @@ source_set("unit_tests") {
   deps = [
     ":utils",
     "//base",
-    "//base/test:test_support",
-    "//components/signin/public/base",
     "//components/sync/driver",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
diff --git a/chromium/ios/chrome/browser/ui/sharing/BUILD.gn b/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
index 8c513e4f59a..811c6f5fe07 100644
--- a/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
@@ -16,7 +16,6 @@ source_set("sharing") {
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/bookmarks:core",
-    "//ios/chrome/browser/ui/bookmarks:edit",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/qr_generator",
@@ -41,7 +40,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
-    "//ios/chrome/browser/ui/bookmarks:edit",
     "//ios/chrome/browser/ui/bookmarks:test_support",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main:scene_state_header",
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 1a852fd7f92..c8428149cde 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
@@ -29,6 +29,7 @@ source_set("tab_grid") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/commerce:commerce",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/policy:feature_flags",
@@ -43,6 +44,7 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/commerce:price_card",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo",
     "//ios/chrome/browser/ui/gestures",
@@ -137,6 +139,7 @@ source_set("tab_grid_ui") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/transitions",
@@ -202,6 +205,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
     "//ios/chrome/test:block_cleanup_test",
+    "//ios/chrome/test:test_support",
     "//ios/web/common",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
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 5f628860fa8..e5165c4e352 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
@@ -54,10 +54,12 @@ source_set("grid_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/commerce:commerce",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/commerce:price_card",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands",
diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
index 1fb36421ace..2e552299fd1 100644
--- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
@@ -15,7 +15,6 @@ source_set("table_view") {
     "table_view_navigation_controller.mm",
   ]
   deps = [
-    ":feature_flags",
     ":presentation",
     ":styler",
     ":views",
@@ -95,15 +94,6 @@ source_set("views") {
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "feature_flags.h",
-    "feature_flags.mm",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -139,8 +129,5 @@ source_set("utils") {
     "table_view_utils.h",
     "table_view_utils.mm",
   ]
-  deps = [
-    "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/util",
-  ]
+  deps = [ "//ios/chrome/common/ui/util" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
index d243f15d433..a31438039ea 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -85,7 +85,7 @@ source_set("cells_constants") {
   deps = [
     "//base",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui/util",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index cd80adc3d61..02a082409b6 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -54,6 +54,7 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
+    "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/ntp:util",
     "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/ui/popup_menu/public",
@@ -68,7 +69,6 @@ source_set("tabs") {
     "//ios/chrome/common/ui/resources:default_world_favicon",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index 9e9164bbbc6..65bf97a82a7 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -61,8 +61,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ios/web",
   ]
 
@@ -147,8 +146,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
-    "//ios/public/provider/chrome/browser:test_support",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:test_voice_search",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
index f6c07643f98..c704022caad 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
@@ -20,7 +20,6 @@ source_set("public") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/util",
     "//ios/components/ui_util",
-    "//ios/public/provider/chrome/browser/voice",
   ]
   public_deps = [ ":constants" ]
 }
diff --git a/chromium/ios/chrome/browser/url_loading/BUILD.gn b/chromium/ios/chrome/browser/url_loading/BUILD.gn
index e2259c830a4..3cf4eb3b7de 100644
--- a/chromium/ios/chrome/browser/url_loading/BUILD.gn
+++ b/chromium/ios/chrome/browser/url_loading/BUILD.gn
@@ -90,6 +90,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:web_internal",
     "//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 20fada7e842..f9e7921287e 100644
--- a/chromium/ios/chrome/browser/voice/BUILD.gn
+++ b/chromium/ios/chrome/browser/voice/BUILD.gn
@@ -19,18 +19,28 @@ source_set("voice") {
   ]
 
   deps = [
+    ":voice_search_language",
     "//base",
     "//base/ios",
     "//components/pref_registry",
     "//components/prefs",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/voice_search:voice_search_api",
     "//ios/web",
   ]
 }
 
+source_set("voice_search_language") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "voice_search_language.h",
+    "voice_search_language.mm",
+  ]
+}
+
 source_set("prefs") {
   sources = [
+    "voice_search_prefs.cc",
+    "voice_search_prefs.h",
     "voice_search_prefs_registration.cc",
     "voice_search_prefs_registration.h",
   ]
@@ -38,7 +48,6 @@ source_set("prefs") {
   deps = [
     "//components/pref_registry",
     "//components/prefs",
-    "//ios/public/provider/chrome/browser/voice",
   ]
 }
 
@@ -54,13 +63,13 @@ source_set("tts") {
   ]
 
   deps = [
+    ":prefs",
     ":voice",
     "//base",
     "//components/google/core/common",
     "//components/prefs",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/public/provider/chrome/browser/voice",
     "//ios/web",
     "//ios/web/public/deprecated",
     "//net",
@@ -79,8 +88,7 @@ source_set("test_support") {
   deps = [
     ":voice",
     "//base",
-    "//ios/public/provider/chrome/browser:test_support",
-    "//ios/public/provider/chrome/browser/voice:test_support",
+    "//ios/public/provider/chrome/browser/voice_search:test_voice_search",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 1b3602b3b5d..a1de3ca40c5 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -239,9 +239,8 @@ source_set("web_internal") {
     "//ios/components/security_interstitials/lookalikes",
     "//ios/components/webui:url_constants",
     "//ios/net",
-    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:font_size_java_script_feature",
-    "//ios/public/provider/chrome/browser/voice",
+    "//ios/public/provider/chrome/browser/url_rewriters:url_rewriters_api",
     "//ios/web",
     "//ios/web/common",
     "//ios/web/common:user_agent",
@@ -297,6 +296,7 @@ source_set("unit_tests_internal") {
     "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core:unsafe_resource",
     "//components/strings:components_strings_grit",
+    "//components/version_info",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/content_settings:content_settings",
@@ -447,21 +447,6 @@ source_set("eg2_tests") {
   frameworks = [ "UIKit.framework" ]
 }
 
-source_set("perf_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [ "early_page_script_perftest.mm" ]
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/test/base:perf_test_support",
-    "//ios/third_party/webkit",
-    "//ios/web/common:web_view_creation_util",
-    "//ios/web/public/test",
-  ]
-}
-
 source_set("feature_flags") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-02-02 12:21:57 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2022-02-12 08:13:00 +0000
commit	606d85f2a5386472314d39923da28c70c60dc8e7 (patch)
tree	a8f4d7bf997f349f45605e6058259fba0630e4d7 /chromium/ios/chrome/browser
parent	5786336dda477d04fb98483dca1a5426eebde2d7 (diff)
download	qtwebengine-chromium-606d85f2a5386472314d39923da28c70c60dc8e7.tar.gz