BASELINE: Update Chromium to 104.0.5112.120

Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

137 files changed, 1281 insertions, 362 deletions

diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index e711fa5698f..e69dcd5677c 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -237,6 +237,7 @@ source_set("browser_impl") {
     "//ios/chrome/browser/flags",
     "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/https_upgrades",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:accessor",
     "//ios/chrome/browser/metrics:expired_histograms_array",
@@ -253,6 +254,7 @@ source_set("browser_impl") {
     "//ios/chrome/browser/update_client",
     "//ios/chrome/common",
     "//ios/chrome/common/app_group",
+    "//ios/components/security_interstitials/safe_browsing",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/app_distribution:app_distribution_api",
     "//ios/public/provider/chrome/browser/signin:signin_sso_api",
@@ -263,6 +265,7 @@ source_set("browser_impl") {
     "//rlz/buildflags",
     "//services/network:network_service",
     "//ui/base",
+    "//ui/display",
   ]
 
   if (enable_rlz) {
diff --git a/chromium/ios/chrome/browser/app_launcher/BUILD.gn b/chromium/ios/chrome/browser/app_launcher/BUILD.gn
index 491e33ee155..d19a5978a52 100644
--- a/chromium/ios/chrome/browser/app_launcher/BUILD.gn
+++ b/chromium/ios/chrome/browser/app_launcher/BUILD.gn
@@ -30,7 +30,6 @@ source_set("app_launcher") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy_url_blocking",
     "//ios/chrome/browser/policy_url_blocking:util",
     "//ios/chrome/browser/reading_list",
@@ -81,7 +80,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:test_support",
     "//ios/chrome/browser/policy_url_blocking",
     "//ios/chrome/browser/prefs",
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index aef77353f1a..08eca74e865 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -64,6 +64,7 @@ source_set("autofill") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:util_swift",
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:form_input_accessory",
@@ -555,13 +556,14 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/sync:sync",
     "//ios/chrome/browser/ui/autofill",
-    "//ios/chrome/browser/ui/autofill:features",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
+    "//ios/chrome/browser/ui/bubble:features",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/webdata_services",
+    "//ios/chrome/test:test_support",
     "//ios/testing:block_swizzler",
     "//ios/web/public/js_messaging",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
index 881f1150198..b6ae9aa064c 100644
--- a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
-
 source_set("manual_fill") {
   sources = [
     "passwords_fetcher.h",
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 9aeb49c50fb..037bf3bd8ff 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -97,6 +97,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state_metrics",
     "//ios/chrome/browser/browsing_data",
+    "//ios/chrome/browser/commerce:shopping_service",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/credential_provider:buildflags",
diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
index 04f5efdaa5a..c0eb200b932 100644
--- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
@@ -55,13 +55,14 @@ source_set("browsing_data") {
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/external_files",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/https_upgrades",
     "//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",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
@@ -73,6 +74,8 @@ source_set("browsing_data") {
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web/font_size",
     "//ios/chrome/browser/webdata_services",
+    "//ios/components/security_interstitials/https_only_mode",
+    "//ios/components/security_interstitials/safe_browsing",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
     "//ios/web/common:web_view_creation_util",
diff --git a/chromium/ios/chrome/browser/commerce/BUILD.gn b/chromium/ios/chrome/browser/commerce/BUILD.gn
index efa5fb6d3b5..0e226388593 100644
--- a/chromium/ios/chrome/browser/commerce/BUILD.gn
+++ b/chromium/ios/chrome/browser/commerce/BUILD.gn
@@ -38,7 +38,10 @@ static_library("shopping_service") {
     "//base",
     "//components/commerce/core:shopping_service",
     "//components/keyed_service/ios",
+    "//components/prefs",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/optimization_guide",
     "//ios/web",
   ]
 
diff --git a/chromium/ios/chrome/browser/default_browser/BUILD.gn b/chromium/ios/chrome/browser/default_browser/BUILD.gn
new file mode 100644
index 00000000000..1354dd93799
--- /dev/null
+++ b/chromium/ios/chrome/browser/default_browser/BUILD.gn
@@ -0,0 +1,8 @@
+# Copyright 2022 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("default_browser") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "promo_source.h" ]
+}
diff --git a/chromium/ios/chrome/browser/discover_feed/BUILD.gn b/chromium/ios/chrome/browser/discover_feed/BUILD.gn
index 6000519b21d..fb8cb1b8053 100644
--- a/chromium/ios/chrome/browser/discover_feed/BUILD.gn
+++ b/chromium/ios/chrome/browser/discover_feed/BUILD.gn
@@ -18,11 +18,13 @@ source_set("discover_feed") {
     "feed_model_configuration.mm",
   ]
   deps = [
-    "//base",
     "//components/keyed_service/core",
     "//ios/public/provider/chrome/browser/signin:signin_sso_api",
   ]
-  public_deps = [ ":constants" ]
+  public_deps = [
+    ":constants",
+    "//base",
+  ]
   frameworks = [ "UIKit.framework" ]
 }
 
diff --git a/chromium/ios/chrome/browser/download/BUILD.gn b/chromium/ios/chrome/browser/download/BUILD.gn
index ebe592fac7b..48de5de3a36 100644
--- a/chromium/ios/chrome/browser/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/download/BUILD.gn
@@ -99,6 +99,7 @@ source_set("unit_tests") {
     "//ios/web/public",
     "//ios/web/public/download",
     "//ios/web/public/test",
+    "//ios/web/public/test:download_test_utils",
     "//ios/web/public/test/fakes",
     "//net",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/favicon/BUILD.gn b/chromium/ios/chrome/browser/favicon/BUILD.gn
index 3e9412e76ee..193217d05fb 100644
--- a/chromium/ios/chrome/browser/favicon/BUILD.gn
+++ b/chromium/ios/chrome/browser/favicon/BUILD.gn
@@ -21,14 +21,10 @@ source_set("favicon") {
     "large_icon_cache.h",
   ]
   deps = [
-    "//base",
     "//components/favicon/core",
     "//components/favicon/core:history_implementation",
-    "//components/favicon_base",
     "//components/image_fetcher/core",
     "//components/image_fetcher/ios",
-    "//components/keyed_service/core",
-    "//components/keyed_service/ios",
     "//components/resources",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -41,6 +37,12 @@ source_set("favicon") {
     "//ui/base",
     "//url",
   ]
+  public_deps = [
+    "//base",
+    "//components/favicon_base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+  ]
 }
 
 source_set("unit_tests") {
diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
index d933f9170b3..9dbfa46b9eb 100644
--- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
+++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
@@ -77,7 +77,9 @@ source_set("eg2_tests") {
     ":eg_test_support+eg2",
     "//base",
     "//components/feature_engagement/public",
-    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/passwords:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/bubble:features",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn
index ff7135c8987..5f8e97fe822 100644
--- a/chromium/ios/chrome/browser/flags/BUILD.gn
+++ b/chromium/ios/chrome/browser/flags/BUILD.gn
@@ -44,6 +44,7 @@ source_set("flags") {
     "//components/strings:components_strings",
     "//components/sync/driver",
     "//components/translate/core/browser",
+    "//components/translate/core/common",
     "//components/unified_consent",
     "//components/variations",
     "//ios/chrome/app/strings:ios_strings",
@@ -51,13 +52,12 @@ source_set("flags") {
     "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/drag_and_drop",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/policy",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/screen_time:buildflags",
     "//ios/chrome/browser/sessions:features",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/autofill:features",
     "//ios/chrome/browser/ui/bubble:features",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/default_promo:utils",
@@ -65,13 +65,16 @@ source_set("flags") {
     "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/ui/omnibox:features",
     "//ios/chrome/browser/ui/overlays/infobar_banner:feature_flags",
     "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags",
+    "//ios/chrome/browser/ui/popup_menu/public:features",
     "//ios/chrome/browser/ui/start_surface:feature_flags",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid:features",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
     "//ios/chrome/browser/ui/util:features",
     "//ios/chrome/browser/web:feature_flags",
+    "//ios/components/security_interstitials/https_only_mode:feature",
     "//ios/public/provider/chrome/browser/app_utils:app_utils_api",
     "//ios/web/common",
     "//ios/web/common:user_agent",
diff --git a/chromium/ios/chrome/browser/follow/BUILD.gn b/chromium/ios/chrome/browser/follow/BUILD.gn
index 3a8de1db315..d98bf027dca 100644
--- a/chromium/ios/chrome/browser/follow/BUILD.gn
+++ b/chromium/ios/chrome/browser/follow/BUILD.gn
@@ -11,7 +11,6 @@ source_set("follow") {
   ]
   deps = [
     ":rss_link_js",
-    "//base",
     "//ios/chrome/browser/ui/follow",
     "//ios/web/public",
     "//ios/web/public/js_messaging",
@@ -20,6 +19,55 @@ source_set("follow") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("utils") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "follow_util.h",
+    "follow_util.mm",
+  ]
+  deps = [
+    ":enums",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ntp:features",
+    "//ios/chrome/browser/signin",
+    "//ios/web/public",
+    "//url",
+  ]
+}
+
+source_set("enums") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "follow_action_state.h" ]
+  deps = []
+}
+
+source_set("tab_helper") {
+  sources = [
+    "follow_iph_presenter.h",
+    "follow_menu_updater.h",
+    "follow_tab_helper.h",
+    "follow_tab_helper.mm",
+  ]
+  deps = [
+    ":follow",
+    "//base",
+    "//components/feature_engagement/public",
+    "//components/feature_engagement/public",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/follow:enums",
+    "//ios/chrome/browser/follow:utils",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/follow",
+    "//ios/web/public",
+    "//ios/web/public/js_messaging",
+    "//ui/base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 optimize_js("rss_link_js") {
   visibility = [ ":follow" ]
 
diff --git a/chromium/ios/chrome/browser/https_upgrades/BUILD.gn b/chromium/ios/chrome/browser/https_upgrades/BUILD.gn
new file mode 100644
index 00000000000..367978568c5
--- /dev/null
+++ b/chromium/ios/chrome/browser/https_upgrades/BUILD.gn
@@ -0,0 +1,136 @@
+# Copyright 2022 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("https_upgrades") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "https_only_mode_upgrade_tab_helper.h",
+    "https_only_mode_upgrade_tab_helper.mm",
+    "https_upgrade_service_factory.h",
+    "https_upgrade_service_factory.mm",
+    "https_upgrade_service_impl.h",
+    "https_upgrade_service_impl.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/prefs:prefs",
+    "//components/security_interstitials/core",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings:content_settings",
+    "//ios/chrome/browser/prerender",
+    "//ios/components/security_interstitials",
+    "//ios/components/security_interstitials/https_only_mode",
+    "//ios/components/security_interstitials/https_only_mode:feature",
+    "//ios/web/public:public",
+    "//ios/web/public/navigation",
+    "//net",
+    "//services/metrics/public/cpp:metrics_cpp",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "https_only_mode_upgrade_tab_helper_unittest.mm" ]
+  deps = [
+    ":https_upgrades",
+    "//base/test:test_support",
+    "//components/keyed_service/ios",
+    "//components/prefs:test_support",
+    "//components/security_interstitials/core",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/prerender",
+    "//ios/chrome/browser/prerender:test_support",
+    "//ios/components/security_interstitials/https_only_mode",
+    "//ios/components/security_interstitials/https_only_mode:test_util",
+    "//ios/web/public",
+    "//ios/web/public/test",
+    "//net",
+    "//services/metrics/public/cpp:metrics_cpp",
+    "//testing/gtest",
+  ]
+}
+
+source_set("eg_test_support+eg2") {
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+
+  sources = [
+    "https_only_mode_app_interface.h",
+    "https_only_mode_app_interface_stub.mm",
+  ]
+
+  deps = [
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+  ]
+}
+
+source_set("eg_app_support+eg2") {
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+
+  sources = [
+    "https_only_mode_app_interface.h",
+    "https_only_mode_app_interface.mm",
+  ]
+
+  deps = [
+    ":https_upgrades",
+    "//base",
+    "//components/content_settings/core/browser",
+    "//components/lookalikes/core",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings",
+    "//ios/chrome/test/app:test_support",
+    "//ios/components/security_interstitials/https_only_mode",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/third_party/earl_grey2:app_framework+link",
+    "//ios/web/public",
+    "//net",
+  ]
+}
+
+source_set("eg2_tests") {
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+
+  sources = [ "https_only_mode_egtest.mm" ]
+
+  deps = [
+    ":eg_test_support+eg2",
+    "//components/content_settings/core/common",
+    "//components/security_interstitials/core",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/metrics:eg_test_support+eg2",
+    "//ios/chrome/test:eg_test_support+eg2",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/components/security_interstitials/https_only_mode:feature",
+    "//ios/net:test_support",
+    "//ios/testing:embedded_test_server_support",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/common:features",
+    "//ios/web/public/test:element_selector",
+    "//ios/web/public/test/http_server",
+    "//net:test_support",
+    "//ui/base",
+    "//url",
+  ]
+
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/language/BUILD.gn b/chromium/ios/chrome/browser/language/BUILD.gn
index 88818de53e7..37ff96f41b4 100644
--- a/chromium/ios/chrome/browser/language/BUILD.gn
+++ b/chromium/ios/chrome/browser/language/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("language") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "accept_languages_service_factory.cc",
+    "accept_languages_service_factory.h",
     "language_model_manager_factory.h",
     "language_model_manager_factory.mm",
     "url_language_histogram_factory.cc",
diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn
index b3b3c340960..c4c732d9b43 100644
--- a/chromium/ios/chrome/browser/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/main/BUILD.gn
@@ -59,9 +59,11 @@ source_set("main") {
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/sync:sync_error_browser_agent",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/start_surface",
+    "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:delegate",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index 22f82c45d94..112a1449bd1 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -45,6 +45,8 @@ source_set("metrics") {
     "ios_chrome_metrics_service_client.mm",
     "ios_chrome_metrics_services_manager_client.h",
     "ios_chrome_metrics_services_manager_client.mm",
+    "ios_chrome_signin_and_sync_status_metrics_provider.h",
+    "ios_chrome_signin_and_sync_status_metrics_provider.mm",
     "ios_chrome_stability_metrics_provider.h",
     "ios_chrome_stability_metrics_provider.mm",
     "ios_profile_session_durations_service.h",
diff --git a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn
index 89622f65fef..be8c2d6b9af 100644
--- a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn
+++ b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn
@@ -26,6 +26,7 @@ source_set("ntp_tiles") {
     "//ios/chrome/browser/json_parser",
     "//ios/chrome/browser/search_engines",
     "//ios/web",
+    "//services/data_decoder/public/cpp",
     "//services/network/public/cpp",
   ]
 }
@@ -39,6 +40,7 @@ source_set("eg2_tests") {
   sources = [ "ntp_tiles_egtest.mm" ]
   deps = [
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
index 71553598ce6..30279adaf56 100644
--- a/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
+++ b/chromium/ios/chrome/browser/optimization_guide/BUILD.gn
@@ -20,6 +20,7 @@ source_set("optimization_guide") {
   ]
   deps = [
     "//base",
+    "//components/component_updater",
     "//components/download/public/background_service:public",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
@@ -27,6 +28,8 @@ source_set("optimization_guide") {
     "//components/optimization_guide/core",
     "//components/optimization_guide/core:prediction",
     "//components/optimization_guide/proto:optimization_guide_proto",
+    "//components/prefs",
+    "//components/variations",
     "//ios/chrome/browser:application_context",
     "//ios/chrome/browser:chrome_paths",
     "//ios/chrome/browser/browser_state",
@@ -67,6 +70,7 @@ source_set("unit_tests") {
     ":optimization_guide",
     ":resources_unit_tests",
     "//base/test:test_support",
+    "//components/component_updater",
     "//components/download/internal/background_service/ios:background_service",
     "//components/optimization_guide/core",
     "//components/optimization_guide/core:test_support",
@@ -77,11 +81,13 @@ source_set("unit_tests") {
     "//components/unified_consent",
     "//components/variations",
     "//components/variations:test_support",
+    "//ios/chrome/browser:application_context",
     "//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/chrome/test:test_support",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net:test_support",
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index db62c74d340..0b37491e192 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
-
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -83,7 +81,6 @@ source_set("passwords") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
-    "//ios/chrome/browser/ui/elements:selector_coordinator",
     "//ios/chrome/browser/ui/infobars/coordinators",
     "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/util",
@@ -199,6 +196,7 @@ source_set("unit_tests") {
     "ios_chrome_password_manager_client_unittest.mm",
     "password_controller_js_unittest.mm",
     "password_controller_unittest.mm",
+    "password_tab_helper_unittest.mm",
     "well_known_change_password_tab_helper_unittest.mm",
   ]
   deps = [
diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn
index 8d878e1dd52..f5629646104 100644
--- a/chromium/ios/chrome/browser/policy/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/BUILD.gn
@@ -62,11 +62,11 @@ source_set("policy") {
     "//components/autofill/core/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/managed",
+    "//components/component_updater",
     "//components/enterprise",
     "//components/history/core/common",
     "//components/keyed_service/ios",
     "//components/metrics",
-    "//components/optimization_guide/core",
     "//components/password_manager/core/common",
     "//components/policy:generated",
     "//components/policy/core/common",
@@ -96,10 +96,7 @@ source_set("policy") {
     "//url",
   ]
 
-  public_deps = [
-    ":feature_flags",
-    "//components/policy/core/browser",
-  ]
+  public_deps = [ "//components/policy/core/browser" ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
@@ -111,28 +108,12 @@ source_set("policy_util") {
     "policy_util.mm",
   ]
   deps = [
-    ":feature_flags",
     "//base",
     "//components/prefs",
     "//ios/chrome/browser:pref_names",
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "policy_features.cc",
-    "policy_features.h",
-  ]
-  deps = [
-    "//base",
-    "//components/version_info",
-    "//ios/chrome/browser:utils",
-    "//ios/chrome/common",
-    "//ios/web/common:features",
-  ]
-}
-
 source_set("test_support") {
   testonly = true
   sources = [
diff --git a/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn b/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn
index 618020bbfaa..a8b53d07dcd 100644
--- a/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy_url_blocking/BUILD.gn
@@ -47,7 +47,6 @@ source_set("eg2_tests") {
     "//components/policy:generated",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/policy:eg_test_support+eg2",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index 30c9e2c447f..cfcbb33d387 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -20,7 +20,6 @@ source_set("prefs") {
     "//components/search_engines",
     "//components/sync_preferences",
     "//ios/chrome/browser",
-    "//ios/chrome/browser/policy:feature_flags",
   ]
 }
 
@@ -82,6 +81,7 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/signin",
     "//ios/chrome/browser/ui/bookmarks:constants",
diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn
index e96a1486f1c..2cf02357756 100644
--- a/chromium/ios/chrome/browser/providers/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/BUILD.gn
@@ -47,6 +47,7 @@ group("chromium_providers") {
     "//ios/chrome/browser/providers/omaha:chromium_omaha",
     "//ios/chrome/browser/providers/overrides:chromium_overrides",
     "//ios/chrome/browser/providers/password_auto_fill:chromium_password_auto_fill",
+    "//ios/chrome/browser/providers/push_notification:chromium_push_notification",
     "//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",
diff --git a/chromium/ios/chrome/browser/providers/lens/BUILD.gn b/chromium/ios/chrome/browser/providers/lens/BUILD.gn
index 8e1be98e3dd..c3a2f017b0c 100644
--- a/chromium/ios/chrome/browser/providers/lens/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/lens/BUILD.gn
@@ -5,5 +5,8 @@
 source_set("chromium_lens") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [ "chromium_lens.mm" ]
-  deps = [ "//ios/public/provider/chrome/browser/lens:lens_api" ]
+  deps = [
+    "//base",
+    "//ios/public/provider/chrome/browser/lens:lens_api",
+  ]
 }
diff --git a/chromium/ios/chrome/browser/providers/push_notification/BUILD.gn b/chromium/ios/chrome/browser/providers/push_notification/BUILD.gn
new file mode 100644
index 00000000000..66abdc65ea6
--- /dev/null
+++ b/chromium/ios/chrome/browser/providers/push_notification/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2022 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_push_notification") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "chromium_push_notification.mm" ]
+  deps = [ "//ios/public/provider/chrome/browser/push_notification:push_notification_api" ]
+}
diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
index b545e08d521..eba8507b3c9 100644
--- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
@@ -19,20 +19,12 @@ source_set("safe_browsing") {
     "real_time_url_lookup_service_factory.mm",
     "safe_browsing_blocking_page.h",
     "safe_browsing_blocking_page.mm",
+    "safe_browsing_client_factory.h",
     "safe_browsing_client_factory.mm",
     "safe_browsing_client_impl.h",
     "safe_browsing_client_impl.mm",
     "safe_browsing_metrics_collector_factory.h",
     "safe_browsing_metrics_collector_factory.mm",
-    "safe_browsing_query_manager.h",
-    "safe_browsing_query_manager.mm",
-    "safe_browsing_service.h",
-    "safe_browsing_service_impl.h",
-    "safe_browsing_service_impl.mm",
-    "safe_browsing_tab_helper.h",
-    "safe_browsing_tab_helper.mm",
-    "url_checker_delegate_impl.h",
-    "url_checker_delegate_impl.mm",
     "user_population_helper.h",
     "user_population_helper.mm",
     "verdict_cache_manager_factory.h",
@@ -51,9 +43,6 @@ source_set("safe_browsing") {
     "//components/safe_browsing/core/browser",
     "//components/safe_browsing/core/browser:safe_browsing_metrics_collector",
     "//components/safe_browsing/core/browser:verdict_cache_manager",
-    "//components/safe_browsing/core/browser/db",
-    "//components/safe_browsing/core/browser/db:database_manager",
-    "//components/safe_browsing/core/browser/db:v4_local_database_manager",
     "//components/safe_browsing/core/browser/db:v4_protocol_manager_util",
     "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util",
     "//components/safe_browsing/core/browser/realtime:url_lookup_service",
@@ -66,10 +55,7 @@ source_set("safe_browsing") {
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
     "//components/strings:components_strings_grit",
-    "//components/sync/base",
-    "//components/sync/protocol",
     "//components/sync_user_events",
-    "//components/unified_consent",
     "//components/variations/service",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -81,20 +67,14 @@ source_set("safe_browsing") {
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
-    "//ios/components/cookie_util",
     "//ios/components/security_interstitials",
     "//ios/components/security_interstitials/safe_browsing",
     "//ios/components/security_interstitials/safe_browsing:util",
-    "//ios/net",
     "//ios/web/common:user_agent",
     "//ios/web/public",
     "//ios/web/public/init",
     "//ios/web/public/js_messaging",
-    "//mojo/public/cpp/bindings",
     "//net",
-    "//services/network:network_service",
-    "//services/network/public/cpp",
-    "//services/network/public/mojom",
     "//ui/base",
   ]
 
@@ -122,29 +102,6 @@ source_set("features") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("test_support") {
-  testonly = true
-  sources = [
-    "fake_safe_browsing_client.h",
-    "fake_safe_browsing_client.mm",
-    "fake_safe_browsing_service.h",
-    "fake_safe_browsing_service.mm",
-  ]
-
-  deps = [
-    ":safe_browsing",
-    "//components/safe_browsing/core/browser",
-    "//components/safe_browsing/core/browser/db:test_database_manager",
-    "//ios/components/security_interstitials/safe_browsing",
-    "//ios/web/public",
-    "//services/network:test_support",
-    "//services/network/public/cpp",
-    "//services/network/public/mojom",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("eg2_tests") {
   configs += [
     "//build/config/compiler:enable_arc",
@@ -185,19 +142,13 @@ source_set("unit_tests") {
     "safe_browsing_blocking_page_unittest.mm",
     "safe_browsing_client_factory_unittest.mm",
     "safe_browsing_client_impl_unittest.mm",
-    "safe_browsing_query_manager_unittest.mm",
-    "safe_browsing_service_unittest.mm",
-    "safe_browsing_tab_helper_unittest.mm",
-    "url_checker_delegate_impl_unittest.mm",
     "verdict_cache_manager_factory_unittest.mm",
   ]
 
   deps = [
     ":safe_browsing",
-    ":test_support",
     "//base",
     "//base/test:test_support",
-    "//components/content_settings/core/browser",
     "//components/keyed_service/core",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/browser:test_support",
@@ -205,17 +156,10 @@ source_set("unit_tests") {
     "//components/safe_browsing/core/browser",
     "//components/safe_browsing/core/browser:token_fetcher",
     "//components/safe_browsing/core/browser:verdict_cache_manager",
-    "//components/safe_browsing/core/browser/db",
-    "//components/safe_browsing/core/browser/db:database_manager",
-    "//components/safe_browsing/core/browser/db:metadata_proto",
-    "//components/safe_browsing/core/browser/db:util",
-    "//components/safe_browsing/core/browser/db:v4_database",
-    "//components/safe_browsing/core/browser/db:v4_get_hash_protocol_manager",
-    "//components/safe_browsing/core/browser/db:v4_protocol_manager_util",
-    "//components/safe_browsing/core/browser/db:v4_test_util",
     "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util",
     "//components/safe_browsing/core/browser/realtime:url_lookup_service",
     "//components/safe_browsing/core/common",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/safe_browsing/core/common/proto:realtimeapi_proto",
     "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
@@ -223,9 +167,6 @@ source_set("unit_tests") {
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager:test_support",
     "//components/strings:components_strings_grit",
-    "//components/sync/protocol",
-    "//components/sync_preferences",
-    "//components/sync_preferences:test_support",
     "//components/sync_user_events:test_support",
     "//components/unified_consent",
     "//ios/chrome/browser/browser_state:test_support",
@@ -236,12 +177,10 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/test:test_support",
     "//ios/components/security_interstitials/safe_browsing",
+    "//ios/components/security_interstitials/safe_browsing:test_support",
     "//ios/web/public",
     "//ios/web/public/test",
     "//net:test_support",
-    "//net/traffic_annotation:test_support",
-    "//services/network/public/cpp",
-    "//services/network/public/mojom",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/segmentation_platform/BUILD.gn b/chromium/ios/chrome/browser/segmentation_platform/BUILD.gn
new file mode 100644
index 00000000000..d8bdaad8a4b
--- /dev/null
+++ b/chromium/ios/chrome/browser/segmentation_platform/BUILD.gn
@@ -0,0 +1,60 @@
+# Copyright 2022 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("//components/optimization_guide/features.gni")
+
+source_set("segmentation_platform") {
+  sources = [
+    "model_provider_factory_impl.h",
+    "model_provider_factory_impl.mm",
+    "segmentation_platform_service_factory.h",
+    "segmentation_platform_service_factory.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/leveldb_proto",
+    "//components/optimization_guide/core",
+    "//components/optimization_guide/core:features",
+    "//components/prefs",
+    "//components/segmentation_platform/internal",
+    "//components/segmentation_platform/internal/proto",
+    "//components/segmentation_platform/public",
+    "//components/segmentation_platform/public/proto",
+    "//components/variations",
+    "//ios/chrome/browser:application_context",
+    "//ios/chrome/browser:chrome_paths",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/history",
+    "//ios/chrome/browser/optimization_guide",
+  ]
+  if (build_with_tflite_lib) {
+    deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
+  }
+  configs += [ "//build/config/compiler:enable_arc" ]
+  frameworks = [ "Foundation.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "segmentation_platform_service_factory_unittest.mm" ]
+  deps = [
+    ":segmentation_platform",
+    "//base/test:test_support",
+    "//components/optimization_guide/core",
+    "//components/optimization_guide/core:features",
+    "//components/segmentation_platform/internal/proto",
+    "//components/segmentation_platform/public",
+    "//components/segmentation_platform/public/proto",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/prefs:browser_prefs",
+    "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
index abf430e29c8..0bfbda977fe 100644
--- a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
+++ b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
@@ -9,8 +9,6 @@ source_set("send_tab_to_self") {
     "ios_send_tab_to_self_infobar_delegate.mm",
     "send_tab_to_self_browser_agent.h",
     "send_tab_to_self_browser_agent.mm",
-    "send_tab_to_self_util.h",
-    "send_tab_to_self_util.mm",
   ]
   deps = [
     "//base",
@@ -43,10 +41,7 @@ source_set("send_tab_to_self") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [
-    "send_tab_to_self_browser_agent_unittest.mm",
-    "send_tab_to_self_util_unittest.mm",
-  ]
+  sources = [ "send_tab_to_self_browser_agent_unittest.mm" ]
   deps = [
     ":send_tab_to_self",
     "//base",
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 1161b98fe74..0f357a3943a 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -40,8 +40,6 @@ source_set("signin") {
     "identity_manager_factory_observer.h",
     "ios_chrome_signin_client.h",
     "ios_chrome_signin_client.mm",
-    "ios_chrome_signin_status_metrics_provider_delegate.h",
-    "ios_chrome_signin_status_metrics_provider_delegate.mm",
     "pattern_account_restriction.h",
     "pattern_account_restriction.mm",
     "resized_avatar_cache.h",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index 4d9d7c587e9..501c8cec14b 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -107,6 +107,25 @@ source_set("sync") {
   ]
 }
 
+source_set("sync_error_browser_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "sync_error_browser_agent.h",
+    "sync_error_browser_agent.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication:signin_presenter",
+    "//ios/chrome/browser/ui/settings/sync/utils",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
 source_set("test_support") {
   testonly = true
   sources = [
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 4bda9a21e8b..4c3ce7ad754 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -43,6 +43,7 @@ source_set("tabs_internal") {
     "//base",
     "//components/autofill/ios/form_util",
     "//components/breadcrumbs/core:feature_flags",
+    "//components/commerce/ios/browser",
     "//components/favicon/core",
     "//components/favicon/ios",
     "//components/history/core/browser",
@@ -58,14 +59,17 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/autofill:autofill_internal",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/commerce",
+    "//ios/chrome/browser/commerce:shopping_service",
     "//ios/chrome/browser/complex_tasks",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/follow:tab_helper",
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/history:tab_helper",
+    "//ios/chrome/browser/https_upgrades",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:badge",
     "//ios/chrome/browser/infobars/overlays",
@@ -75,11 +79,11 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/ntp",
+    "//ios/chrome/browser/ntp:features",
     "//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",
     "//ios/chrome/browser/policy_url_blocking",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/safe_browsing",
diff --git a/chromium/ios/chrome/browser/tabs_search/BUILD.gn b/chromium/ios/chrome/browser/tabs_search/BUILD.gn
index d3d75a2d59e..f2ff73f7930 100644
--- a/chromium/ios/chrome/browser/tabs_search/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs_search/BUILD.gn
@@ -42,7 +42,11 @@ source_set("tabs_search_factory") {
     "//base",
     "//components/keyed_service/ios",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/history",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn
index c2f4ffe66a5..4840b3e088d 100644
--- a/chromium/ios/chrome/browser/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/translate/BUILD.gn
@@ -21,11 +21,13 @@ source_set("translate") {
   sources = [
     "chrome_ios_translate_client.h",
     "chrome_ios_translate_client.mm",
+    "language_detection_model_service_factory.h",
+    "language_detection_model_service_factory.mm",
     "language_selection_context.h",
     "language_selection_context.mm",
-    "translate_accept_languages_factory.cc",
-    "translate_accept_languages_factory.h",
     "translate_infobar_tags.h",
+    "translate_model_service_factory.h",
+    "translate_model_service_factory.mm",
     "translate_ranker_factory.h",
     "translate_ranker_factory.mm",
     "translate_ranker_metrics_provider.h",
@@ -41,10 +43,13 @@ source_set("translate") {
     "//components/keyed_service/ios",
     "//components/language/core/browser",
     "//components/metrics",
+    "//components/optimization_guide/core:features",
     "//components/prefs",
     "//components/strings",
     "//components/translate/core/browser",
+    "//components/translate/core/browser:translate_model_service",
     "//components/translate/core/common",
+    "//components/translate/core/language_detection",
     "//components/translate/ios/browser",
     "//components/web_resource",
     "//ios/chrome/app/strings",
@@ -54,6 +59,7 @@ source_set("translate") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/language",
+    "//ios/chrome/browser/optimization_guide",
     "//ios/chrome/browser/ui/util",
     "//ios/components/webui:url_constants",
     "//third_party/metrics_proto",
@@ -69,21 +75,29 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "chrome_ios_translate_client_unittest.mm",
     "language_detection_javascript_unittest.mm",
     "translate_service_ios_unittest.cc",
   ]
   deps = [
     ":public",
     ":translate",
+    ":unit_tests_bundle_data",
     "//base",
     "//base/test:test_support",
     "//components/language/core/browser",
-    "//components/translate/core/browser:test_support",
+    "//components/language/ios/browser",
+    "//components/translate/core/browser",
+    "//components/translate/core/common",
+    "//components/translate/core/language_detection",
     "//components/translate/ios/browser",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/language",
+    "//ios/chrome/browser/optimization_guide",
     "//ios/chrome/browser/web:web_internal",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/web/public",
     "//ios/web/public/test:test",
     "//ios/web/public/test:util",
@@ -152,3 +166,11 @@ source_set("eg_test_support+eg2") {
     "//ios/third_party/earl_grey2:test_lib",
   ]
 }
+
+bundle_data("unit_tests_bundle_data") {
+  visibility = [ ":unit_tests" ]
+  testonly = true
+  sources = [ "//components/test/data/translate/valid_model.tflite" ]
+  outputs = [ "{{bundle_resources_dir}}/" +
+              "{{source_root_relative_dir}}/{{source_file_part}}" ]
+}
diff --git a/chromium/ios/chrome/browser/u2f/BUILD.gn b/chromium/ios/chrome/browser/u2f/BUILD.gn
index 9b0dd70c48c..4dc6136afbe 100644
--- a/chromium/ios/chrome/browser/u2f/BUILD.gn
+++ b/chromium/ios/chrome/browser/u2f/BUILD.gn
@@ -31,6 +31,7 @@ source_set("u2f_internal") {
     "//ios/chrome/common",
     "//ios/web/public",
     "//ios/web/public/deprecated",
+    "//ios/web/public/js_messaging",
     "//net",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index bddbd1630f3..9980d20a138 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -44,6 +44,7 @@ source_set("activity_services") {
     "//ios/chrome/browser/ui/util:url_with_title",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/js_messaging",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
index a9289b2c39b..8391f165405 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
@@ -38,11 +38,11 @@ source_set("activities") {
     "//components/bookmarks/common",
     "//components/prefs",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/ui/activity_services/data",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/popup_menu/public:features",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
     "//ios/web/common:user_agent",
@@ -76,7 +76,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/main:test_support",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/ui/activity_services/data",
     "//ios/chrome/browser/ui/bookmarks:test_support",
     "//ios/chrome/browser/ui/commands",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn
index bfa4656f871..2299b741235 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn
@@ -23,10 +23,11 @@ source_set("data") {
   ]
   deps = [
     "//base",
+    "//components/send_tab_to_self",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/find_in_page",
-    "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/util:url_with_title",
     "//ios/chrome/common/ui/util:image_util",
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index be162a5955e..759e8616d86 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -33,6 +33,7 @@ source_set("authentication") {
     "unified_consent",
     "//components/consent_auditor",
     "//components/infobars/core",
+    "//components/policy/core/common",
     "//components/prefs",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
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
index 250d7e081c8..ea73680b6a9 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn
@@ -37,6 +37,7 @@ source_set("eg2_tests") {
     "//base/test:test_support",
     "//components/policy:policy_code_generate",
     "//components/policy/core/common:common_constants",
+    "//components/signin/ios/browser:features",
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser:pref_names",
@@ -49,7 +50,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/first_run:constants",
     "//ios/chrome/browser/ui/first_run:eg_test_support+eg2",
     "//ios/chrome/browser/ui/settings/google_services:constants",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/public/provider/chrome/browser/signin:constants",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
index 3797e41c980..9b340f36243 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn
@@ -35,7 +35,6 @@ source_set("signin_sync") {
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
     "//ios/chrome/browser/ui/first_run:utils",
@@ -62,15 +61,16 @@ source_set("signin_sync_ui") {
     "//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:field_trial",
     "//ios/chrome/browser/ui/settings/elements:constants",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//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",
   ]
 }
 
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 33a9d9ae314..35e10c4c447 100644
--- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
@@ -48,7 +48,7 @@ source_set("unified_consent_ui") {
     "//ios/chrome/browser/ui/authentication/views",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ui/base",
@@ -82,7 +82,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/unified_consent",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/test: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/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index 238a7d109ae..4b042daf752 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -237,12 +237,3 @@ source_set("eg_test_support+eg2") {
     "//ios/third_party/earl_grey2:test_lib",
   ]
 }
-
-source_set("features") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "features.cc",
-    "features.h",
-  ]
-  public_deps = [ "//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 c1a3e2f5c38..dcd667a359b 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
@@ -26,7 +26,7 @@ source_set("form_input_accessory") {
     "//components/password_manager/ios",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/application_delegate:app_state_header",
-    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser/autofill:autofill",
     "//ios/chrome/browser/autofill:autofill_shared",
     "//ios/chrome/browser/autofill/manual_fill",
@@ -36,14 +36,18 @@ source_set("form_input_accessory") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/autofill:features",
     "//ios/chrome/browser/ui/autofill/manual_fill",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
+    "//ios/chrome/browser/ui/autofill/resources:password_suggestion_icon",
+    "//ios/chrome/browser/ui/bubble",
+    "//ios/chrome/browser/ui/bubble:features",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo:utils",
+    "//ios/chrome/browser/ui/main:layout_guide_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:util_swift",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/elements:form_input_accessory",
     "//ios/chrome/common/ui/reauthentication",
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 1c7b41690e6..784e0810d88 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
-
 source_set("manual_fill") {
   sources = [
     "address_coordinator.h",
diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
index 080fb32f099..e4f6e67864a 100644
--- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
@@ -30,6 +30,9 @@ source_set("util") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ui/base",
   ]
 }
@@ -76,8 +79,8 @@ 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/resources:infobar_permissions_camera",
-    "//ios/chrome/browser/ui/infobars/resources:infobar_permissions_camera_fill",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//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",
@@ -120,6 +123,8 @@ 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/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index efad6060022..3336bbce396 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -55,7 +55,6 @@ source_set("bookmarks") {
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
index 982251656f2..5067fc8c71c 100644
--- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -11,8 +11,6 @@ source_set("browser_view") {
     "browser_view_controller+private.h",
     "browser_view_controller.h",
     "browser_view_controller.mm",
-    "browser_view_controller_dependency_factory.h",
-    "browser_view_controller_dependency_factory.mm",
     "browser_view_controller_helper.h",
     "browser_view_controller_helper.mm",
     "common_tab_helper_delegate.h",
@@ -31,6 +29,7 @@ source_set("browser_view") {
     "//components/omnibox/browser",
     "//components/profile_metrics",
     "//components/reading_list/core",
+    "//components/safe_browsing/core/common",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
@@ -53,6 +52,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/follow:tab_helper",
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/language",
@@ -62,6 +62,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/net",
     "//ios/chrome/browser/ntp",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/open_in",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
@@ -78,6 +79,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/store_kit",
+    "//ios/chrome/browser/sync:sync_error_browser_agent",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
@@ -111,6 +113,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/follow",
     "//ios/chrome/browser/ui/follow:first_follow",
+    "//ios/chrome/browser/ui/follow:follow_iph",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:ui",
@@ -121,7 +124,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui",
     "//ios/chrome/browser/ui/infobars:public",
     "//ios/chrome/browser/ui/keyboard",
-    "//ios/chrome/browser/ui/lens:lens_coordinator",
+    "//ios/chrome/browser/ui/lens:coordinator",
     "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
     "//ios/chrome/browser/ui/main:default_browser_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
@@ -148,6 +151,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/sad_tab",
     "//ios/chrome/browser/ui/sad_tab:coordinator",
+    "//ios/chrome/browser/ui/safe_browsing",
     "//ios/chrome/browser/ui/send_tab_to_self",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/sync/utils",
@@ -249,17 +253,22 @@ source_set("unit_tests") {
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/prerender",
+    "//ios/chrome/browser/prerender:test_support",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/sync:sync_error_browser_agent",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/browser_container:ui",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/download",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:internal",
@@ -267,6 +276,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/sharing",
+    "//ios/chrome/browser/ui/tab_switcher/tab_strip",
+    "//ios/chrome/browser/ui/tabs:coordinator",
+    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
index ac64b3d730a..cf5d5744c38 100644
--- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
@@ -27,6 +27,7 @@ source_set("bubble") {
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
index 423eb9709dc..6b1f8372335 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -21,7 +21,6 @@ source_set("commands") {
     "generate_qr_code_command.h",
     "generate_qr_code_command.mm",
     "help_commands.h",
-    "infobar_commands.h",
     "lens_commands.h",
     "load_query_commands.h",
     "new_tab_page_commands.h",
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 6b28763be77..f22ac7e7fb2 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -183,6 +183,7 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
@@ -219,6 +220,7 @@ source_set("content_suggestions_ui_util") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/location_bar:constants",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/start_surface:feature_flags",
@@ -322,6 +324,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
     "//ios/chrome/browser/ui/ntp:constants",
     "//ios/chrome/browser/ui/ntp:feature_flags",
@@ -331,6 +334,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/toolbar/public:constants",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
     "//net:test_support",
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 0a1cb04f556..8c55420fcf4 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
@@ -7,6 +7,8 @@ source_set("cells") {
     "content_suggestions_gesture_commands.h",
     "content_suggestions_header_item.h",
     "content_suggestions_header_item.mm",
+    "content_suggestions_module_container.h",
+    "content_suggestions_module_container.mm",
     "content_suggestions_most_visited_action_cell.h",
     "content_suggestions_most_visited_action_cell.mm",
     "content_suggestions_most_visited_action_item.h",
@@ -56,11 +58,15 @@ source_set("cells") {
     "//ios/chrome/browser/ui/content_suggestions:constants",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:public",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
+    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
+    "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/table_view:cells_constants",
@@ -85,6 +91,7 @@ source_set("constants") {
 
   deps = [
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/third_party/material_components_ios",
     "//ui/base:base",
   ]
@@ -94,7 +101,6 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "content_suggestions_header_item_unittest.mm",
-    "content_suggestions_most_visited_item_unittest.mm",
     "content_suggestions_tile_layout_util_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
index 544bfe15326..199c6b2a805 100644
--- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn
@@ -12,6 +12,7 @@ source_set("context_menu") {
     ":context_menu_ui",
     "//base",
     "//components/search_engines",
+    "//components/url_param_filter/core",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
@@ -34,6 +35,7 @@ source_set("context_menu") {
     "//ios/chrome/browser/web/image_fetch",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/favicon:favicon_constants",
+    "//ios/public/provider/chrome/browser/context_menu:context_menu_api",
     "//ios/public/provider/chrome/browser/lens:lens_api",
     "//ios/web/common",
     "//ios/web/common:features",
@@ -47,12 +49,6 @@ source_set("context_menu_ui") {
   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",
@@ -94,6 +90,8 @@ source_set("eg2_tests") {
     "//base",
     "//base/test:test_support",
     "//components/strings",
+    "//components/url_param_filter/core",
+    "//components/url_param_filter/core:test_support",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/fullscreen/test:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn
index ff29b6191f0..76cccf05bae 100644
--- a/chromium/ios/chrome/browser/ui/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn
@@ -19,6 +19,8 @@ source_set("download") {
     "download_manager_state_view.mm",
     "download_manager_view_controller.h",
     "download_manager_view_controller.mm",
+    "legacy_download_manager_state_view.h",
+    "legacy_download_manager_state_view.mm",
     "pass_kit_coordinator.h",
     "pass_kit_coordinator.mm",
     "radial_progress_view.h",
@@ -51,6 +53,8 @@ source_set("download") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/download/activities",
+    "//ios/chrome/browser/ui/icons:download_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:web_internal",
diff --git a/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn
index 3370d37b56c..db78e3422f7 100644
--- a/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn
@@ -14,6 +14,8 @@ source_set("activities") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons:download_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
index 8a92b8d996c..3d3a2ff1771 100644
--- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
@@ -15,11 +15,6 @@ source_set("elements") {
     "home_waiting_view.mm",
     "instruction_view.h",
     "instruction_view.mm",
-    "selector_picker_presentation_controller.h",
-    "selector_picker_presentation_controller.mm",
-    "selector_picker_view_controller.h",
-    "selector_picker_view_controller.mm",
-    "selector_view_controller_delegate.h",
     "self_sizing_table_view.h",
     "self_sizing_table_view.mm",
     "text_field_configuration.h",
@@ -37,44 +32,25 @@ source_set("elements") {
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ios/chrome/common/ui/util:dynamic_type_util",
   ]
 }
 
-source_set("selector_coordinator") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "selector_coordinator.h",
-    "selector_coordinator.mm",
-  ]
-  deps = [
-    ":elements",
-    "//base",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common/ui/colors",
-  ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
     "activity_overlay_coordinator_unittest.mm",
     "chrome_activity_overlay_coordinator_unittest.mm",
-    "selector_coordinator_unittest.mm",
-    "selector_picker_view_controller_unittest.mm",
     "text_field_configuration_unittest.mm",
     "windowed_container_view_unittest.mm",
   ]
   deps = [
     ":elements",
     ":elements_internal",
-    ":selector_coordinator",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index 148ba62e7f3..20d2d108bf3 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -84,7 +84,7 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:terms_util",
     "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/promo_style",
@@ -122,6 +122,7 @@ source_set("utils") {
   deps = [
     "//base",
     "//components/metrics",
+    "//components/policy/core/common:common_constants",
     "//components/signin/public/identity_manager",
     "//ios/chrome/app:tests_hook",
     "//ios/chrome/browser:application_context",
@@ -187,12 +188,17 @@ source_set("interruptible_chrome_coordinator") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "welcome_to_chrome_view_controller_unittest.mm" ]
+  sources = [
+    "first_run_util_unittest.mm",
+    "welcome_to_chrome_view_controller_unittest.mm",
+  ]
   deps = [
     ":first_run",
+    ":utils",
     "//base",
     "//base/test:test_support",
     "//components/metrics",
+    "//components/policy/core/common:common_constants",
     "//components/prefs",
     "//components/prefs:test_support",
     "//ios/chrome/browser/browser_state:test_support",
@@ -229,6 +235,7 @@ source_set("eg2_tests") {
     "//base/test:test_support",
     "//components/policy:policy_code_generate",
     "//components/policy/core/common:common_constants",
+    "//components/signin/ios/browser:features",
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/policy:eg_test_support+eg2",
@@ -238,7 +245,7 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/ui/authentication/signin:constants",
     "//ios/chrome/browser/ui/authentication/views:views_constants",
     "//ios/chrome/browser/ui/settings/google_services:constants",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/promo_style:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:switches",
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 6c319814b6a..48fb53df44f 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
@@ -27,8 +27,10 @@ source_set("default_browser_ui") {
   ]
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/first_run:constants",
+    "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/first_run/resources:default_browser_screen_banner",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/promo_style",
diff --git a/chromium/ios/chrome/browser/ui/first_run/legacy_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/legacy_signin/BUILD.gn
index 86ae6c53245..47114361cc1 100644
--- a/chromium/ios/chrome/browser/ui/first_run/legacy_signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/legacy_signin/BUILD.gn
@@ -55,7 +55,7 @@ source_set("legacy_signin_ui") {
     "//ios/chrome/browser/ui/first_run/resources:legacy_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:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/promo_style",
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 a0d0e6ba695..e186179a124 100644
--- a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn
@@ -26,6 +26,7 @@ source_set("signin") {
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/first_run:constants",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
     "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/first_run/uma",
@@ -48,9 +49,10 @@ source_set("signin_ui") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements:elements_internal",
     "//ios/chrome/browser/ui/first_run:constants",
+    "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/first_run/resources:signin_banner",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/promo_style",
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 4372133e4ac..459787fa726 100644
--- a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn
@@ -32,6 +32,7 @@ source_set("sync") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
+    "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/unified_consent",
     "//ios/public/provider/chrome/browser/signin",
@@ -54,7 +55,7 @@ source_set("sync_ui") {
     "//ios/chrome/browser/ui/first_run:constants",
     "//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:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/promo_style",
diff --git a/chromium/ios/chrome/browser/ui/first_run/uma/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/uma/BUILD.gn
index a2a7bdc6ff6..c6937a693fd 100644
--- a/chromium/ios/chrome/browser/ui/first_run/uma/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/uma/BUILD.gn
@@ -33,7 +33,7 @@ source_set("uma_ui") {
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:utils",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ui/base",
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 bc4b161cfb3..f0c7edfcefe 100644
--- a/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn
@@ -16,11 +16,14 @@ source_set("welcome") {
     "//components/metrics",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/first_run:screen_delegate",
+    "//ios/chrome/browser/ui/first_run:utils",
     "//ios/chrome/browser/ui/first_run/uma",
     "//ios/chrome/browser/ui/util:terms_util",
     "//ios/web/common:web_view_creation_util",
@@ -36,6 +39,7 @@ source_set("welcome_ui") {
     "checkbox_button.mm",
     "tos_view_controller.h",
     "tos_view_controller.mm",
+    "welcome_screen_consumer.h",
     "welcome_screen_mediator.h",
     "welcome_screen_mediator.mm",
     "welcome_screen_view_controller.h",
@@ -44,7 +48,6 @@ source_set("welcome_ui") {
   deps = [
     "//base",
     "//components/metrics",
-    "//components/policy/core/common:common_constants",
     "//components/prefs",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -57,7 +60,7 @@ source_set("welcome_ui") {
     "//ios/chrome/browser/ui/first_run/uma",
     "//ios/chrome/browser/ui/settings/resources:enterprise_icon",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/promo_style",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/follow/BUILD.gn b/chromium/ios/chrome/browser/ui/follow/BUILD.gn
index 20fb6f296b4..d17687a2eb0 100644
--- a/chromium/ios/chrome/browser/ui/follow/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/follow/BUILD.gn
@@ -11,7 +11,27 @@ source_set("follow") {
     "followed_web_channel.h",
     "followed_web_channel.mm",
   ]
-  deps = [ "//ios/chrome/browser/net:crurl" ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/net:crurl",
+  ]
+}
+
+source_set("follow_iph") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "follow_iph_coordinator.h",
+    "follow_iph_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/discover_feed",
+    "//ios/chrome/browser/discover_feed:discover_feed_factory",
+    "//ios/chrome/browser/follow:tab_helper",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/ntp:metrics",
+  ]
 }
 
 source_set("first_follow") {
@@ -22,51 +42,37 @@ source_set("first_follow") {
   ]
   deps = [
     ":first_follow_ui",
+    ":follow",
+    "//ios/chrome/browser/discover_feed",
+    "//ios/chrome/browser/discover_feed:discover_feed_factory",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/ntp:metrics",
+    "//ios/chrome/common/ui/confirmation_alert",
+    "//ios/chrome/common/ui/favicon",
+    "//ios/chrome/common/ui/favicon:favicon_constants",
   ]
 }
 
 source_set("first_follow_ui") {
   sources = [
+    "first_follow_favicon_data_source.h",
     "first_follow_view_controller.h",
     "first_follow_view_controller.mm",
-    "first_follow_view_delegate.h",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
     ":follow",
     "//base",
     "//ios/chrome/app/strings:ios_strings_grit",
-    "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/net:crurl",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/confirmation_alert",
     "//ios/chrome/common/ui/favicon",
-    "//ios/chrome/common/ui/favicon:favicon_constants",
+    "//ios/chrome/common/ui/util",
     "//ui/base",
   ]
 }
-
-source_set("utils") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "follow_util.h",
-    "follow_util.mm",
-  ]
-  deps = [
-    ":enums",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui/ntp:feature_flags",
-    "//ios/web/public",
-    "//url",
-  ]
-}
-
-source_set("enums") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [ "follow_action_state.h" ]
-  deps = []
-}
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index bd2a5d03c81..40e8953b471 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -184,7 +184,7 @@ 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/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/ui/icons/BUILD.gn b/chromium/ios/chrome/browser/ui/icons/BUILD.gn
index 010d5a89995..bdbb23f363f 100644
--- a/chromium/ios/chrome/browser/ui/icons/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/icons/BUILD.gn
@@ -24,6 +24,69 @@ source_set("icons") {
   ]
 }
 
+source_set("infobar_icons") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "infobar_icon.h",
+    "infobar_icon.mm",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("action_icons") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "action_icon.h",
+    "action_icon.mm",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("download_icons") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "download_icon.h",
+    "download_icon.mm",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("item_icons") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "item_icon.h",
+    "item_icon.mm",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("symbols") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "chrome_symbol.h",
+    "chrome_symbol.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/icons/resources:arrow_clockwise",
+    "//ios/chrome/browser/ui/icons/resources:arrow_triangle_slash_circlepath",
+    "//ios/chrome/browser/ui/icons/resources:camera",
+    "//ios/chrome/browser/ui/icons/resources:camera_fill",
+    "//ios/chrome/browser/ui/icons/resources:incognito",
+    "//ios/chrome/browser/ui/icons/resources:incognito_circle_fill",
+    "//ios/chrome/browser/ui/icons/resources:plus_circle_fill",
+    "//ios/chrome/browser/ui/icons/resources:popup_badge_minus",
+    "//ios/chrome/browser/ui/icons/resources:square_number",
+    "//ios/chrome/browser/ui/icons/resources:translate",
+    "//ui/base",
+  ]
+  frameworks = [
+    "CoreGraphics.framework",
+    "UIKit.framework",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [ "chrome_icon_unittest.mm" ]
diff --git a/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn
new file mode 100644
index 00000000000..7d4bb698401
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn
@@ -0,0 +1,75 @@
+# Copyright 2022 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")
+
+symbolset("arrow_clockwise") {
+  sources = [
+    "arrow_clockwise.symbolset/Contents.json",
+    "arrow_clockwise.symbolset/arrow.clockwise.cr.svg",
+  ]
+}
+
+symbolset("incognito") {
+  sources = [
+    "incognito.symbolset/Contents.json",
+    "incognito.symbolset/incognito.cr.svg",
+  ]
+}
+
+symbolset("incognito_circle_fill") {
+  sources = [
+    "incognito_circle_fill.symbolset/Contents.json",
+    "incognito_circle_fill.symbolset/incognito.circle.fill.cr.svg",
+  ]
+}
+
+symbolset("square_number") {
+  sources = [
+    "square_number.symbolset/Contents.json",
+    "square_number.symbolset/square.number.cr.svg",
+  ]
+}
+
+symbolset("translate") {
+  sources = [
+    "translate.symbolset/Contents.json",
+    "translate.symbolset/translate.cr.svg",
+  ]
+}
+
+symbolset("camera") {
+  sources = [
+    "camera.symbolset/Contents.json",
+    "camera.symbolset/camera.cr.svg",
+  ]
+}
+
+symbolset("camera_fill") {
+  sources = [
+    "camera_fill.symbolset/Contents.json",
+    "camera_fill.symbolset/camera.fill.cr.svg",
+  ]
+}
+
+symbolset("plus_circle_fill") {
+  sources = [
+    "plus_circle_fill.symbolset/Contents.json",
+    "plus_circle_fill.symbolset/plus.circle.fill.cr.svg",
+  ]
+}
+
+symbolset("arrow_triangle_slash_circlepath") {
+  sources = [
+    "arrow_triangle_slash_circlepath.symbolset/Contents.json",
+    "arrow_triangle_slash_circlepath.symbolset/arrow.triangle.slash.circlepath.cr.svg",
+  ]
+}
+
+symbolset("popup_badge_minus") {
+  sources = [
+    "popup_badge_minus.symbolset/Contents.json",
+    "popup_badge_minus.symbolset/popup.badge.minus.cr.svg",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
index 96103e2dabb..8003c158e81 100644
--- a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
@@ -18,6 +18,8 @@ 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/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
index fc6248ee0fb..0c7cad85601 100644
--- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
@@ -40,6 +40,8 @@ source_set("modals") {
     "//ios/chrome/browser/ui/autofill:autofill_message",
     "//ios/chrome/browser/ui/autofill:autofill_metrics",
     "//ios/chrome/browser/ui/autofill/cells",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/permissions/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/permissions/BUILD.gn
index 342178172eb..ff43db49c2e 100644
--- a/chromium/ios/chrome/browser/ui/infobars/modals/permissions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/modals/permissions/BUILD.gn
@@ -21,7 +21,7 @@ source_set("permissions") {
     "//ios/chrome/browser/ui/settings/cells:cells",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ios/web/public/permissions",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
index 7ccc1b993e2..9d07cdc486a 100644
--- a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
@@ -22,15 +22,6 @@ imageset("infobar_downloading") {
   ]
 }
 
-imageset("infobar_popup_blocker") {
-  sources = [
-    "infobar_popup_blocker.imageset/Contents.json",
-    "infobar_popup_blocker.imageset/infobar_popup_blocker.png",
-    "infobar_popup_blocker.imageset/infobar_popup_blocker@2x.png",
-    "infobar_popup_blocker.imageset/infobar_popup_blocker@3x.png",
-  ]
-}
-
 imageset("infobar_reveal_password_icon") {
   sources = [
     "infobar_reveal_password_icon.imageset/Contents.json",
@@ -111,17 +102,3 @@ imageset("infobar_profile_icon") {
     "infobar_profile_icon.imageset/infobar_profile_icon@3x.png",
   ]
 }
-
-symbolset("infobar_permissions_camera") {
-  sources = [
-    "infobar_permissions_camera.symbolset/Contents.json",
-    "infobar_permissions_camera.symbolset/camera.cr.svg",
-  ]
-}
-
-symbolset("infobar_permissions_camera_fill") {
-  sources = [
-    "infobar_permissions_camera_fill.symbolset/Contents.json",
-    "infobar_permissions_camera_fill.symbolset/camera.fill.cr.svg",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/lens/BUILD.gn b/chromium/ios/chrome/browser/ui/lens/BUILD.gn
index 5c56dc0a464..412b1ec5bc9 100644
--- a/chromium/ios/chrome/browser/ui/lens/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/lens/BUILD.gn
@@ -2,17 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("lens_coordinator") {
+source_set("coordinator") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "lens_coordinator.h",
     "lens_coordinator.mm",
   ]
   deps = [
-    "//ios/chrome/browser:application_context",
     "//ios/chrome/browser/browser_state:browser_state",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/signin:signin",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/url_loading",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index 35e3d5e5ea9..5794f082fc4 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -63,6 +63,7 @@ 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/icons:symbols",
     "//ios/chrome/browser/ui/main:default_browser_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:util",
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index 31292d17563..1446f7623fe 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -84,9 +84,29 @@ source_set("incognito_blocker_scene_agent") {
   frameworks = [ "UIKit.framework" ]
 }
 
+source_set("layout_guide_scene_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "layout_guide_scene_agent.h",
+    "layout_guide_scene_agent.mm",
+  ]
+  deps = [
+    ":observing_scene_agent",
+    "//base",
+    "//ios/chrome/browser/ui/util:util_swift",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("scene_ui_provider") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "scene_ui_provider.h" ]
+}
+
 source_set("scene") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "scene_controller.h",
     "scene_controller.mm",
     "scene_delegate.h",
     "scene_delegate.mm",
@@ -100,6 +120,7 @@ source_set("scene") {
   deps = [
     ":default_browser_scene_agent",
     ":incognito_blocker_scene_agent",
+    ":layout_guide_scene_agent",
     ":main",
     ":observing_scene_agent",
     ":scene_state_header",
@@ -134,6 +155,9 @@ source_set("scene") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/crash_report/breadcrumbs",
+    "//ios/chrome/browser/default_browser",
+    "//ios/chrome/browser/discover_feed",
+    "//ios/chrome/browser/discover_feed:discover_feed_factory",
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/infobars",
@@ -164,6 +188,8 @@ source_set("scene") {
     "//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/ntp:feature_flags",
+    "//ios/chrome/browser/ui/policy:user_policy_scene_agent",
     "//ios/chrome/browser/ui/scoped_ui_blocker",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/sync",
@@ -191,6 +217,7 @@ source_set("scene") {
   public_deps = [
     ":scene_state_header",
     ":scene_state_observer",
+    ":scene_ui_provider",
   ]
   allow_circular_includes_from = [
     ":main",
@@ -291,11 +318,13 @@ source_set("unit_tests") {
   sources = [
     "browser_view_wrangler_unittest.mm",
     "incognito_blocker_scene_agent_unittest.mm",
+    "layout_guide_scene_agent_unittest.mm",
     "scene_controller_unittest.mm",
     "scene_state_browser_agent_unittest.mm",
   ]
   deps = [
     ":incognito_blocker_scene_agent",
+    ":layout_guide_scene_agent",
     ":main",
     ":scene",
     "//base",
@@ -309,6 +338,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:scene_util_test_support",
diff --git a/chromium/ios/chrome/browser/ui/menu/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
index 0c4a3fcb41a..16f1a77ef72 100644
--- a/chromium/ios/chrome/browser/ui/menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/BUILD.gn
@@ -21,7 +21,6 @@ source_set("menu") {
     "resources:delete",
     "resources:download",
     "resources:edit",
-    "resources:hide_preview",
     "resources:lens_icon",
     "resources:mark_read",
     "resources:move_folder",
@@ -36,11 +35,11 @@ source_set("menu") {
     "resources:search_image",
     "resources:select",
     "resources:share",
-    "resources:show_preview",
     "//base",
     "//components/open_from_clipboard",
     "//components/prefs",
     "//components/search_engines",
+    "//components/url_param_filter/core",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
@@ -48,6 +47,8 @@ source_set("menu") {
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util",
@@ -106,7 +107,10 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/sessions:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/window_activities",
diff --git a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
index dcba3b4e3ec..1e1ab6da3ef 100644
--- a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn
@@ -60,14 +60,6 @@ imageset("edit") {
   ]
 }
 
-imageset("hide_preview") {
-  sources = [
-    "hide_preview.imageset/Contents.json",
-    "hide_preview.imageset/hide_preview@2x.png",
-    "hide_preview.imageset/hide_preview@3x.png",
-  ]
-}
-
 imageset("lens_icon") {
   sources = [
     "lens_icon.imageset/Contents.json",
@@ -140,14 +132,6 @@ imageset("share") {
   ]
 }
 
-imageset("show_preview") {
-  sources = [
-    "show_preview.imageset/Contents.json",
-    "show_preview.imageset/show_preview@2x.png",
-    "show_preview.imageset/show_preview@3x.png",
-  ]
-}
-
 imageset("move_folder") {
   sources = [
     "move_folder.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index 9a26a06a22f..fdedc06ec2b 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -6,10 +6,12 @@ source_set("ntp") {
   sources = [
     "discover_feed_delegate.h",
     "discover_feed_preview_delegate.h",
+    "feed_control_delegate.h",
     "new_tab_page_configuring.h",
     "new_tab_page_content_delegate.h",
     "new_tab_page_controller_delegate.h",
     "new_tab_page_delegate.h",
+    "new_tab_page_follow_delegate.h",
     "new_tab_page_omnibox_positioning.h",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -66,6 +68,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/discover_feed",
     "//ios/chrome/browser/discover_feed:discover_feed_factory",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
@@ -89,6 +92,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/util",
+    "//ios/public/provider/chrome/browser/follow",
     "//ios/public/provider/chrome/browser/ui_utils:ui_utils_api",
     "//ios/web/public",
     "//ui/base",
@@ -113,10 +117,15 @@ source_set("ntp_internal") {
   sources = [
     "discover_feed_wrapper_view_controller.h",
     "discover_feed_wrapper_view_controller.mm",
-    "feed_control_delegate.h",
     "feed_header_view_controller.h",
     "feed_header_view_controller.mm",
     "feed_menu_commands.h",
+    "feed_top_section_coordinator.h",
+    "feed_top_section_coordinator.mm",
+    "feed_top_section_mediator.h",
+    "feed_top_section_mediator.mm",
+    "feed_top_section_view_controller.h",
+    "feed_top_section_view_controller.mm",
     "incognito_view.h",
     "incognito_view.mm",
     "incognito_view_controller.h",
@@ -137,7 +146,10 @@ source_set("ntp_internal") {
     ":logo",
     ":metrics",
     ":ntp",
+    "resources:fake_omnibox_bottom_gradient_color",
+    "resources:fake_omnibox_top_gradient_color",
     "resources:incognito_icon",
+    "resources:ntp_background_bottom_gradient_color",
     "resources:ntp_opentabs",
     "resources:ntp_opentabs_clock",
     "resources:ntp_opentabs_header",
@@ -169,7 +181,9 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/ntp_tiles",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -182,8 +196,10 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions/cells",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/favicon",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/thumb_strip:public",
@@ -192,10 +208,11 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/app_group",
     "//ios/chrome/common/ntp_tile",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser/branded_images:branded_images_api",
@@ -219,10 +236,14 @@ source_set("metrics") {
   sources = [
     "feed_metrics_recorder.h",
     "feed_metrics_recorder.mm",
+    "feed_session_recorder.h",
+    "feed_session_recorder.mm",
   ]
   deps = [
+    ":ntp",
     "//base",
     "//components/feed/core/v2/public:common",
+    "//ios/chrome/browser/discover_feed:constants",
     "//ios/chrome/browser/ui/content_suggestions:metrics",
   ]
 }
@@ -231,6 +252,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "feed_session_recorder_unittest.mm",
     "new_tab_page_coordinator_unittest.mm",
     "notification_promo_whats_new_unittest.mm",
     "ntp_tile_saver_unittest.mm",
@@ -238,6 +260,7 @@ source_set("unit_tests") {
   deps = [
     ":coordinator",
     ":feature_flags",
+    ":metrics",
     ":ntp",
     ":ntp_internal",
     "//base",
diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
index 0084ab8e9ea..0e34717fab4 100644
--- a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
@@ -17,6 +17,8 @@ source_set("feed_management") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/ntp:metrics",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/follow",
   ]
   public_deps = [ ":navigation_delegate" ]
 }
@@ -64,21 +66,22 @@ source_set("follow_management_ui") {
     "follow_management_ui_updater.h",
     "follow_management_view_controller.h",
     "follow_management_view_controller.mm",
+    "follow_management_view_delegate.h",
     "followed_web_channel_item.h",
     "followed_web_channel_item.mm",
     "followed_web_channels_data_source.h",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
+    "resources:following_empty",
     "//base",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/ui/follow",
     "//ios/chrome/browser/ui/ntp:metrics",
+    "//ios/chrome/browser/ui/ntp/feed_management:navigation_delegate",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/common/ui/favicon",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/follow",
     "//ui/base",
   ]
 }
@@ -92,8 +95,8 @@ source_set("eg2_tests") {
   sources = [ "feed_management_egtest.mm" ]
   deps = [
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
-    "//ios/chrome/browser/ui/ntp: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/ntp/feed_management/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn
new file mode 100644
index 00000000000..ab9902e387a
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("following_empty") {
+  sources = [
+    "following_empty.imageset/Contents.json",
+    "following_empty.imageset/following_empty.pdf",
+    "following_empty.imageset/following_empty_dark.pdf",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
index 7441b2686a7..72803fef87a 100644
--- a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
@@ -4,6 +4,18 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
+colorset("fake_omnibox_bottom_gradient_color") {
+  sources = [ "fake_omnibox_bottom_gradient_color.colorset/Contents.json" ]
+}
+
+colorset("fake_omnibox_top_gradient_color") {
+  sources = [ "fake_omnibox_top_gradient_color.colorset/Contents.json" ]
+}
+
+colorset("ntp_background_bottom_gradient_color") {
+  sources = [ "ntp_background_bottom_gradient_color.colorset/Contents.json" ]
+}
+
 imageset("ntp_opentabs_last_row_h") {
   sources = [
     "ntp_opentabs_last_row_h.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index fde9db63f0f..38fb3e2335a 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -87,6 +87,7 @@ source_set("omnibox_util") {
     "//components/omnibox/browser",
     "//components/security_state/core",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/icons:symbols",
   ]
   public_deps = [
     ":omnibox_icon_type_constants",
@@ -102,7 +103,10 @@ source_set("omnibox_icon_type_constants") {
     "omnibox_icon_type.h",
     "omnibox_icon_type.mm",
   ]
-  deps = [ "//base" ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/icons:symbols",
+  ]
 }
 
 source_set("omnibox_internal") {
@@ -135,6 +139,7 @@ source_set("omnibox_internal") {
     "web_omnibox_edit_controller_impl.mm",
   ]
   deps = [
+    ":features",
     ":omnibox",
     ":omnibox_popup_shared",
     ":omnibox_util",
@@ -295,3 +300,12 @@ bundle_data("resources_unit_tests") {
   outputs = [ "{{bundle_resources_dir}}/" +
               "ios/chrome/test/data/omnibox/{{source_file_part}}" ]
 }
+
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "omnibox_ui_features.cc",
+    "omnibox_ui_features.h",
+  ]
+  public_deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 54160151bf4..ed2441f3f08 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -10,7 +10,7 @@ swift_source_set("popup_swift") {
     "omnibox_popup_view_provider.swift",
     "shared/blurred_background.swift",
     "shared/fake_omnibox_icon.swift",
-    "shared/gradient_view_modifier.swift",
+    "shared/gradient_text_view.swift",
     "shared/omnibox_pedal.swift",
     "shared/omnibox_text.swift",
     "shared/popup_empty_space_view.swift",
@@ -21,6 +21,7 @@ swift_source_set("popup_swift") {
     "shared/popup_match_row_view.swift",
     "shared/popup_match_trailing_button.swift",
     "shared/popup_model.swift",
+    "shared/popup_ui_configuration.swift",
     "shared/popup_ui_variation.swift",
     "shared/popup_view.swift",
     "shared/pressed_preference_key_button_style.swift",
@@ -76,6 +77,7 @@ source_set("popup") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/default_browser",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/search_engines",
@@ -135,6 +137,7 @@ source_set("popup_ui") {
   deps = [
     ":popup_accessibility_identifier_constants",
     ":popup_ui_protocols",
+    "resources:background_color_swiftui_ios14",
     "resources:grouped_primary_background_color_swiftui_ios14",
     "resources:omnibox_popup_tab_match",
     "resources:omnibox_suggestion_answer_icon_color",
@@ -218,6 +221,7 @@ source_set("unit_tests") {
     ":popup_ui",
     ":popup_ui_protocols",
     "//base",
+    "//base/test:test_support",
     "//components/omnibox/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -237,12 +241,20 @@ source_set("eg2_tests") {
   deps = [
     ":popup_accessibility_identifier_constants",
     "//base",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/history:constants",
+    "//ios/chrome/browser/ui/omnibox:features",
+    "//ios/chrome/browser/ui/settings:constants",
+    "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
     "//net:test_support",
+    "//ui/base",
   ]
   frameworks = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn
index ac936df7bb6..08f18d87903 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn
@@ -4,6 +4,10 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
+colorset("background_color_swiftui_ios14") {
+  sources = [ "background_color_swiftui_ios14.colorset/Contents.json" ]
+}
+
 colorset("grouped_primary_background_color_swiftui_ios14") {
   sources = [
     "grouped_primary_background_color_swiftui_ios14.colorset/Contents.json",
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 aa52e436000..fba792f0078 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
@@ -16,6 +16,8 @@ source_set("autofill_address_profile") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
index 9ae143ef4b9..933f0898869 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/permissions/BUILD.gn
@@ -14,6 +14,8 @@ source_set("permissions") {
     "//base",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/reading_list/BUILD.gn
index ab13a220bd0..7aa6ac2b0e8 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/reading_list/BUILD.gn
@@ -13,6 +13,9 @@ source_set("reading_list") {
   deps = [
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
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 dd7c4c725f2..1e43257df94 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
@@ -16,6 +16,8 @@ source_set("save_card") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
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 b74cc4d0bc0..7b7ab6a68b7 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
@@ -31,6 +31,9 @@ source_set("mediators") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 067715f1267..3d063db2772 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -14,11 +14,8 @@ source_set("overscroll_actions") {
   ]
   deps = [
     "resources:ptr_close",
-    "resources:ptr_close_active",
     "resources:ptr_new_tab",
-    "resources:ptr_new_tab_active",
     "resources:ptr_reload",
-    "resources:ptr_reload_active",
     "//base",
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
@@ -27,6 +24,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/icons:symbols",
     "//ios/chrome/browser/ui/ntp:logo",
     "//ios/chrome/browser/ui/page_info:constants",
     "//ios/chrome/browser/ui/side_swipe",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
index b2d491a6962..a6c097b4ec1 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
@@ -4,24 +4,6 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
-imageset("ptr_reload_active") {
-  sources = [
-    "ptr_reload_active.imageset/Contents.json",
-    "ptr_reload_active.imageset/ptr_reload_active.png",
-    "ptr_reload_active.imageset/ptr_reload_active@2x.png",
-    "ptr_reload_active.imageset/ptr_reload_active@3x.png",
-  ]
-}
-
-imageset("ptr_close_active") {
-  sources = [
-    "ptr_close_active.imageset/Contents.json",
-    "ptr_close_active.imageset/ptr_close_active.png",
-    "ptr_close_active.imageset/ptr_close_active@2x.png",
-    "ptr_close_active.imageset/ptr_close_active@3x.png",
-  ]
-}
-
 imageset("ptr_close") {
   sources = [
     "ptr_close.imageset/Contents.json",
@@ -48,12 +30,3 @@ imageset("ptr_reload") {
     "ptr_reload.imageset/ptr_reload@3x.png",
   ]
 }
-
-imageset("ptr_new_tab_active") {
-  sources = [
-    "ptr_new_tab_active.imageset/Contents.json",
-    "ptr_new_tab_active.imageset/ptr_new_tab_active.png",
-    "ptr_new_tab_active.imageset/ptr_new_tab_active@2x.png",
-    "ptr_new_tab_active.imageset/ptr_new_tab_active@3x.png",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
index ef0b0b7d171..7f622a4b73a 100644
--- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -38,7 +38,7 @@ source_set("page_info") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
index cad1aa15b40..ee3cf1349f7 100644
--- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
@@ -30,6 +30,7 @@ source_set("passwords") {
     "//components/password_manager/core/common:features",
     "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util",
     "//components/strings:components_strings_grit",
+    "//components/ukm/ios:ukm_url_recorder",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autofill:autofill_shared",
diff --git a/chromium/ios/chrome/browser/ui/policy/BUILD.gn b/chromium/ios/chrome/browser/ui/policy/BUILD.gn
new file mode 100644
index 00000000000..b4146d5302a
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/policy/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright 2022 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("user_policy_scene_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "user_policy_scene_agent.h",
+    "user_policy_scene_agent.mm",
+    "user_policy_util.h",
+    "user_policy_util.mm",
+  ]
+  deps = [
+    "//base",
+    "//base/ios",
+    "//components/policy/core/common:common_constants",
+    "//components/prefs",
+    "//components/signin/public/base",
+    "//ios/chrome/app/application_delegate:app_state_header",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/policy",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/main:browser_interface_provider",
+    "//ios/chrome/browser/ui/main:observing_scene_agent",
+    "//ios/chrome/browser/ui/main:scene_ui_provider",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/signin",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index 3da528b7ef6..817d5ee5dec 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -22,6 +22,7 @@ source_set("popup_menu") {
     "resources:popup_menu_edit_bookmark",
     "resources:popup_menu_enterprise_icon",
     "resources:popup_menu_find_in_page",
+    "resources:popup_menu_follow",
     "resources:popup_menu_help",
     "resources:popup_menu_history",
     "resources:popup_menu_new_incognito_tab",
@@ -42,6 +43,7 @@ source_set("popup_menu") {
     "resources:popup_menu_stop",
     "resources:popup_menu_text_zoom",
     "resources:popup_menu_translate",
+    "resources:popup_menu_unfollow",
     "resources:popup_menu_voice_search",
     "//base",
     "//components/bookmarks/browser",
@@ -58,13 +60,19 @@ source_set("popup_menu") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state_metrics",
+    "//ios/chrome/browser/discover_feed",
+    "//ios/chrome/browser/discover_feed:discover_feed_factory",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/follow",
+    "//ios/chrome/browser/follow:enums",
+    "//ios/chrome/browser/follow:tab_helper",
+    "//ios/chrome/browser/follow:utils",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/policy",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -79,16 +87,17 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/content_suggestions/cells:constants",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo:utils",
-    "//ios/chrome/browser/ui/follow:enums",
-    "//ios/chrome/browser/ui/follow:utils",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
-    "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/ui/ntp:metrics",
     "//ios/chrome/browser/ui/popup_menu:metrics_protocols",
     "//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:features",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/presenters",
@@ -124,7 +133,10 @@ source_set("constants") {
 
 source_set("metrics_protocols") {
   configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [ "popup_menu_metrics_handler.h" ]
+  sources = [
+    "popup_menu_carousel_metrics_delegate.h",
+    "popup_menu_metrics_handler.h",
+  ]
 }
 
 source_set("unit_tests") {
@@ -154,7 +166,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords:store_factory",
     "//ios/chrome/browser/policy",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:test_support",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/popup_menu/cells",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
index 7996667dfe9..9b8adf1ac72 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
@@ -14,13 +14,15 @@ source_set("cells") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/ui/favicon/resources:default_favicon",
     "//ios/chrome/browser/ui/popup_menu/public:ui_constants",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/reading_list:reading_list_ui",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
+    "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/util",
   ]
   frameworks = [ "UIKit.framework" ]
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
index 8a551e1d794..2db9e1dddfd 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn
@@ -4,6 +4,14 @@
 
 import("//build/config/ios/swift_source_set.gni")
 
+source_set("overflow_menu_constants") {
+  sources = [
+    "overflow_menu_constants.cc",
+    "overflow_menu_constants.h",
+  ]
+  deps = [ "//base" ]
+}
+
 source_set("overflow_menu") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -12,8 +20,10 @@ source_set("overflow_menu") {
   ]
   deps = [
     ":feature_flags",
+    ":overflow_menu_constants",
     ":overflow_menu_swift",
     "resources:overflow_menu_action_bookmark",
+    "resources:overflow_menu_action_clear_browsing_data",
     "resources:overflow_menu_action_edit_bookmark",
     "resources:overflow_menu_action_find_in_page",
     "resources:overflow_menu_action_follow",
@@ -26,19 +36,28 @@ source_set("overflow_menu") {
     "resources:overflow_menu_action_report_issue",
     "resources:overflow_menu_action_request_desktop",
     "resources:overflow_menu_action_request_mobile",
+    "resources:overflow_menu_action_settings",
     "resources:overflow_menu_action_stop",
     "resources:overflow_menu_action_text_zoom",
     "resources:overflow_menu_action_translate",
     "resources:overflow_menu_action_unfollow",
     "resources:overflow_menu_destination_bookmarks",
+    "resources:overflow_menu_destination_bookmarks_simple",
     "resources:overflow_menu_destination_downloads",
+    "resources:overflow_menu_destination_downloads_simple",
     "resources:overflow_menu_destination_history",
+    "resources:overflow_menu_destination_history_simple",
     "resources:overflow_menu_destination_passwords",
     "resources:overflow_menu_destination_passwords_rebrand",
+    "resources:overflow_menu_destination_passwords_simple",
     "resources:overflow_menu_destination_reading_list",
+    "resources:overflow_menu_destination_reading_list_simple",
     "resources:overflow_menu_destination_recent_tabs",
+    "resources:overflow_menu_destination_recent_tabs_simple",
     "resources:overflow_menu_destination_settings",
+    "resources:overflow_menu_destination_settings_simple",
     "resources:overflow_menu_destination_site_info",
+    "resources:overflow_menu_destination_site_info_simple",
     "resources:overflow_menu_footer_managed",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
@@ -50,8 +69,13 @@ source_set("overflow_menu") {
     "//components/translate/core/browser",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser:chrome_url_constants",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/follow",
+    "//ios/chrome/browser/follow:enums",
+    "//ios/chrome/browser/follow:tab_helper",
+    "//ios/chrome/browser/follow:utils",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/policy",
     "//ios/chrome/browser/policy:policy_util",
@@ -63,10 +87,13 @@ source_set("overflow_menu") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/follow",
-    "//ios/chrome/browser/ui/follow:enums",
-    "//ios/chrome/browser/ui/ntp:feature_flags",
+    "//ios/chrome/browser/ui/icons:action_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
+    "//ios/chrome/browser/ui/ntp:metrics",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/popup_menu:metrics_protocols",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history",
+    "//ios/chrome/browser/ui/popup_menu/public:features",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web/font_size",
@@ -130,7 +157,6 @@ source_set("feature_flags") {
 
 source_set("unit_tests") {
   testonly = true
-
   sources = [ "overflow_menu_mediator_unittest.mm" ]
   deps = [
     ":overflow_menu",
@@ -146,6 +172,7 @@ source_set("unit_tests") {
     "//components/prefs",
     "//components/prefs:test_support",
     "//components/translate/core/browser",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
@@ -153,7 +180,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords:store_factory",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:test_support",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/popup_menu:constants",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
new file mode 100644
index 00000000000..5fc694baa04
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn
@@ -0,0 +1,31 @@
+source_set("destination_usage_history") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "destination_usage_history.h",
+    "destination_usage_history.mm",
+  ]
+  frameworks = [ "Foundation.framework" ]
+  deps = [
+    "//base",
+    "//components/prefs",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_constants",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_swift",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "destination_usage_history_unittest.mm" ]
+  deps = [
+    ":destination_usage_history",
+    "//base",
+    "//components/prefs",
+    "//components/prefs:test_support",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser/ui/popup_menu/overflow_menu:overflow_menu_constants",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn
index 0cfae2a047a..cdc0c423934 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn
@@ -12,6 +12,14 @@ imageset("overflow_menu_action_bookmark") {
   ]
 }
 
+imageset("overflow_menu_action_clear_browsing_data") {
+  sources = [
+    "overflow_menu_action_clear_browsing_data.imageset/Contents.json",
+    "overflow_menu_action_clear_browsing_data.imageset/overflow_menu_action_clear_browsing_data@2x.png",
+    "overflow_menu_action_clear_browsing_data.imageset/overflow_menu_action_clear_browsing_data@3x.png",
+  ]
+}
+
 imageset("overflow_menu_action_find_in_page") {
   sources = [
     "overflow_menu_action_find_in_page.imageset/Contents.json",
@@ -108,6 +116,14 @@ imageset("overflow_menu_action_request_mobile") {
   ]
 }
 
+imageset("overflow_menu_action_settings") {
+  sources = [
+    "overflow_menu_action_settings.imageset/Contents.json",
+    "overflow_menu_action_settings.imageset/overflow_menu_action_settings@2x.png",
+    "overflow_menu_action_settings.imageset/overflow_menu_action_settings@3x.png",
+  ]
+}
+
 imageset("overflow_menu_action_stop") {
   sources = [
     "overflow_menu_action_stop.imageset/Contents.json",
@@ -150,6 +166,16 @@ imageset("overflow_menu_destination_bookmarks") {
   ]
 }
 
+imageset("overflow_menu_destination_bookmarks_simple") {
+  sources = [
+    "overflow_menu_destination_bookmarks_simple.imageset/Contents.json",
+    "overflow_menu_destination_bookmarks_simple.imageset/overflow_menu_destination_bookmarks_simple@2x.png",
+    "overflow_menu_destination_bookmarks_simple.imageset/overflow_menu_destination_bookmarks_simple@3x.png",
+    "overflow_menu_destination_bookmarks_simple.imageset/overflow_menu_destination_bookmarks_simple_dark@2x.png",
+    "overflow_menu_destination_bookmarks_simple.imageset/overflow_menu_destination_bookmarks_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_downloads") {
   sources = [
     "overflow_menu_destination_downloads.imageset/Contents.json",
@@ -160,6 +186,16 @@ imageset("overflow_menu_destination_downloads") {
   ]
 }
 
+imageset("overflow_menu_destination_downloads_simple") {
+  sources = [
+    "overflow_menu_destination_downloads_simple.imageset/Contents.json",
+    "overflow_menu_destination_downloads_simple.imageset/overflow_menu_destination_downloads_simple@2x.png",
+    "overflow_menu_destination_downloads_simple.imageset/overflow_menu_destination_downloads_simple@3x.png",
+    "overflow_menu_destination_downloads_simple.imageset/overflow_menu_destination_downloads_simple_dark@2x.png",
+    "overflow_menu_destination_downloads_simple.imageset/overflow_menu_destination_downloads_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_history") {
   sources = [
     "overflow_menu_destination_history.imageset/Contents.json",
@@ -170,6 +206,16 @@ imageset("overflow_menu_destination_history") {
   ]
 }
 
+imageset("overflow_menu_destination_history_simple") {
+  sources = [
+    "overflow_menu_destination_history_simple.imageset/Contents.json",
+    "overflow_menu_destination_history_simple.imageset/overflow_menu_destination_history_simple@2x.png",
+    "overflow_menu_destination_history_simple.imageset/overflow_menu_destination_history_simple@3x.png",
+    "overflow_menu_destination_history_simple.imageset/overflow_menu_destination_history_simple_dark@2x.png",
+    "overflow_menu_destination_history_simple.imageset/overflow_menu_destination_history_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_passwords") {
   sources = [
     "overflow_menu_destination_passwords.imageset/Contents.json",
@@ -180,6 +226,16 @@ imageset("overflow_menu_destination_passwords") {
   ]
 }
 
+imageset("overflow_menu_destination_passwords_simple") {
+  sources = [
+    "overflow_menu_destination_passwords_simple.imageset/Contents.json",
+    "overflow_menu_destination_passwords_simple.imageset/overflow_menu_destination_passwords_simple@2x.png",
+    "overflow_menu_destination_passwords_simple.imageset/overflow_menu_destination_passwords_simple@3x.png",
+    "overflow_menu_destination_passwords_simple.imageset/overflow_menu_destination_passwords_simple_dark@2x.png",
+    "overflow_menu_destination_passwords_simple.imageset/overflow_menu_destination_passwords_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_passwords_rebrand") {
   sources = [
     "overflow_menu_destination_passwords_rebrand.imageset/Contents.json",
@@ -200,6 +256,16 @@ imageset("overflow_menu_destination_reading_list") {
   ]
 }
 
+imageset("overflow_menu_destination_reading_list_simple") {
+  sources = [
+    "overflow_menu_destination_reading_list_simple.imageset/Contents.json",
+    "overflow_menu_destination_reading_list_simple.imageset/overflow_menu_destination_reading_list_simple@2x.png",
+    "overflow_menu_destination_reading_list_simple.imageset/overflow_menu_destination_reading_list_simple@3x.png",
+    "overflow_menu_destination_reading_list_simple.imageset/overflow_menu_destination_reading_list_simple_dark@2x.png",
+    "overflow_menu_destination_reading_list_simple.imageset/overflow_menu_destination_reading_list_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_recent_tabs") {
   sources = [
     "overflow_menu_destination_recent_tabs.imageset/Contents.json",
@@ -210,6 +276,16 @@ imageset("overflow_menu_destination_recent_tabs") {
   ]
 }
 
+imageset("overflow_menu_destination_recent_tabs_simple") {
+  sources = [
+    "overflow_menu_destination_recent_tabs_simple.imageset/Contents.json",
+    "overflow_menu_destination_recent_tabs_simple.imageset/overflow_menu_destination_recent_tabs_simple@2x.png",
+    "overflow_menu_destination_recent_tabs_simple.imageset/overflow_menu_destination_recent_tabs_simple@3x.png",
+    "overflow_menu_destination_recent_tabs_simple.imageset/overflow_menu_destination_recent_tabs_simple_dark@2x.png",
+    "overflow_menu_destination_recent_tabs_simple.imageset/overflow_menu_destination_recent_tabs_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_settings") {
   sources = [
     "overflow_menu_destination_settings.imageset/Contents.json",
@@ -220,6 +296,16 @@ imageset("overflow_menu_destination_settings") {
   ]
 }
 
+imageset("overflow_menu_destination_settings_simple") {
+  sources = [
+    "overflow_menu_destination_settings_simple.imageset/Contents.json",
+    "overflow_menu_destination_settings_simple.imageset/overflow_menu_destination_settings_simple@2x.png",
+    "overflow_menu_destination_settings_simple.imageset/overflow_menu_destination_settings_simple@3x.png",
+    "overflow_menu_destination_settings_simple.imageset/overflow_menu_destination_settings_simple_dark@2x.png",
+    "overflow_menu_destination_settings_simple.imageset/overflow_menu_destination_settings_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_destination_site_info") {
   sources = [
     "overflow_menu_destination_site_info.imageset/Contents.json",
@@ -230,6 +316,16 @@ imageset("overflow_menu_destination_site_info") {
   ]
 }
 
+imageset("overflow_menu_destination_site_info_simple") {
+  sources = [
+    "overflow_menu_destination_site_info_simple.imageset/Contents.json",
+    "overflow_menu_destination_site_info_simple.imageset/overflow_menu_destination_site_info_simple@2x.png",
+    "overflow_menu_destination_site_info_simple.imageset/overflow_menu_destination_site_info_simple@3x.png",
+    "overflow_menu_destination_site_info_simple.imageset/overflow_menu_destination_site_info_simple_dark@2x.png",
+    "overflow_menu_destination_site_info_simple.imageset/overflow_menu_destination_site_info_simple_dark@3x.png",
+  ]
+}
+
 imageset("overflow_menu_footer_managed") {
   sources = [
     "overflow_menu_footer_managed.imageset/Contents.json",
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 dd5096a172d..ea05553c116 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
@@ -59,3 +59,15 @@ source_set("ui_constants") {
     "popup_menu_ui_constants.mm",
   ]
 }
+
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
index cdd05e99743..dc92a9fec05 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -248,3 +248,21 @@ imageset("popup_menu_enterprise_icon") {
     "popup_menu_enterprise_icon.imageset/popup_menu_enterprise_icon@3x.png",
   ]
 }
+
+imageset("popup_menu_follow") {
+  sources = [
+    "popup_menu_follow.imageset/Contents.json",
+    "popup_menu_follow.imageset/popup_menu_follow.png",
+    "popup_menu_follow.imageset/popup_menu_follow@2x.png",
+    "popup_menu_follow.imageset/popup_menu_follow@3x.png",
+  ]
+}
+
+imageset("popup_menu_unfollow") {
+  sources = [
+    "popup_menu_unfollow.imageset/Contents.json",
+    "popup_menu_unfollow.imageset/popup_menu_unfollow.png",
+    "popup_menu_unfollow.imageset/popup_menu_unfollow@2x.png",
+    "popup_menu_unfollow.imageset/popup_menu_unfollow@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index 0e57ac9307a..d46b9387703 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -48,6 +48,7 @@ source_set("reading_list") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/menu",
@@ -169,6 +170,7 @@ source_set("unit_tests") {
   sources = [
     "reading_list_list_item_factory_unittest.mm",
     "reading_list_mediator_unittest.mm",
+    "reading_list_table_view_item_unittest.mm",
     "text_badge_view_unittest.mm",
   ]
   deps = [
@@ -186,8 +188,11 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells:cells",
     "//ios/chrome/test/fakes",
     "//ios/web",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_browsing/BUILD.gn
new file mode 100644
index 00000000000..b5cbda01b58
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/safe_browsing/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2022 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("safe_browsing") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safe_browsing_coordinator.h",
+    "safe_browsing_coordinator.mm",
+  ]
+  deps = [
+    "//components/safe_browsing/core/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/safe_browsing:safe_browsing",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/components/security_interstitials/safe_browsing",
+  ]
+}
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 4b8939afac5..02760f43574 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
@@ -57,7 +57,7 @@ source_set("send_tab_to_self_ui") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 0f5bc4d083c..4ea12cd2edb 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -153,7 +153,9 @@ source_set("settings") {
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/elements:elements_internal",
+    "//ios/chrome/browser/ui/first_run:field_trial",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp:feature_flags",
@@ -174,7 +176,9 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/language:language_ui",
     "//ios/chrome/browser/ui/settings/password",
     "//ios/chrome/browser/ui/settings/privacy",
+    "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/settings/safety_check",
+    "//ios/chrome/browser/ui/settings/safety_check:safety_check_ui",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
@@ -183,6 +187,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
+    "//ios/chrome/browser/ui/util:terms_util",
     "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/voice:prefs",
diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
index 72695c90047..b1bfcc41e71 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -99,6 +99,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index a75699f65cb..8690b2e54ed 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -12,6 +12,8 @@ source_set("cells") {
     "copied_to_chrome_item.mm",
     "passphrase_error_item.h",
     "passphrase_error_item.mm",
+    "safe_browsing_header_item.h",
+    "safe_browsing_header_item.mm",
     "search_engine_item.h",
     "search_engine_item.mm",
     "settings_check_cell.h",
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 e877f6ea353..ec9cb0aad5b 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
@@ -53,6 +53,7 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/elements:elements_internal",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/resources:legacy_password_key",
     "//ios/chrome/browser/ui/resources:password_key",
diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
index 874cd3ffe86..66d758f8e8c 100644
--- a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
@@ -12,7 +12,9 @@ source_set("default_browser") {
     "resources:chrome_icon",
     "resources:default_browser_world",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/default_browser",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/resources:settings",
     "//ios/chrome/browser/ui/table_view:utils",
diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
index 35a0919630f..dc651b8594b 100644
--- a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
@@ -4,6 +4,28 @@
 
 # import("//build/config/ios/ios_sdk.gni")
 
+source_set("info_popover_view_controller") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "info_popover_view_controller.h",
+    "info_popover_view_controller.mm",
+  ]
+
+  frameworks = [ "UIKit.framework" ]
+
+  deps = [
+    ":constants",
+    "//base:base",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/common:string_util",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+}
+
 source_set("enterprise_info_popover_view_controller") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
@@ -16,12 +38,12 @@ source_set("enterprise_info_popover_view_controller") {
 
   deps = [
     ":constants",
+    ":info_popover_view_controller",
     "//base:base",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:chrome_url_constants",
-    "//ios/chrome/common:common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/util",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index d3f3c5130db..fafcc48eaaa 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -65,6 +65,8 @@ source_set("google_services") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/icons:item_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index f6c637dbd8e..beab3d70223 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -24,6 +24,7 @@ source_set("password") {
     "//components/autofill/core/common",
     "//components/password_manager/core/common:features",
     "//components/signin/public/identity_manager/objc",
+    "//components/sync",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -41,7 +42,7 @@ source_set("password") {
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:utils",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon:favicon_constants",
     "//ios/chrome/common/ui/reauthentication",
@@ -123,7 +124,10 @@ source_set("password_constants") {
     "passwords_table_view_constants.h",
     "passwords_table_view_constants.mm",
   ]
-  deps = [ "//base" ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/list_model:list_model",
+  ]
 }
 
 source_set("test_support") {
@@ -145,6 +149,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":password",
+    ":password_constants",
     ":password_ui",
     ":test_support",
     "//base",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn
index e45e844073a..a1ebde02730 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn
@@ -42,7 +42,7 @@ source_set("passwords_in_other_apps_ui") {
     "//ios/chrome/browser/ui/settings/resources:settings_passwords_in_other_apps_banner",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements",
     "//ios/chrome/common/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 ed1e619d2ca..771c821c625 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -11,6 +11,7 @@ source_set("privacy_ui") {
     "privacy_safe_browsing_consumer.h",
     "privacy_safe_browsing_coordinator.h",
     "privacy_safe_browsing_coordinator.mm",
+    "privacy_safe_browsing_mediator+internal.h",
     "privacy_safe_browsing_mediator.h",
     "privacy_safe_browsing_mediator.mm",
     "privacy_safe_browsing_navigation_commands.h",
@@ -45,11 +46,14 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/settings:constants",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
+    "//ios/chrome/browser/ui/settings/elements:info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/privacy/safe_browsing",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
@@ -58,10 +62,11 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/table_view:cells_constants",
+    "//ios/components/security_interstitials/https_only_mode:feature",
     "//ios/public/provider/chrome/browser",
     "//ui/base",
   ]
@@ -108,11 +113,19 @@ source_set("privacy") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "privacy_table_view_controller_unittest.mm" ]
+  sources = [
+    "privacy_safe_browsing_mediator_unittest.mm",
+    "privacy_safe_browsing_view_controller_unittest.mm",
+    "privacy_table_view_controller_unittest.mm",
+  ]
   deps = [
+    "//base/test:test_support",
     "//components/handoff",
     "//components/prefs",
+    "//components/prefs:test_support",
     "//components/prefs/ios",
+    "//components/safe_browsing/core/common",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/strings",
     "//components/sync/driver:test_support",
     "//components/sync_preferences",
@@ -122,13 +135,20 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
+    "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/browser/ui/table_view:utils",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
+    "//third_party/ocmock:ocmock",
     "//ui/base",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
index af08982a138..6cf3ad31679 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn
@@ -21,6 +21,7 @@ source_set("safe_browsing") {
     "safe_browsing_standard_protection_mediator.mm",
     "safe_browsing_standard_protection_view_controller.h",
     "safe_browsing_standard_protection_view_controller.mm",
+    "safe_browsing_standard_protection_view_controller_delegate.h",
   ]
   deps = [
     "resources:bar_chart",
@@ -28,18 +29,26 @@ source_set("safe_browsing") {
     "resources:globe",
     "resources:key",
     "resources:shield",
+    "//components/password_manager/core/common",
     "//components/prefs",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/signin/public/identity_manager/objc",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:application_context",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/net:crurl",
+    "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/resources:settings_safe_browsing",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
index e7470a39f10..ab9cd3f1412 100644
--- a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -11,6 +11,7 @@ source_set("safety_check_ui") {
     "safety_check_consumer.h",
     "safety_check_navigation_commands.h",
     "safety_check_service_delegate.h",
+    "safety_check_table_view_controller.h",
   ]
   public_deps = [
     "//components/strings",
@@ -67,6 +68,7 @@ source_set("safety_check") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/resources:legacy_password_key",
     "//ios/chrome/browser/ui/resources:password_key",
     "//ios/chrome/browser/ui/settings:settings_root",
@@ -75,6 +77,7 @@ source_set("safety_check") {
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/password",
+    "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:utils",
@@ -82,6 +85,7 @@ source_set("safety_check") {
     "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/table_view:cells_constants",
@@ -122,7 +126,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/upgrade:public",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn
index 12e6612fc34..e5d1d96f137 100644
--- a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn
@@ -60,16 +60,24 @@ source_set("unit_tests") {
     ":start_surface",
     "//base",
     "//base/test:test_support",
+    "//components/favicon/ios",
+    "//ios/chrome/app:app_internal",
+    "//ios/chrome/app/application_delegate:app_state_header",
+    "//ios/chrome/app/application_delegate:application_delegate_internal",
+    "//ios/chrome/app/application_delegate:test_support",
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/main:browser_interface_provider",
     "//ios/chrome/browser/ui/main:scene",
     "//ios/chrome/browser/ui/main/test",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:test_support",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
+    "//third_party/ocmock",
   ]
 }
 
@@ -84,10 +92,13 @@ source_set("eg2_tests") {
 
   deps = [
     ":feature_flags",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
     "//net:test_support",
+    "//ui/base",
   ]
 
   frameworks = [ "UIKit.framework" ]
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 47348ce2b4f..5826e635194 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
@@ -34,7 +34,6 @@ source_set("tab_grid") {
     "//ios/chrome/browser/commerce:commerce",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/main",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
@@ -146,6 +145,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/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
@@ -156,7 +156,7 @@ source_set("tab_grid_ui") {
     "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/thumb_strip:public",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/util",
     "//ios/web/public",
     "//ui/base",
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 a9e383181ef..315bc267479 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
@@ -64,6 +64,7 @@ source_set("grid_ui") {
     "//ios/chrome/browser/ui/commerce:price_card",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands",
     "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui",
     "//ios/chrome/browser/ui/menu",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
index 35c02ef1c89..40119dc7f81 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_strip/BUILD.gn
@@ -39,6 +39,7 @@ source_set("tab_strip_ui") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/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 fa23896eaa5..112102a2fc6 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -26,6 +26,7 @@ source_set("cells") {
     "table_view_info_button_cell.mm",
     "table_view_info_button_item.h",
     "table_view_info_button_item.mm",
+    "table_view_info_button_item_delegate.h",
     "table_view_item.h",
     "table_view_item.mm",
     "table_view_link_header_footer_item.h",
@@ -67,17 +68,20 @@ source_set("cells") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/colors:colors",
     "//ios/chrome/browser/ui/elements",
+    "//ios/chrome/browser/ui/icons:item_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/resources",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
+    "//ios/chrome/common:string_util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/table_view",
     "//ios/chrome/common/ui/table_view:cells_constants",
     "//ios/chrome/common/ui/util",
+    "//ios/chrome/common/ui/util:image_util",
     "//ios/third_party/material_components_ios",
     "//net",
     "//ui/base",
@@ -108,6 +112,8 @@ source_set("unit_tests") {
     "//components/url_formatter",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/icons:item_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/table_view:cells_constants",
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index 296c3c86fb1..21ad0538339 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -53,6 +53,7 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/ntp:logo",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index 10148cfd557..8fdfbf09481 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -39,7 +39,6 @@ source_set("toolbar") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/overlays",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -51,6 +50,8 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/icons:infobar_icons",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/menu",
     "//ios/chrome/browser/ui/ntp",
@@ -105,6 +106,7 @@ source_set("toolbar_ui") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/gestures",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp:ntp",
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu/public",
@@ -150,7 +152,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy:policy_util",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/ui/commands",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
index a164fd53ae0..a49dc16b1eb 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
@@ -43,9 +43,9 @@ source_set("buttons") {
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
diff --git a/chromium/ios/chrome/browser/ui/upgrade/BUILD.gn b/chromium/ios/chrome/browser/ui/upgrade/BUILD.gn
new file mode 100644
index 00000000000..f0ab3402426
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/upgrade/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2022 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("upgrade") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "upgrade_center_browser_agent.h",
+    "upgrade_center_browser_agent.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/upgrade/utils:features",
+    "//ios/chrome/browser/web_state_list",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index 1ad292c61e0..dde7947e471 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -57,7 +57,6 @@ source_set("util") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/util",
     "//ios/chrome/common/ui/util:dynamic_type_util",
@@ -79,7 +78,12 @@ source_set("util") {
 
 swift_source_set("util_swift") {
   bridge_header = "util_swift_bridge.h"
-  sources = [ "UIView+WindowObserving.swift" ]
+  sources = [
+    "UIView+WindowCoordinates.swift",
+    "UIView+WindowObserving.swift",
+    "frame_layout_guide.swift",
+    "layout_guide_center.swift",
+  ]
   deps = [ ":crbug_1316061" ]
   frameworks = [ "UIKit.framework" ]
 }
@@ -105,7 +109,10 @@ source_set("terms_util") {
   deps = [
     ":terms_resources",
     "//base",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ui/base",
+    "//url",
   ]
 }
 
@@ -123,12 +130,15 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "force_touch_long_press_gesture_recognizer_unittest.mm",
+    "frame_layout_guide_unittest.mm",
+    "layout_guide_center_unittest.mm",
     "named_guide_unittest.mm",
     "optional_property_animator_unittest.mm",
     "pasteboard_util_unittest.mm",
     "terms_util_unittest.mm",
     "ui_util_unittest.mm",
     "uikit_ui_util_unittest.mm",
+    "uiview_window_coordinates_unittest.mm",
     "uiview_window_observing_unittest.mm",
   ]
   deps = [
@@ -136,6 +146,7 @@ source_set("unit_tests") {
     ":util",
     ":util_swift",
     "//base",
+    "//base/test:test_support",
     "//ios/third_party/material_components_ios",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
index c769683aad7..a055fca1ca6 100644
--- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
@@ -116,11 +116,11 @@ source_set("webui_internal") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/omaha",
-    "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/webui/gcm",
     "//ios/chrome/browser/ui/webui/interstitials",
+    "//ios/chrome/browser/ui/webui/local_state",
     "//ios/chrome/browser/ui/webui/net_export",
     "//ios/chrome/browser/ui/webui/policy",
     "//ios/chrome/browser/ui/webui/translate_internals",
diff --git a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
index 00f434e4eb7..a6026c45afc 100644
--- a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn
@@ -26,6 +26,7 @@ source_set("interstitials") {
     "//ios/chrome/browser/safe_browsing",
     "//ios/chrome/browser/ssl",
     "//ios/components/security_interstitials",
+    "//ios/components/security_interstitials/safe_browsing",
     "//ios/web/public/security",
     "//ios/web/public/webui",
     "//net",
diff --git a/chromium/ios/chrome/browser/ui/webui/local_state/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/local_state/BUILD.gn
new file mode 100644
index 00000000000..c9718204df2
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/webui/local_state/BUILD.gn
@@ -0,0 +1,20 @@
+# Copyright 2022 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("local_state") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "local_state_ui.h",
+    "local_state_ui.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/local_state",
+    "//components/prefs",
+    "//components/resources",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/web/public/webui",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/upgrade/BUILD.gn b/chromium/ios/chrome/browser/upgrade/BUILD.gn
index e7f8af9567a..900ee79a246 100644
--- a/chromium/ios/chrome/browser/upgrade/BUILD.gn
+++ b/chromium/ios/chrome/browser/upgrade/BUILD.gn
@@ -7,6 +7,8 @@ source_set("upgrade") {
   sources = [
     "upgrade_center.h",
     "upgrade_center.mm",
+    "upgrade_center_browser_agent.h",
+    "upgrade_center_browser_agent.mm",
     "upgrade_recommended_details.h",
   ]
   deps = [
@@ -16,8 +18,12 @@ source_set("upgrade") {
     "//components/infobars/core",
     "//components/version_info",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
     "//ios/web/common",
     "//net",
     "//ui/base",
@@ -42,10 +48,19 @@ source_set("public") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "upgrade_center_unittest.mm" ]
+  sources = [
+    "upgrade_center_browser_agent_unittest.mm",
+    "upgrade_center_unittest.mm",
+  ]
   deps = [
     ":upgrade",
     "//base",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/upgrade/test",
+    "//ios/chrome/browser/web_state_list:web_state_list",
+    "//ios/web/public/test:test",
+    "//ios/web/public/test/fakes:fakes",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/ios/chrome/browser/upgrade/test/BUILD.gn b/chromium/ios/chrome/browser/upgrade/test/BUILD.gn
new file mode 100644
index 00000000000..445b0ffe054
--- /dev/null
+++ b/chromium/ios/chrome/browser/upgrade/test/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2022 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("test") {
+  testonly = true
+  sources = [
+    "fake_upgrade_center.h",
+    "fake_upgrade_center.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/upgrade",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 79bc8508159..70bce04b59f 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
+import("//ios/web/public/js_messaging/optimize_js.gni")
 
 source_set("web") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -195,14 +195,11 @@ source_set("unit_tests") {
   ]
 }
 
-js_compile_bundle("chrome_bundle_main_frame") {
-  closure_entry_point = "__crWeb.chromeBundleMainFrame"
-  sources = [
-    "//components/translate/ios/browser/resources/language_detection.js",
-    "//third_party/text-fragments-polyfill/src/src/fragment-generation-utils.js",
-    "//third_party/text-fragments-polyfill/src/src/text-fragment-utils.js",
-    "resources/chrome_bundle_main_frame.js",
-  ]
+optimize_js("chrome_bundle_main_frame") {
+  primary_script =
+      "//components/translate/ios/browser/resources/language_detection.js"
+  sources =
+      [ "//components/translate/ios/browser/resources/language_detection.js" ]
 }
 
 source_set("web_internal") {
@@ -234,6 +231,7 @@ source_set("web_internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/follow",
+    "//ios/chrome/browser/https_upgrades",
     "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/passwords",
@@ -245,7 +243,6 @@ source_set("web_internal") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/infobars/coordinators",
-    "//ios/chrome/browser/ui/infobars/resources:infobar_popup_blocker",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/browser/web/font_size",
@@ -346,8 +343,6 @@ source_set("eg_test_support+eg2") {
   testonly = true
 
   sources = [
-    "https_only_mode_app_interface.h",
-    "https_only_mode_app_interface_stub.mm",
     "lookalike_url_app_interface.h",
     "lookalike_url_app_interface_stub.mm",
     "progress_indicator_app_interface.h",
@@ -368,8 +363,6 @@ source_set("eg_app_support+eg2") {
   testonly = true
 
   sources = [
-    "https_only_mode_app_interface.h",
-    "https_only_mode_app_interface.mm",
     "lookalike_url_app_interface.h",
     "lookalike_url_app_interface.mm",
     "progress_indicator_app_interface.h",
@@ -379,9 +372,10 @@ source_set("eg_app_support+eg2") {
   deps = [
     ":constants",
     "//base",
+    "//components/content_settings/core/browser",
     "//components/lookalikes/core",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/test/app:test_support",
-    "//ios/components/security_interstitials/https_only_mode",
     "//ios/components/security_interstitials/lookalikes",
     "//ios/testing/earl_grey:eg_app_support+eg2",
     "//ios/third_party/earl_grey2:app_framework+link",
@@ -407,7 +401,6 @@ source_set("eg2_tests") {
     "error_page_egtest.mm",
     "forms_egtest.mm",
     "http_auth_egtest.mm",
-    "https_only_mode_egtest.mm",
     "js_print_egtest.mm",
     "lookalike_url_egtest.mm",
     "navigation_egtest.mm",
@@ -433,6 +426,7 @@ source_set("eg2_tests") {
     "//components/version_info:version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser:chrome_url_constants",
+    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/metrics:eg_test_support+eg2",
     "//ios/chrome/browser/ui/infobars/banners:public",
     "//ios/chrome/browser/ui/popup_menu:constants",
@@ -441,7 +435,6 @@ source_set("eg2_tests") {
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
-    "//ios/components/security_interstitials/https_only_mode:feature",
     "//ios/net:test_support",
     "//ios/testing:embedded_test_server_support",
     "//ios/testing/earl_grey:eg_test_support+eg2",
diff --git a/chromium/ios/chrome/browser/web/font_size/BUILD.gn b/chromium/ios/chrome/browser/web/font_size/BUILD.gn
index aea5d3824da..85a6f649191 100644
--- a/chromium/ios/chrome/browser/web/font_size/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/font_size/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
+import("//ios/web/public/js_messaging/optimize_js.gni")
 
 source_set("font_size") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -30,13 +30,13 @@ source_set("font_size") {
   public_deps = [ "//ios/web/public/js_messaging" ]
 }
 
-js_compile_bundle("font_size_js") {
+optimize_js("font_size_js") {
   visibility = [
     ":font_size",
     ":unit_tests",
   ]
-  closure_entry_point = "__crWeb.font_size"
 
+  primary_script = "resources/font_size.js"
   sources = [ "resources/font_size.js" ]
 }
 
diff --git a/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn b/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn
index b9655879cfe..2386e1513b0 100644
--- a/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/image_fetch/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
+import("//ios/web/public/js_messaging/optimize_js.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 source_set("image_fetch") {
@@ -24,13 +24,13 @@ source_set("image_fetch") {
   ]
 }
 
-js_compile_bundle("image_fetch_js") {
+optimize_js("image_fetch_js") {
   visibility = [
     ":image_fetch",
     ":unit_tests",
   ]
-  closure_entry_point = "__crWeb.imageFetch"
 
+  primary_script = "resources/image_fetch.js"
   sources = [ "resources/image_fetch.js" ]
 }
 
diff --git a/chromium/ios/chrome/browser/web/print/BUILD.gn b/chromium/ios/chrome/browser/web/print/BUILD.gn
index 63822bc0c50..bf219a41857 100644
--- a/chromium/ios/chrome/browser/web/print/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/print/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/web/js_compile.gni")
+import("//ios/web/public/js_messaging/optimize_ts.gni")
 
 source_set("print") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -47,9 +47,10 @@ source_set("unit_tests") {
   ]
 }
 
-js_compile_bundle("print_js") {
+optimize_ts("print_js") {
   visibility = [ ":print" ]
-  closure_entry_point = "__crWeb.print"
 
-  sources = [ "resources/print.js" ]
+  sources = [ "resources/print.ts" ]
+
+  deps = [ "//ios/web/public/js_messaging:util_scripts" ]
 }
diff --git a/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn b/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
index ed1e2adc894..50afbe876a4 100644
--- a/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/web_performance_metrics/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//ios/build/config.gni")
-import("//ios/web/js_compile.gni")
+import("//ios/web/public/js_messaging/optimize_js.gni")
 
 source_set("web_performance_metrics") {
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -39,9 +39,9 @@ source_set("unit_tests") {
   sources = [ "web_performance_metrics_java_script_feature_unittest.mm" ]
 }
 
-js_compile_bundle("web_performance_metrics_js") {
+optimize_js("web_performance_metrics_js") {
   visibility = [ ":web_performance_metrics" ]
-  closure_entry_point = "__crWeb.webPerformanceMetrics"
 
+  primary_script = "resources/web_performance_metrics.js"
   sources = [ "resources/web_performance_metrics.js" ]
 }
diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
index 9220b1c6d49..3762c8a76ab 100644
--- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
@@ -73,6 +73,8 @@ source_set("agents") {
     "//base",
     "//components/navigation_metrics",
     "//components/profile_metrics",
+    "//components/url_param_filter/core",
+    "//components/url_param_filter/ios",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state_metrics",