BASELINE: Update Chromium to 87.0.4280.67

Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-11-18 16:35:47 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-11-18 15:45:54 +0000
commit: 32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch)
tree: eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/ios/chrome/browser
parent: 99677208ff3b216fdfec551fbe548da5520cd6fb (diff)
download: qtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz
83 files changed, 866 insertions, 222 deletions
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index 9b5eb011fd4..35df37c6699 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -101,14 +101,11 @@ source_set("browser") {
     "//ios/chrome/browser/complex_tasks",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/itunes_urls",
-    "//ios/chrome/browser/signin:feature_flags",
-    "//ios/chrome/browser/ssl:feature_flags",
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/omnibox",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/chrome/common",
@@ -153,7 +150,6 @@ source_set("utils") {
     "//components/password_manager/core/common",
     "//components/variations",
     "//ios/chrome/browser/browsing_data:feature_flags",
-    "//ios/chrome/browser/passwords:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
   ]
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index 6389a64c3dd..ee03f0ba793 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -551,7 +551,7 @@ source_set("eg2_tests") {
     "//ios/web/public",
     "//ios/web/public/deprecated",
     "//ios/web/public/test:element_selector",
-    "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
   frameworks = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 9b29910b08e..0daf288c5ab 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -117,6 +117,8 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/safe_browsing",
+    "//ios/chrome/browser/screen_time",
+    "//ios/chrome/browser/screen_time:feature_flags",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/sessions",
diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
index 1f28c31735f..c713bac86d5 100644
--- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
@@ -29,6 +29,8 @@ source_set("browsing_data") {
     "browsing_data_remover_observer.h",
     "browsing_data_remover_observer_bridge.h",
     "browsing_data_remover_observer_bridge.mm",
+    "sessions_storage_util.h",
+    "sessions_storage_util.mm",
   ]
   deps = [
     ":counters",
@@ -138,11 +140,13 @@ source_set("test_support") {
     "fake_browsing_data_remover.mm",
     "fake_browsing_data_remover_observer.h",
     "fake_browsing_data_remover_observer.mm",
+    "session_storage_util_unittest.mm",
   ]
 
   deps = [
     ":browsing_data",
     "//base",
+    "//testing/gtest",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn
index ba25345b628..af41753700e 100644
--- a/chromium/ios/chrome/browser/crash_report/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn
@@ -22,8 +22,8 @@ source_set("crash_report") {
     "features.h",
     "main_thread_freeze_detector.h",
     "main_thread_freeze_detector.mm",
-    "synthetic_crash_report_util.cc",
     "synthetic_crash_report_util.h",
+    "synthetic_crash_report_util.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -37,6 +37,7 @@ source_set("crash_report") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/crash_report/breadcrumbs",
+    "//ios/chrome/browser/metrics:previous_session_info",
     "//ios/web",
     "//third_party/breakpad:client",
   ]
@@ -74,6 +75,7 @@ source_set("crash_report_internal") {
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
@@ -104,8 +106,10 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/metrics:previous_session_info",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/sessions:session_service",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test/ocmock",
diff --git a/chromium/ios/chrome/browser/credential_provider/BUILD.gn b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
index c13dfdc2189..8a00e1d1b34 100644
--- a/chromium/ios/chrome/browser/credential_provider/BUILD.gn
+++ b/chromium/ios/chrome/browser/credential_provider/BUILD.gn
@@ -17,6 +17,8 @@ source_set("credential_provider") {
     "credential_provider_service_factory.mm",
     "credential_provider_support.cc",
     "credential_provider_support.h",
+    "credential_provider_util.h",
+    "credential_provider_util.mm",
   ]
   deps = [
     ":buildflags",
@@ -30,6 +32,7 @@ source_set("credential_provider") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/common/app_group",
     "//ios/chrome/common/credential_provider",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/device_sharing/BUILD.gn b/chromium/ios/chrome/browser/device_sharing/BUILD.gn
index 6d2231bb009..f9388682f8f 100644
--- a/chromium/ios/chrome/browser/device_sharing/BUILD.gn
+++ b/chromium/ios/chrome/browser/device_sharing/BUILD.gn
@@ -95,8 +95,8 @@ source_set("eg2_tests") {
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
-    "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
     "//url",
   ]
 
diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn
index 07664d3009d..db054b3aa64 100644
--- a/chromium/ios/chrome/browser/flags/BUILD.gn
+++ b/chromium/ios/chrome/browser/flags/BUILD.gn
@@ -47,8 +47,9 @@ source_set("flags") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
     "//ios/chrome/browser/drag_and_drop",
-    "//ios/chrome/browser/passwords:feature_flags",
+    "//ios/chrome/browser/open_in:features",
     "//ios/chrome/browser/policy:feature_flags",
+    "//ios/chrome/browser/screen_time:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/download:features",
@@ -56,8 +57,8 @@ source_set("flags") {
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/settings/autofill:feature_flags",
+    "//ios/chrome/browser/ui/tab_grid:features",
     "//ios/chrome/browser/ui/table_view:feature_flags",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
     "//ios/chrome/browser/web:feature_flags",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/geolocation/BUILD.gn b/chromium/ios/chrome/browser/geolocation/BUILD.gn
index c273fe05293..08e9aaf5f3f 100644
--- a/chromium/ios/chrome/browser/geolocation/BUILD.gn
+++ b/chromium/ios/chrome/browser/geolocation/BUILD.gn
@@ -18,6 +18,7 @@ source_set("geolocation") {
     "omnibox_geolocation_config.mm",
     "omnibox_geolocation_local_state.h",
     "omnibox_geolocation_local_state.mm",
+    "omnibox_geolocation_tab_helper.h",
   ]
   deps = [
     "//base",
@@ -28,6 +29,7 @@ source_set("geolocation") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/util",
     "//ios/public/provider/chrome/browser",
+    "//ios/web/public",
     "//ui/base",
     "//url",
   ]
@@ -72,6 +74,7 @@ source_set("geolocation_internal") {
     "omnibox_geolocation_controller+Testing.h",
     "omnibox_geolocation_controller.h",
     "omnibox_geolocation_controller.mm",
+    "omnibox_geolocation_tab_helper.mm",
   ]
   deps = [
     ":geolocation",
@@ -79,8 +82,10 @@ source_set("geolocation_internal") {
     "//components/google/core/common",
     "//components/version_info",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/tabs",
     "//ios/web",
+    "//ios/web/public/navigation",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
index 3272002eb84..30e69dd0d78 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
@@ -109,6 +109,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
     "//ios/chrome/browser/infobars/test",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/overlays",
diff --git a/chromium/ios/chrome/browser/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/link_to_text/BUILD.gn
new file mode 100644
index 00000000000..1006f362d7c
--- /dev/null
+++ b/chromium/ios/chrome/browser/link_to_text/BUILD.gn
@@ -0,0 +1,51 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("link_to_text") {
+  sources = [
+    "link_to_text_payload.h",
+    "link_to_text_payload.mm",
+    "link_to_text_response.h",
+    "link_to_text_response.mm",
+    "link_to_text_tab_helper.h",
+    "link_to_text_tab_helper.mm",
+  ]
+  deps = [
+    ":internal",
+    "//components/shared_highlighting/core/common",
+    "//ios/chrome/browser/tabs",
+    "//ios/web/public",
+    "//ios/web/public/js_messaging",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("internal") {
+  sources = [
+    "link_generation_outcome.h",
+    "link_to_text_utils.h",
+    "link_to_text_utils.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/shared_highlighting/core/common",
+    "//ios/web/public",
+    "//ios/web/public/ui",
+    "//url",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "link_to_text_utils_unittest.mm" ]
+  deps = [
+    ":internal",
+    ":link_to_text",
+    "//base",
+    "//testing/gtest",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn
index cf9dd667b6f..2606682bca3 100644
--- a/chromium/ios/chrome/browser/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/main/BUILD.gn
@@ -62,6 +62,7 @@ source_set("main") {
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
+    "//ios/chrome/browser/web_state_list:session_metrics",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
     "//ios/public/provider/chrome/browser",
   ]
@@ -104,6 +105,7 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index 2a9f2f1ce88..bf8347f6744 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -41,13 +41,11 @@ source_set("metrics") {
     "mobile_session_shutdown_metrics_provider.mm",
     "pageload_foreground_duration_tab_helper.h",
     "pageload_foreground_duration_tab_helper.mm",
-    "previous_session_info.h",
-    "previous_session_info.mm",
-    "previous_session_info_private.h",
   ]
   public_deps = [ "//components/ukm/ios:ukm_url_recorder" ]
   deps = [
     ":chrome_browser_state_client",
+    ":previous_session_info",
     "//base",
     "//components/browser_sync",
     "//components/crash/core/common",
@@ -80,7 +78,7 @@ source_set("metrics") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/translate",
-    "//ios/chrome/browser/ui/util:multiwindow_util",
+    "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/variations",
     "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory",
@@ -94,6 +92,20 @@ source_set("metrics") {
   ]
 }
 
+source_set("previous_session_info") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "previous_session_info.h",
+    "previous_session_info.mm",
+    "previous_session_info_private.h",
+  ]
+  public_deps = [ "//components/ukm/ios:ukm_url_recorder" ]
+  deps = [
+    "//components/version_info",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -110,6 +122,7 @@ source_set("unit_tests") {
   deps = [
     ":chrome_browser_state_client",
     ":metrics",
+    ":previous_session_info",
     "//base",
     "//base/test:test_support",
     "//build:branding_buildflags",
@@ -144,6 +157,7 @@ source_set("metrics_browser_agent") {
   deps = [
     ":metrics",
     ":metrics_internal",
+    ":previous_session_info",
     ":tab_usage_recorder_metrics",
     "//base",
     "//components/google/core/common",
@@ -218,6 +232,7 @@ source_set("unit_tests_internal") {
     ":metrics",
     ":metrics_browser_agent",
     ":metrics_internal",
+    ":previous_session_info",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/main:test_support",
@@ -267,10 +282,6 @@ source_set("eg2_tests") {
 import("//components/metrics/generate_expired_histograms_array.gni")
 
 generate_expired_histograms_array("expired_histograms_array") {
-  inputs = [
-    "//tools/metrics/histograms/histograms.xml",
-    "//tools/metrics/histograms/enums.xml",
-  ]
   namespace = ""
   header_filename = "ios_expired_histograms_array.h"
   major_branch_date_filepath = "//chrome/MAJOR_BRANCH_DATE"
@@ -289,6 +300,8 @@ source_set("eg_app_support+eg2") {
     "metrics_app_interface.mm",
   ]
   deps = [
+    ":metrics",
+    ":metrics_internal",
     "//base",
     "//base/test:test_support",
     "//components/metrics",
@@ -300,8 +313,6 @@ source_set("eg_app_support+eg2") {
     "//components/ukm:ukm_test_helper",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/metrics",
-    "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/test/app:test_support",
     "//ios/testing:nserror_support",
     "//third_party/metrics_proto",
diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
index d86ca0055b7..2db5ebb119b 100644
--- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
+++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
@@ -5,8 +5,6 @@
 source_set("ntp_snippets") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "content_suggestions_scheduler_notifications.h",
-    "content_suggestions_scheduler_notifications.mm",
     "ios_chrome_content_suggestions_service_factory.cc",
     "ios_chrome_content_suggestions_service_factory.h",
     "ios_chrome_content_suggestions_service_factory_util.cc",
diff --git a/chromium/ios/chrome/browser/omaha/BUILD.gn b/chromium/ios/chrome/browser/omaha/BUILD.gn
index 8cf69be5d26..2fb3799e616 100644
--- a/chromium/ios/chrome/browser/omaha/BUILD.gn
+++ b/chromium/ios/chrome/browser/omaha/BUILD.gn
@@ -22,6 +22,7 @@ source_set("omaha") {
     "//ios/chrome/browser/browser_state_metrics",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/omaha",
@@ -44,6 +45,8 @@ source_set("unit_tests") {
     "//components/version_info",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
     "//ios/chrome/test:test_support",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/open_in/BUILD.gn b/chromium/ios/chrome/browser/open_in/BUILD.gn
index ddb91f7a373..fe01f6d3267 100644
--- a/chromium/ios/chrome/browser/open_in/BUILD.gn
+++ b/chromium/ios/chrome/browser/open_in/BUILD.gn
@@ -12,21 +12,33 @@ source_set("open_in") {
     "open_in_tab_helper_delegate.h",
   ]
   deps = [
+    ":features",
     "//base",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/web/public",
     "//ui/base:base",
     "//url",
   ]
 }
 
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  deps = [ "//base" ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [ "open_in_tab_helper_unittest.mm" ]
   deps = [
+    ":features",
     ":open_in",
     "//base",
     "//base/test:test_support",
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index e8c655e6fe0..2ec28a5fe00 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -7,8 +7,6 @@ import("//ios/web/js_compile.gni")
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "credential_manager.h",
-    "credential_manager.mm",
     "ios_chrome_bulk_leak_check_service_factory.cc",
     "ios_chrome_bulk_leak_check_service_factory.h",
     "ios_chrome_change_password_url_service_factory.cc",
@@ -23,14 +21,10 @@ source_set("passwords") {
     "ios_chrome_password_manager_driver.mm",
     "ios_chrome_password_store_factory.cc",
     "ios_chrome_password_store_factory.h",
-    "ios_chrome_update_password_infobar_delegate.h",
-    "ios_chrome_update_password_infobar_delegate.mm",
     "ios_password_infobar_controller.h",
     "ios_password_infobar_controller.mm",
     "ios_password_requirements_service_factory.cc",
     "ios_password_requirements_service_factory.h",
-    "js_credential_manager.h",
-    "js_credential_manager.mm",
     "notify_auto_signin_view_controller.h",
     "notify_auto_signin_view_controller.mm",
     "password_check_observer_bridge.h",
@@ -45,8 +39,6 @@ source_set("passwords") {
     "password_tab_helper.mm",
     "save_passwords_consumer.h",
     "save_passwords_consumer.mm",
-    "update_password_infobar_controller.h",
-    "update_password_infobar_controller.mm",
     "well_known_change_password_tab_helper.h",
     "well_known_change_password_tab_helper.mm",
   ]
@@ -110,10 +102,7 @@ source_set("passwords") {
     "//ui/base",
     "//url",
   ]
-  public_deps = [
-    ":feature_flags",
-    ":passwords_generation_utils",
-  ]
+  public_deps = [ ":passwords_generation_utils" ]
 
   allow_circular_includes_from = [ ":passwords_generation_utils" ]
 }
@@ -148,15 +137,6 @@ source_set("public") {
   deps = [ "//base" ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "password_manager_features.cc",
-    "password_manager_features.h",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("passwords_generation_utils") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -171,10 +151,8 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "credential_manager_unittest.mm",
     "ios_chrome_password_check_manager_unittest.mm",
     "ios_chrome_password_manager_client_unittest.mm",
-    "js_credential_manager_unittest.mm",
     "password_controller_js_unittest.mm",
     "password_controller_unittest.mm",
     "well_known_change_password_tab_helper_unittest.mm",
@@ -196,13 +174,10 @@ source_set("unit_tests") {
     "//components/prefs",
     "//components/prefs:test_support",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
-    "//components/security_state/ios",
     "//components/ukm:test_support",
-    "//google_apis",
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords/test",
-    "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/web:test_support",
@@ -210,7 +185,6 @@ source_set("unit_tests") {
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/js_messaging",
-    "//ios/web/public/security",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net:test_support",
@@ -228,10 +202,8 @@ source_set("eg2_tests") {
     "//build/config/ios:xctest_config",
   ]
   testonly = true
-  sources = [ "credential_manager_egtest.mm" ]
   deps = [
     ":eg_test_support+eg2",
-    ":feature_flags",
     "//base",
     "//base/test:test_support",
     "//components/password_manager/core/common",
diff --git a/chromium/ios/chrome/browser/policy/BUILD.gn b/chromium/ios/chrome/browser/policy/BUILD.gn
index 6e4c866f83a..b3296e95232 100644
--- a/chromium/ios/chrome/browser/policy/BUILD.gn
+++ b/chromium/ios/chrome/browser/policy/BUILD.gn
@@ -40,6 +40,7 @@ source_set("policy") {
     "//components/bookmarks/common",
     "//components/bookmarks/managed",
     "//components/enterprise",
+    "//components/metrics",
     "//components/password_manager/core/common",
     "//components/policy:generated",
     "//components/policy/core/common",
@@ -116,8 +117,8 @@ source_set("test_support") {
 
 bundle_data("test_resources") {
   visibility = [
-    ":unit_tests",
     ":eg2_tests",
+    ":unit_tests",
   ]
   testonly = true
   sources = [ "//ios/chrome/test/data/policy/policy_test_cases.json" ]
@@ -132,6 +133,7 @@ source_set("unit_tests") {
   sources = [
     "browser_dm_token_storage_ios_unittest.mm",
     "policy_unittest.mm",
+    "reporting/browser_report_generator_ios_unittest.mm",
   ]
   deps = [
     ":policy",
@@ -145,6 +147,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/prefs",
+    "//ios/chrome/test:test_support",
     "//testing/gtest",
   ]
 }
@@ -170,10 +173,15 @@ source_set("eg2_tests") {
     "//components/policy:generated",
     "//components/policy/core/common:common_constants",
     "//components/strings",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/translate:eg_test_support+eg2",
     "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/settings:constants",
+    "//ios/chrome/browser/ui/settings/elements:constants",
+    "//ios/chrome/browser/ui/settings/password:password_constants",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index a9b264d4294..86bcb7325c9 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -77,9 +77,11 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/memory",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/net",
+    "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:constants",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index 3342f6f43d7..f5d7eb810bd 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -2,6 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+source_set("prerender_pref") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  public = [ "prerender_pref.h" ]
+  sources = [ "prerender_pref.mm" ]
+
+  deps = [
+    "//base",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//ios/chrome/browser:pref_names",
+  ]
+}
+
 source_set("prerender") {
   configs += [ "//build/config/compiler:enable_arc" ]
   public = [
@@ -20,6 +33,7 @@ source_set("prerender") {
   friend = [ ":unit_tests" ]
 
   deps = [
+    ":prerender_pref",
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
@@ -69,6 +83,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":prerender",
+    ":prerender_pref",
     "//base",
     "//components/prefs",
     "//ios/chrome/browser",
diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn
index 39ba17c8e37..f4da761f1de 100644
--- a/chromium/ios/chrome/browser/providers/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/BUILD.gn
@@ -12,6 +12,8 @@ source_set("providers") {
     "chromium_logo_controller.mm",
     "chromium_spotlight_provider.h",
     "chromium_spotlight_provider.mm",
+    "chromium_text_zoom_provider.h",
+    "chromium_text_zoom_provider.mm",
     "chromium_voice_search_provider.h",
     "chromium_voice_search_provider.mm",
   ]
@@ -19,6 +21,7 @@ source_set("providers") {
     "//base",
     "//ios/chrome/browser/providers/images",
     "//ios/chrome/browser/providers/signin",
+    "//ios/chrome/browser/web:feature_flags",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/discover_feed",
     "//ios/public/provider/chrome/browser/distribution",
@@ -27,6 +30,7 @@ source_set("providers") {
     "//ios/public/provider/chrome/browser/ui",
     "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/public/provider/chrome/browser/voice",
+    "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
index 73d5d3ac80a..8f938834f2b 100644
--- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
@@ -122,6 +122,7 @@ source_set("eg2_tests") {
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/strings:components_strings_grit",
+    "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
@@ -168,6 +169,7 @@ source_set("unit_tests") {
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
     "//components/safe_browsing/core/db:v4_test_util",
     "//components/safe_browsing/ios/browser:allow_list",
+    "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
diff --git a/chromium/ios/chrome/browser/screen_time/BUILD.gn b/chromium/ios/chrome/browser/screen_time/BUILD.gn
new file mode 100644
index 00000000000..07936d778b1
--- /dev/null
+++ b/chromium/ios/chrome/browser/screen_time/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/ios_sdk.gni")
+
+source_set("screen_time") {
+  # TODO(crbug.com/1123704): remove when it is recommended to build Chromium
+  # with version 12.0 or later of Xcode.
+  if (xcode_version_int >= 1200) {
+    sources = [
+      "screen_time_history_deleter.h",
+      "screen_time_history_deleter.mm",
+      "screen_time_history_deleter_factory.h",
+      "screen_time_history_deleter_factory.mm",
+    ]
+    configs += [ "//build/config/compiler:enable_arc" ]
+    deps = [
+      "//base",
+      "//components/history/core/browser",
+      "//components/keyed_service/core",
+      "//components/keyed_service/ios",
+      "//ios/chrome/browser/browser_state",
+      "//ios/chrome/browser/history",
+      "//net",
+    ]
+  }
+}
+
+source_set("feature_flags") {
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  deps = [ "//base" ]
+}
diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn
index f10b73c9a8f..844701f5473 100644
--- a/chromium/ios/chrome/browser/sessions/BUILD.gn
+++ b/chromium/ios/chrome/browser/sessions/BUILD.gn
@@ -55,7 +55,7 @@ source_set("restoration_agent") {
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/metrics",
+    "//ios/chrome/browser/metrics:previous_session_info",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:page_placeholder",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 9a3e347524f..272e9d132ba 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -28,8 +28,6 @@ source_set("signin") {
     "gaia_auth_fetcher_ios_bridge.mm",
     "gaia_auth_fetcher_ios_ns_url_session_bridge.h",
     "gaia_auth_fetcher_ios_ns_url_session_bridge.mm",
-    "gaia_auth_fetcher_ios_wk_webview_bridge.h",
-    "gaia_auth_fetcher_ios_wk_webview_bridge.mm",
     "identity_manager_factory.cc",
     "identity_manager_factory.h",
     "identity_manager_factory_observer.h",
@@ -49,7 +47,6 @@ source_set("signin") {
     "signin_util.mm",
   ]
   deps = [
-    ":feature_flags",
     "//base",
     "//components/browser_sync",
     "//components/content_settings/core/browser",
@@ -86,15 +83,6 @@ source_set("signin") {
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "feature_flags.h",
-    "feature_flags.mm",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -132,7 +120,6 @@ source_set("unit_tests") {
     "signin_browser_state_info_updater_unittest.mm",
   ]
   deps = [
-    ":feature_flags",
     ":signin",
     ":test_support",
     "//base",
diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn
index e9e04bb89ca..4d0d494e359 100644
--- a/chromium/ios/chrome/browser/snapshots/BUILD.gn
+++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn
@@ -33,6 +33,7 @@ source_set("snapshots") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/third_party/webkit",
diff --git a/chromium/ios/chrome/browser/ssl/BUILD.gn b/chromium/ios/chrome/browser/ssl/BUILD.gn
index 2c95a6857e4..81f0a1aa9e1 100644
--- a/chromium/ios/chrome/browser/ssl/BUILD.gn
+++ b/chromium/ios/chrome/browser/ssl/BUILD.gn
@@ -9,8 +9,6 @@ source_set("ssl") {
     "captive_portal_detector_tab_helper.mm",
     "captive_portal_detector_tab_helper_delegate.h",
     "captive_portal_metrics.h",
-    "captive_portal_metrics_tab_helper.h",
-    "captive_portal_metrics_tab_helper.mm",
     "ios_captive_portal_blocking_page.h",
     "ios_captive_portal_blocking_page.mm",
     "ios_ssl_blocking_page.h",
@@ -19,7 +17,6 @@ source_set("ssl") {
     "ios_ssl_error_handler.mm",
   ]
   deps = [
-    ":feature_flags",
     "//base",
     "//base:i18n",
     "//components/autofill/ios/form_util",
@@ -46,15 +43,6 @@ source_set("ssl") {
   ]
 }
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "captive_portal_features.cc",
-    "captive_portal_features.h",
-  ]
-  deps = [ "//base" ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -63,7 +51,6 @@ source_set("unit_tests") {
     "ios_ssl_error_handler_unittest.mm",
   ]
   deps = [
-    ":feature_flags",
     ":ssl",
     "//base/test:test_support",
     "//components/security_interstitials/core",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index f89f00d1464..eb68965262b 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -29,6 +29,8 @@ source_set("sync") {
     "send_tab_to_self_sync_service_factory.mm",
     "session_sync_service_factory.h",
     "session_sync_service_factory.mm",
+    "sync_invalidations_service_factory.h",
+    "sync_invalidations_service_factory.mm",
     "sync_observer_bridge.h",
     "sync_observer_bridge.mm",
     "sync_setup_service.cc",
@@ -71,6 +73,7 @@ source_set("sync") {
     "//ios/chrome/browser/dom_distiller",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/gcm",
+    "//ios/chrome/browser/gcm/instance_id",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/invalidation",
     "//ios/chrome/browser/passwords",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 930d96abf9c..1796a6e25b2 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -4,6 +4,7 @@
 
 source_set("tabs") {
   sources = [
+    "closing_web_state_observer_browser_agent.h",
     "ios_synced_window_delegate_getter.h",
     "synced_window_delegate_browser_agent.h",
     "tab_helper_delegate_installer.h",
@@ -29,8 +30,7 @@ source_set("tabs") {
 
 source_set("tabs_internal") {
   sources = [
-    "closing_web_state_observer.h",
-    "closing_web_state_observer.mm",
+    "closing_web_state_observer_browser_agent.mm",
     "ios_synced_window_delegate_getter.mm",
     "synced_window_delegate_browser_agent.mm",
     "tab_helper_util.mm",
@@ -48,10 +48,7 @@ source_set("tabs_internal") {
     "//components/favicon/ios",
     "//components/history/core/browser",
     "//components/history/ios/browser",
-    "//components/keyed_service/core",
     "//components/language/ios/browser",
-    "//components/navigation_metrics",
-    "//components/profile_metrics",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_state/ios",
@@ -61,21 +58,20 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/autofill:autofill_internal",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/browser_state_metrics",
     "//ios/chrome/browser/complex_tasks",
-    "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/find_in_page",
-    "//ios/chrome/browser/geolocation:geolocation_internal",
+    "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:badge",
     "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/itunes_urls",
+    "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/network_activity:tab_helper",
@@ -85,17 +81,13 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/policy_url_blocking",
-    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/safe_browsing",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
-    "//ios/chrome/browser/sessions:serialisation",
-    "//ios/chrome/browser/sessions:session_service",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/ssl",
-    "//ios/chrome/browser/ssl:feature_flags",
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/translate",
@@ -105,7 +97,6 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:feature_flags",
-    "//ios/chrome/browser/web:java_script_console",
     "//ios/chrome/browser/web:page_placeholder",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
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 8078435db56..501a0406289 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn
@@ -57,6 +57,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "bookmark_activity_unittest.mm",
+    "copy_activity_unittest.mm",
     "find_in_page_activity_unittest.mm",
     "generate_qr_code_activity_unittest.mm",
     "print_activity_unittest.mm",
@@ -75,6 +76,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/activity_services/data",
     "//ios/chrome/browser/ui/bookmarks:test_support",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/util",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",
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 d17f1222c31..a6d9198eccc 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn
@@ -10,6 +10,8 @@ source_set("data") {
     "chrome_activity_item_source.h",
     "chrome_activity_item_thumbnail_generator.h",
     "chrome_activity_item_thumbnail_generator.mm",
+    "chrome_activity_text_source.h",
+    "chrome_activity_text_source.mm",
     "chrome_activity_url_source.h",
     "chrome_activity_url_source.mm",
     "share_image_data.h",
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index 03f0169a397..027b52eafb3 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -170,6 +170,21 @@ source_set("eg_app_support+eg2") {
   ]
 }
 
+source_set("internal+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  visibility = [ ":*" ]
+  sources = [
+    "signin_earl_grey_app_interface.h",
+    "signin_earl_grey_app_interface_stub.mm",
+  ]
+  deps = [ "//ios/third_party/earl_grey2:test_lib" ]
+}
+
 source_set("eg_test_support+eg2") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
@@ -180,12 +195,11 @@ source_set("eg_test_support+eg2") {
   sources = [
     "signin_earl_grey.h",
     "signin_earl_grey.mm",
-    "signin_earl_grey_app_interface.h",
-    "signin_earl_grey_app_interface_stub.mm",
     "signin_earl_grey_ui.h",
     "signin_earl_grey_ui.mm",
   ]
   deps = [
+    ":internal+eg2",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/app/strings",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
index 44c271d9ccf..2b0c670c683 100644
--- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn
@@ -50,6 +50,7 @@ source_set("signin_impl") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication/signin/add_account_signin",
     "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin",
+    "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin",
     "//ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication",
     "//ios/chrome/browser/ui/authentication/signin/user_signin",
     "//ios/chrome/browser/ui/authentication/signin/user_signin/logging",
@@ -106,6 +107,7 @@ source_set("eg2_tests") {
     "//base/test:test_support",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/public/provider/chrome/browser/signin:constants",
diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn
new file mode 100644
index 00000000000..71d42222e55
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+source_set("consistency_promo_signin") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "consistency_promo_signin_coordinator.h",
+    "consistency_promo_signin_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/authentication/signin:signin_protected",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
+  ]
+  public_deps =
+      [ "//ios/chrome/browser/ui/authentication/signin:signin_headers" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
index 2c3edd1dd1a..4098404e3b4 100644
--- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn
@@ -96,17 +96,22 @@ source_set("badges_popup_menu") {
     ":public",
     "//base",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn
index 8d3df803250..ae69f972150 100644
--- a/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn
@@ -12,7 +12,8 @@ source_set("blocking_overlay") {
   deps = [
     "//base",
     "//ios/chrome/app:blocking_scene_commands",
+    "//ios/chrome/app/strings:ios_strings",
+    "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
-    "//ui/base",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 58d06083c84..eae33d4c2a8 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -5,14 +5,8 @@
 source_set("bookmarks") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "bookmark_edit_view_controller.h",
-    "bookmark_edit_view_controller.mm",
     "bookmark_empty_background.h",
     "bookmark_empty_background.mm",
-    "bookmark_folder_editor_view_controller.h",
-    "bookmark_folder_editor_view_controller.mm",
-    "bookmark_folder_view_controller.h",
-    "bookmark_folder_view_controller.mm",
     "bookmark_home_consumer.h",
     "bookmark_home_mediator.h",
     "bookmark_home_mediator.mm",
@@ -23,56 +17,39 @@ source_set("bookmarks") {
     "bookmark_interaction_controller.h",
     "bookmark_interaction_controller.mm",
     "bookmark_interaction_controller_delegate.h",
-    "bookmark_mediator.h",
-    "bookmark_mediator.mm",
-    "bookmark_model_bridge_observer.h",
-    "bookmark_model_bridge_observer.mm",
     "bookmark_navigation_controller.h",
     "bookmark_navigation_controller.mm",
     "bookmark_navigation_controller_delegate.h",
     "bookmark_navigation_controller_delegate.mm",
-    "bookmark_path_cache.h",
-    "bookmark_path_cache.mm",
     "bookmark_promo_controller.h",
     "bookmark_promo_controller.mm",
     "bookmark_transitioning_delegate.h",
     "bookmark_transitioning_delegate.mm",
-    "bookmark_utils_ios.h",
-    "bookmark_utils_ios.mm",
     "synced_bookmarks_bridge.h",
     "synced_bookmarks_bridge.mm",
-    "undo_manager_bridge_observer.h",
-    "undo_manager_bridge_observer.mm",
-    "undo_manager_wrapper.h",
-    "undo_manager_wrapper.mm",
   ]
   deps = [
     ":bookmarks_ui",
+    ":constants",
+    ":core",
     "resources:bookmark_blue_check",
     "resources:bookmark_blue_folder",
     "resources:bookmark_blue_new_folder",
     "resources:bookmark_empty",
     "resources:bookmark_empty_star",
     "//base",
-    "//base:i18n",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/managed",
-    "//components/browser_sync",
-    "//components/pref_registry",
     "//components/prefs",
     "//components/prefs/ios",
-    "//components/query_parser",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
-    "//components/undo",
-    "//components/url_formatter",
+    "//components/sync/driver",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
-    "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/bookmarks:bookmarks_utils",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
@@ -88,50 +65,133 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/menu",
-    "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view:views",
-    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:multiwindow_util",
-    "//ios/chrome/browser/undo",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/web",
     "//ui/base",
-    "//ui/gfx",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("edit") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_edit_coordinator.h",
+    "bookmark_edit_coordinator.mm",
+  ]
+  deps = [
+    ":bookmarks_ui",
+    ":core",
+    "//components/bookmarks/browser",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/table_view",
     "//url",
   ]
-  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
-  frameworks = [
-    "CoreGraphics.framework",
-    "QuartzCore.framework",
-    "UIKit.framework",
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("core") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_mediator.h",
+    "bookmark_mediator.mm",
+    "bookmark_model_bridge_observer.h",
+    "bookmark_model_bridge_observer.mm",
+    "bookmark_path_cache.h",
+    "bookmark_path_cache.mm",
+    "bookmark_utils_ios.h",
+    "bookmark_utils_ios.mm",
+    "undo_manager_bridge_observer.h",
+    "undo_manager_bridge_observer.mm",
+    "undo_manager_wrapper.h",
+    "undo_manager_wrapper.mm",
+  ]
+  deps = [
+    "//components/bookmarks/browser",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/query_parser",
+    "//components/strings",
+    "//components/undo",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser:utils",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/undo",
+    "//ios/chrome/common/ui/colors",
+    "//ui/base",
   ]
+  frameworks = [ "UIKit.framework" ]
 }
 
 source_set("bookmarks_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "bookmark_edit_view_controller.h",
+    "bookmark_edit_view_controller.mm",
+    "bookmark_folder_editor_view_controller.h",
+    "bookmark_folder_editor_view_controller.mm",
+    "bookmark_folder_view_controller.h",
+    "bookmark_folder_view_controller.mm",
+  ]
+  deps = [
+    ":constants",
+    ":core",
+    "//base",
+    "//base:i18n",
+    "//components/bookmarks/browser",
+    "//components/strings",
+    "//components/url_formatter",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser:utils",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/bookmarks/cells",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:feature_flags",
+    "//ios/chrome/browser/ui/table_view:presentation",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:views",
+    "//ios/chrome/common/ui/util",
+    "//ios/public/provider/chrome/browser",
+    "//ui/base",
+  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
     "bookmark_ui_constants.h",
     "bookmark_ui_constants.mm",
   ]
@@ -167,6 +227,9 @@ source_set("unit_tests") {
   ]
   deps = [
     ":bookmarks",
+    ":bookmarks_ui",
+    ":constants",
+    ":core",
     ":test_support",
     "//base",
     "//base/test:test_support",
@@ -199,7 +262,7 @@ source_set("eg2_tests") {
     "managed_bookmarks_egtest.mm",
   ]
   deps = [
-    ":bookmarks_ui",
+    ":constants",
     ":eg_test_support+eg2",
     "//base/test:test_support",
     "//components/policy:generated",
@@ -217,8 +280,8 @@ source_set("eg2_tests") {
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
-    "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
     "//ui/base",
   ]
   frameworks = [ "UIKit.framework" ]
@@ -237,7 +300,8 @@ source_set("eg_app_support+eg2") {
   ]
   deps = [
     ":bookmarks",
-    ":bookmarks_ui",
+    ":constants",
+    ":core",
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/browser",
@@ -275,7 +339,7 @@ source_set("eg_test_support+eg2") {
     "bookmark_earl_grey_ui.mm",
   ]
   deps = [
-    ":bookmarks_ui",
+    ":constants",
     "//base",
     "//base/test:test_support",
     "//components/strings",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index 2fbfdf0235d..d5f73ba52f0 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -28,7 +28,8 @@ source_set("cells") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:constants",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/table_view:styler",
diff --git a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
index 88f9f375a0d..77cb8991f82 100644
--- a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
@@ -15,13 +15,22 @@ source_set("browser_container") {
   deps = [
     ":ui",
     "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
+    "//ios/chrome/browser/screen_time:feature_flags",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/link_to_text",
     "//ios/chrome/browser/ui/overlays",
+    "//ios/chrome/browser/ui/screen_time",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public",
+    "//ui/base",
+    "//ui/strings:ui_strings_grit",
     "//url",
   ]
 }
@@ -37,8 +46,12 @@ source_set("ui") {
 
   deps = [
     "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/link_to_text",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/util",
+    "//ui/base",
   ]
 }
 
@@ -46,6 +59,7 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
+    "browser_container_coordinator_unittest.mm",
     "browser_container_mediator_unittest.mm",
     "browser_container_view_controller_unittest.mm",
   ]
@@ -56,13 +70,21 @@ source_set("unit_tests") {
     ":browser_container",
     ":ui",
     "//base/test:test_support",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/link_to_text",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+    "//ui/strings:ui_strings_grit",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
index 6d07901f894..b6dfb6e7825 100644
--- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -49,6 +49,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/language",
+    "//ios/chrome/browser/link_to_text",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/metrics:metrics_browser_agent",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -98,6 +99,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:ui",
+    "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/image_util:web",
     "//ios/chrome/browser/ui/infobars",
@@ -135,11 +137,14 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/side_swipe",
     "//ios/chrome/browser/ui/snackbar",
+    "//ios/chrome/browser/ui/tab_strip",
     "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/tabs:coordinator",
     "//ios/chrome/browser/ui/tabs/requirements",
     "//ios/chrome/browser/ui/text_zoom",
     "//ios/chrome/browser/ui/text_zoom:text_zoom_ui",
+    "//ios/chrome/browser/ui/thumb_strip",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/accessory",
@@ -147,7 +152,6 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/toolbar/fullscreen",
     "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
     "//ios/chrome/browser/ui/translate:legacy_translate",
diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
index 7b235347efd..122f8a26b1a 100644
--- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
@@ -27,7 +27,6 @@ source_set("bubble") {
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//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 fdaf538d6c7..48ad11e9d18 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -8,6 +8,9 @@ source_set("commands") {
   sources = [
     "activity_service_commands.h",
     "application_commands.h",
+    "bookmark_page_command.h",
+    "bookmark_page_command.mm",
+    "bookmarks_commands.h",
     "browser_commands.h",
     "browser_coordinator_commands.h",
     "browsing_data_commands.h",
@@ -31,6 +34,8 @@ source_set("commands") {
     "reading_list_add_command.h",
     "reading_list_add_command.mm",
     "security_alert_commands.h",
+    "share_highlight_command.h",
+    "share_highlight_command.mm",
     "show_signin_command.h",
     "show_signin_command.mm",
     "snackbar_commands.h",
diff --git a/chromium/ios/chrome/browser/ui/gestures/BUILD.gn b/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
index 2114cf80376..298734b7443 100644
--- a/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/gestures/BUILD.gn
@@ -6,6 +6,8 @@ import("//build/config/chrome_build.gni")
 
 source_set("gestures") {
   sources = [
+    "layout_switcher.h",
+    "layout_switcher_provider.h",
     "view_revealing_animatee.h",
     "view_revealing_vertical_pan_handler.h",
     "view_revealing_vertical_pan_handler.mm",
@@ -13,3 +15,16 @@ source_set("gestures") {
   deps = [ "//base" ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "view_revealing_vertical_pan_handler_unittest.mm" ]
+  deps = [
+    "//base/test:test_support",
+    "//ios/chrome/browser/ui/gestures",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 303750038ec..f8a5e220808 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -85,6 +85,7 @@ source_set("history_ui") {
     "//components/strings",
     "//components/url_formatter",
     "//components/url_formatter",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index d7af0e606af..9cad2a91bce 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -137,6 +137,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
+    "//ios/web/common",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
     "//testing/gtest",
@@ -178,6 +179,7 @@ source_set("eg2_tests") {
     "//ios/third_party/earl_grey2:test_lib",
     "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
index f9257b98783..cff09e8c069 100644
--- a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
@@ -40,7 +40,6 @@ source_set("coordinators") {
     "//ios/chrome/browser/ui/infobars/modals",
     "//ios/chrome/browser/ui/infobars/modals:public",
     "//ios/chrome/browser/ui/infobars/presentation",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
index 7274dbf9ed6..c94642eed6d 100644
--- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
@@ -37,7 +37,7 @@ source_set("eg2_tests") {
   deps = [
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:constants",
     "//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/ui/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn
new file mode 100644
index 00000000000..dda8013b7c1
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn
@@ -0,0 +1,39 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("link_to_text") {
+  sources = [
+    "link_to_text_consumer.h",
+    "link_to_text_delegate.h",
+    "link_to_text_mediator.h",
+    "link_to_text_mediator.mm",
+  ]
+  deps = [
+    "//components/shared_highlighting/core/common",
+    "//ios/chrome/browser/link_to_text",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "link_to_text_mediator_unittest.mm" ]
+  deps = [
+    ":link_to_text",
+    "//base",
+    "//base/test:test_support",
+    "//components/shared_highlighting/core/common",
+    "//ios/chrome/browser/link_to_text",
+    "//ios/chrome/browser/link_to_text:internal",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/test",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index de4490c9abd..da7bd0bcece 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -67,7 +67,6 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/ui/whats_new:utils",
@@ -116,6 +115,7 @@ source_set("location_bar_model_delegate") {
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/web_state_list",
+    "//ios/components/security_interstitials",
     "//ios/components/webui:url_constants",
     "//ios/web/public",
     "//ios/web/public/security",
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index c0aa01c4c2c..0d60830e8c5 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -10,15 +10,9 @@ source_set("scene_testing") {
   frameworks = [ "UIKit.framework" ]
 }
 
-source_set("scene_guts") {
-  sources = [ "scene_controller_guts.h" ]
-  deps = [
-    "//ios/chrome/app/application_delegate:tab_opening",
-    "//ios/chrome/browser:utils",
-    "//ios/chrome/browser/ui/tab_grid",
-    "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/web_state_list",
-  ]
+source_set("scene_state_observer") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "scene_state_observer.h" ]
 
   frameworks = [ "UIKit.framework" ]
 }
@@ -30,12 +24,27 @@ source_set("scene_state_header") {
     "scene_state_browser_agent.h",
   ]
   public_deps = [
+    ":scene_state_observer",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/scoped_ui_blocker",
     "//ios/chrome/browser/window_activities",
   ]
 }
 
+source_set("incognito_blocker_scene_agent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "incognito_blocker_scene_agent.h",
+    "incognito_blocker_scene_agent.mm",
+  ]
+  deps = [
+    ":scene_state_header",
+    "//base",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
 source_set("scene") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -52,12 +61,13 @@ source_set("scene") {
   ]
 
   deps = [
+    ":incognito_blocker_scene_agent",
     ":main",
-    ":scene_guts",
     ":scene_testing",
     "//base",
     "//components/signin/public/identity_manager",
     "//components/url_formatter",
+    "//components/web_resource",
     "//ios/chrome/app:app",
     "//ios/chrome/app:blocking_scene_commands",
     "//ios/chrome/app:mode",
@@ -65,6 +75,7 @@ source_set("scene") {
     "//ios/chrome/app/application_delegate:app_state_header",
     "//ios/chrome/app/application_delegate:tab_opening",
     "//ios/chrome/app/application_delegate:url_opener_params",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
@@ -74,9 +85,10 @@ source_set("scene") {
     "//ios/chrome/browser/crash_report/breadcrumbs",
     "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
     "//ios/chrome/browser/first_run",
+    "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/main",
+    "//ios/chrome/browser/metrics:previous_session_info",
     "//ios/chrome/browser/ntp:features",
-    "//ios/chrome/browser/ntp_snippets:ntp_snippets",
     "//ios/chrome/browser/screenshot",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",
@@ -99,14 +111,19 @@ source_set("scene") {
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:agents",
+    "//ios/chrome/browser/web_state_list:session_metrics",
     "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/mailto",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/user_feedback",
+    "//ui/base:base",
+  ]
+  public_deps = [
+    ":scene_state_header",
+    ":scene_state_observer",
   ]
-  public_deps = [ ":scene_state_header" ]
   allow_circular_includes_from = [
     ":main",
 
@@ -131,6 +148,7 @@ source_set("main") {
     "//base",
     "//components/translate/core/browser",
     "//ios/chrome/app:mode",
+    "//ios/chrome/app/application_delegate:app_state_header",
     "//ios/chrome/app/resources:launchscreen_xib",
     "//ios/chrome/browser",
     "//ios/chrome/browser/app_launcher",
@@ -164,9 +182,10 @@ source_set("main") {
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/snackbar",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/translate:legacy_translate",
     "//ios/chrome/browser/ui/util:multiwindow_util",
-    "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/url_loading:url_loading_params_header",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/chrome/browser/web:web_internal",
@@ -192,10 +211,12 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "browser_view_wrangler_unittest.mm",
+    "incognito_blocker_scene_agent_unittest.mm",
     "scene_controller_unittest.mm",
     "scene_state_browser_agent_unittest.mm",
   ]
   deps = [
+    ":incognito_blocker_scene_agent",
     ":main",
     ":scene",
     "//base",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index 57ed3f65988..ca1f9c3b7cb 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -158,7 +158,6 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/ui/whats_new:utils",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 58997ea3929..973f9ea0257 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -36,7 +36,6 @@ source_set("popup") {
     "//ios/chrome/browser/ui/omnibox:omnibox_util",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/whats_new:utils",
     "//ios/chrome/browser/web_state_list:web_state_list",
diff --git a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn
index c64c4d0e15c..475ccadf342 100644
--- a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn
@@ -142,6 +142,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/overlays/test_modality",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gmock",
diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
index 3a81be02804..351a87d5181 100644
--- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn
@@ -85,7 +85,9 @@ source_set("eg2_tests") {
     "//base",
     "//base/test:test_support",
     "//components/password_manager/core/common",
+    "//components/strings:components_strings_grit",
     "//ios/chrome/browser/ui/authentication:eg_test_support+eg2",
+    "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
@@ -93,6 +95,7 @@ source_set("eg2_tests") {
     "//ios/web/public/test/http_server",
     "//net:test_support",
     "//testing/gtest",
+    "//ui/base: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 80706ed07be..ba43427a781 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -26,6 +26,7 @@ source_set("popup_menu") {
     "resources:popup_menu_history",
     "resources:popup_menu_new_incognito_tab",
     "resources:popup_menu_new_tab",
+    "resources:popup_menu_new_window",
     "resources:popup_menu_paste_and_go",
     "resources:popup_menu_qr_scanner",
     "resources:popup_menu_read_later",
@@ -66,7 +67,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
@@ -79,7 +80,6 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/popup_menu/public/cells",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/reading_list",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:multiwindow_util",
     "//ios/chrome/browser/web",
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 6abd67909db..cdd05e99743 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -216,6 +216,14 @@ imageset("popup_menu_new_tab") {
   ]
 }
 
+imageset("popup_menu_new_window") {
+  sources = [
+    "popup_menu_new_window.imageset/Contents.json",
+    "popup_menu_new_window.imageset/popup_menu_new_window@2x.png",
+    "popup_menu_new_window.imageset/popup_menu_new_window@3x.png",
+  ]
+}
+
 imageset("popup_menu_help") {
   sources = [
     "popup_menu_help.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index 7b469f9bd16..d0b1d67602a 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -115,6 +115,7 @@ source_set("reading_list_ui") {
     "//base:i18n",
     "//components/strings",
     "//components/url_formatter",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/drag_and_drop",
@@ -196,6 +197,7 @@ source_set("eg2_tests") {
     "//ios/web/public/navigation:navigation",
     "//net",
     "//net:test_support",
+    "//ui/base",
   ]
   frameworks = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 81cdc08712c..dee52c79a40 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -77,6 +77,7 @@ source_set("recent_tabs_ui") {
     "//components/sessions",
     "//components/strings",
     "//components/sync",
+    "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
@@ -137,6 +138,38 @@ source_set("unit_tests") {
   ]
 }
 
+source_set("app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "recent_tabs_app_interface.h",
+    "recent_tabs_app_interface.mm",
+  ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/util:multiwindow_util",
+    "//ios/chrome/test/app:test_support",
+  ]
+}
+
+source_set("test_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "recent_tabs_app_interface.h" ]
+  deps = [ "//base" ]
+}
+
 source_set("eg2_tests") {
   defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
@@ -147,6 +180,7 @@ source_set("eg2_tests") {
   sources = [ "recent_tabs_egtest.mm" ]
   deps = [
     ":recent_tabs_ui_constants",
+    ":test_support+eg2",
     "//base/test:test_support",
     "//components/strings",
     "//ios/chrome/app/strings",
diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
index c4ea26900cc..db264fda7de 100644
--- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
@@ -97,7 +97,7 @@ source_set("eg2_tests") {
     "//ios/testing:embedded_test_server_support",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
-    "//ios/web/public/test/http_server",
+    "//net:test_support",
     "//ui/base",
   ]
 
diff --git a/chromium/ios/chrome/browser/ui/screen_time/BUILD.gn b/chromium/ios/chrome/browser/ui/screen_time/BUILD.gn
new file mode 100644
index 00000000000..3234100a8dc
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/screen_time/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/ios_sdk.gni")
+
+source_set("screen_time") {
+  # TODO(crbug.com/1123704): remove when it is recommended to build Chromium
+  # with version 12.0 or later of Xcode.
+  if (xcode_version_int >= 1200) {
+    sources = [
+      "screen_time_consumer.h",
+      "screen_time_coordinator.h",
+      "screen_time_coordinator.mm",
+      "screen_time_mediator.h",
+      "screen_time_mediator.mm",
+      "screen_time_view_controller.h",
+      "screen_time_view_controller.mm",
+    ]
+    frameworks = [
+      "UIKit.framework",
+      "ScreenTime.framework",
+    ]
+    configs += [ "//build/config/compiler:enable_arc" ]
+    deps = [
+      "//base",
+      "//ios/chrome/browser/browser_state",
+      "//ios/chrome/browser/main:public",
+      "//ios/chrome/browser/screen_time",
+      "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+      "//ios/chrome/browser/web_state_list",
+      "//ios/chrome/common/ui/util",
+      "//ios/web/public",
+      "//net",
+    ]
+  }
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 44f3d4953f3..eb36f3cc37f 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -136,6 +136,7 @@ source_set("settings") {
     "//ios/chrome/browser/mailto:feature_flags",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
@@ -160,6 +161,8 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/default_browser",
+    "//ios/chrome/browser/ui/settings/default_browser/resources:default_browser_world",
     "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/language:language",
@@ -175,6 +178,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark",
+    "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web:web",
     "//ios/chrome/common",
@@ -231,6 +235,7 @@ source_set("test_support") {
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//google_apis",
+    "//ios/chrome/app/application_delegate:app_state_header",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
@@ -241,6 +246,7 @@ source_set("test_support") {
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
+    "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/settings/password",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/test/app:test_support",
@@ -299,6 +305,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/prefs:browser_prefs",
+    "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
new file mode 100644
index 00000000000..0836d50a09d
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("default_browser") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "default_browser_settings_table_view_controller.h",
+    "default_browser_settings_table_view_controller.mm",
+  ]
+  deps = [
+    "resources:chrome_icon",
+    "resources:default_browser_world",
+    "resources:settings",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/common/ui/colors",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "default_browser_settings_table_view_controller_unittest.mm" ]
+  deps = [
+    ":default_browser",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/table_view:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn
new file mode 100644
index 00000000000..b62b14912c9
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn
@@ -0,0 +1,29 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("chrome_icon") {
+  sources = [
+    "chrome_icon.imageset/Contents.json",
+    "chrome_icon.imageset/chrome_icon@2x.png",
+    "chrome_icon.imageset/chrome_icon@3x.png",
+  ]
+}
+
+imageset("default_browser_world") {
+  sources = [
+    "default_browser_world.imageset/Contents.json",
+    "default_browser_world.imageset/default_browser_world@2x.png",
+    "default_browser_world.imageset/default_browser_world@3x.png",
+  ]
+}
+
+imageset("settings") {
+  sources = [
+    "settings.imageset/Contents.json",
+    "settings.imageset/settings@2x.png",
+    "settings.imageset/settings@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
index 68c7e18e28f..e084bd0b32b 100644
--- a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
@@ -15,6 +15,7 @@ source_set("enterprise_info_popover_view_controller") {
   frameworks = [ "UIKit.framework" ]
 
   deps = [
+    ":constants",
     "//base:base",
     "//ios/chrome/app/strings",
     "//ios/chrome/common:common",
@@ -24,3 +25,11 @@ source_set("enterprise_info_popover_view_controller") {
     "//ui/base",
   ]
 }
+
+source_set("constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "elements_constants.h",
+    "elements_constants.mm",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index d72169d6df0..0ac4f31edae 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -5,38 +5,24 @@
 source_set("password") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "legacy_password_details_table_view_controller.h",
-    "legacy_password_details_table_view_controller.mm",
-    "legacy_password_details_table_view_controller_delegate.h",
-    "password_exporter.h",
-    "password_exporter.mm",
     "password_issue_with_form.h",
     "password_issue_with_form.mm",
     "password_issues_coordinator.h",
     "password_issues_coordinator.mm",
     "password_issues_mediator.h",
     "password_issues_mediator.mm",
-    "passwords_consumer.h",
+    "passwords_coordinator.h",
+    "passwords_coordinator.mm",
     "passwords_mediator.h",
     "passwords_mediator.mm",
-    "passwords_table_view_controller.h",
-    "passwords_table_view_controller.mm",
   ]
   deps = [
-    ":password_constants",
     ":password_ui",
     "//base",
     "//components/autofill/core/common",
-    "//components/google/core/common",
-    "//components/keyed_service/core",
-    "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
-    "//components/prefs",
-    "//components/strings",
-    "//components/url_formatter",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
-    "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/passwords",
@@ -45,26 +31,11 @@ source_set("password") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
-    "//ios/chrome/browser/ui/elements",
-    "//ios/chrome/browser/ui/settings:settings_root",
-    "//ios/chrome/browser/ui/settings/cells",
-    "//ios/chrome/browser/ui/settings/cells:public",
-    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/password/password_details",
-    "//ios/chrome/browser/ui/settings/utils",
-    "//ios/chrome/browser/ui/table_view",
-    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
-    "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
-    "//ios/chrome/common:constants",
     "//ios/chrome/common/ui/colors",
-    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ios/chrome/common/ui/reauthentication",
-    "//ios/chrome/common/ui/util",
-    "//ios/third_party/material_components_ios",
-    "//ui/base",
     "//ui/base",
-    "//ui/base/clipboard:clipboard_types",
     "//url",
   ]
   frameworks = [ "MobileCoreServices.framework" ]
@@ -73,6 +44,11 @@ source_set("password") {
 source_set("password_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "legacy_password_details_table_view_controller.h",
+    "legacy_password_details_table_view_controller.mm",
+    "legacy_password_details_table_view_controller_delegate.h",
+    "password_exporter.h",
+    "password_exporter.mm",
     "password_issue.h",
     "password_issue_content_item.h",
     "password_issue_content_item.mm",
@@ -80,23 +56,51 @@ source_set("password_ui") {
     "password_issues_presenter.h",
     "password_issues_table_view_controller.h",
     "password_issues_table_view_controller.mm",
+    "passwords_consumer.h",
+    "passwords_settings_commands.h",
+    "passwords_table_view_controller.h",
+    "passwords_table_view_controller.mm",
+    "passwords_table_view_controller_delegate.h",
+    "passwords_table_view_controller_presentation_delegate.h",
   ]
   deps = [
+    ":password_constants",
     "//base",
     "//components/autofill/core/common",
+    "//components/google/core/common",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
     "//components/prefs",
     "//components/strings",
     "//components/url_formatter",
-    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/settings:settings_root",
-    "//ios/chrome/browser/ui/settings/autofill",
+    "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/cells:public",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
+    "//ios/chrome/browser/ui/settings/password/password_details",
+    "//ios/chrome/browser/ui/settings/utils",
+    "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common",
+    "//ios/chrome/common:constants",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/reauthentication",
     "//ios/chrome/common/ui/util",
+    "//ios/third_party/material_components_ios",
     "//ui/base",
+    "//ui/base/clipboard:clipboard_types",
   ]
 }
 
@@ -116,7 +120,7 @@ source_set("test_support") {
     "legacy_password_details_table_view_controller+testing.h",
     "password_exporter_for_testing.h",
   ]
-  deps = [ ":password" ]
+  deps = [ ":password_ui" ]
 }
 
 source_set("unit_tests") {
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 4627a72749e..a3007fc0bfc 100644
--- a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -27,10 +27,14 @@ source_set("safety_check_ui") {
 source_set("safety_check") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "safety_check_constants.h",
+    "safety_check_constants.mm",
     "safety_check_coordinator.h",
     "safety_check_coordinator.mm",
     "safety_check_mediator.h",
     "safety_check_mediator.mm",
+    "safety_check_utils.h",
+    "safety_check_utils.mm",
   ]
   deps = [
     ":safety_check_ui",
@@ -39,11 +43,13 @@ source_set("safety_check") {
     "//components/prefs",
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/omaha",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
@@ -60,9 +66,12 @@ source_set("safety_check") {
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/upgrade:public",
     "//ios/chrome/common",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/web/common",
     "//ui/base",
   ]
   frameworks = [ "UIKit.framework" ]
@@ -71,16 +80,35 @@ source_set("safety_check") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [ "safety_check_table_view_controller_unittest.mm" ]
+  sources = [ "safety_check_mediator_unittest.mm" ]
   deps = [
+    ":safety_check",
     ":safety_check_ui",
     "//base/test:test_support",
+    "//components/password_manager/core/browser:test_support",
+    "//components/password_manager/core/common",
+    "//components/prefs:test_support",
+    "//components/safe_browsing/core:features",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/strings",
+    "//components/sync_preferences:test_support",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/signin:test_support",
+    "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/sync:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/upgrade:public",
+    "//ios/chrome/common",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/sharing/BUILD.gn b/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
index 2c23fdf33d4..89d56be015e 100644
--- a/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sharing/BUILD.gn
@@ -10,11 +10,17 @@ source_set("sharing") {
   ]
   deps = [
     "//base",
+    "//components/bookmarks/browser",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/chrome/browser/ui/bookmarks:core",
+    "//ios/chrome/browser/ui/bookmarks:edit",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/qr_generator",
+    "//ios/third_party/material_components_ios",
     "//url",
   ]
 }
@@ -27,13 +33,21 @@ source_set("unit_tests") {
     ":sharing",
     "//base",
     "//base/test:test_support",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/test",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:edit",
+    "//ios/chrome/browser/ui/bookmarks:test_support",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
+    "//ios/third_party/material_components_ios",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index 2cb55f7cbd8..e893cf3a6da 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -63,6 +63,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test:test_support",
     "//ios/web/common",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
index 1fec54f257a..489df90399c 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
@@ -16,11 +16,14 @@ source_set("tab_grid") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":tab_grid_paging",
     ":tab_grid_ui",
     "grid:grid_ui",
     "//base",
     "//components/favicon/ios",
     "//components/sessions",
+    "//components/strings",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
@@ -32,8 +35,10 @@ source_set("tab_grid") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
+    "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/history/public",
     "//ios/chrome/browser/ui/main",
@@ -41,6 +46,8 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/tab_grid/transitions",
+    "//ios/chrome/browser/ui/thumb_strip",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
@@ -65,6 +72,12 @@ source_set("tab_grid_ui_constants") {
   deps = [ "resources:grid_background_color" ]
 }
 
+source_set("tab_grid_paging") {
+  sources = [ "tab_grid_paging.h" ]
+  deps = [ "//base" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("tab_grid_ui") {
   sources = [
     "tab_grid_bottom_toolbar.h",
@@ -75,7 +88,6 @@ source_set("tab_grid_ui") {
     "tab_grid_new_tab_button.mm",
     "tab_grid_page_control.h",
     "tab_grid_page_control.mm",
-    "tab_grid_paging.h",
     "tab_grid_top_toolbar.h",
     "tab_grid_top_toolbar.mm",
     "tab_grid_view_controller.h",
@@ -85,6 +97,8 @@ source_set("tab_grid_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":features",
+    ":tab_grid_paging",
     ":tab_grid_ui_constants",
     "grid:grid_ui",
     "grid:grid_ui_constants",
@@ -101,6 +115,7 @@ source_set("tab_grid_ui") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_grid/transitions",
     "//ios/chrome/browser/ui/table_view:styler",
@@ -111,6 +126,15 @@ source_set("tab_grid_ui") {
   ]
 }
 
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  deps = [ "//base" ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -129,6 +153,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/ntp",
+    "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/snapshots",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
index 8076b06d35c..b261c4ae404 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn
@@ -28,6 +28,10 @@ source_set("grid_ui") {
     "grid_theme.h",
     "grid_view_controller.h",
     "grid_view_controller.mm",
+    "horizontal_layout.h",
+    "horizontal_layout.mm",
+    "tab_switcher_layout.h",
+    "tab_switcher_layout.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -43,7 +47,9 @@ source_set("grid_ui") {
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/elements",
+    "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/tab_grid/transitions",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn
index 719c02b5f65..7d72126e324 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn
@@ -21,6 +21,7 @@ source_set("transitions") {
   deps = [
     "//base",
     "//ios/chrome/browser/crash_report",
+    "//ios/chrome/browser/ui/tab_grid:tab_grid_paging",
     "//ios/chrome/browser/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/tab_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_strip/BUILD.gn
new file mode 100644
index 00000000000..7d7d7c18e60
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/tab_strip/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("tab_strip") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_strip_coordinator.h",
+    "tab_strip_coordinator.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/tab_strip:tab_strip_ui",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("tab_strip_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_strip_view_controller.h",
+    "tab_strip_view_controller.mm",
+    "tab_strip_view_layout.h",
+    "tab_strip_view_layout.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+  ]
+  frameworks = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index f599ae00345..2bc220685ca 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -11,6 +11,9 @@ source_set("tabs") {
     "foreground_tab_animation_view.mm",
     "switch_to_tab_animation_view.h",
     "switch_to_tab_animation_view.mm",
+    "tab_strip_container_view.h",
+    "tab_strip_container_view.mm",
+    "tab_strip_containing.h",
     "tab_strip_controller.h",
     "tab_strip_controller.mm",
     "tab_strip_view.h",
@@ -57,7 +60,6 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/tab_grid/grid/resources:grid_cell_close_button",
     "//ios/chrome/browser/ui/tabs/requirements",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
diff --git a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
index fa01cde5f15..34b0d8d6729 100644
--- a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
 
 source_set("thumb_strip") {
   sources = [
+    "thumb_strip_attacher.h",
     "thumb_strip_coordinator.h",
     "thumb_strip_coordinator.mm",
   ]
@@ -16,3 +17,16 @@ source_set("thumb_strip") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("feature_flags") {
+  sources = [
+    "thumb_strip_feature.h",
+    "thumb_strip_feature.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/util",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index f6f152e8609..5a838b82fce 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -39,7 +39,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
@@ -99,9 +99,9 @@ source_set("toolbar_ui") {
     "//ios/chrome/browser/ui/ntp:ntp",
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu/public",
+    "//ios/chrome/browser/ui/thumb_strip:feature_flags",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container:toolbar_collapsing",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
index bfea18e23f9..520c206ed10 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn
@@ -49,7 +49,6 @@ source_set("buttons") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/ui/colors",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
index 773a13955f5..f6c07643f98 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn
@@ -13,7 +13,6 @@ source_set("public") {
     "toolbar_utils.mm",
   ]
   deps = [
-    ":feature_flags",
     "//base",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/bubble",
@@ -33,12 +32,3 @@ source_set("constants") {
     "toolbar_constants.mm",
   ]
 }
-
-source_set("feature_flags") {
-  sources = [
-    "features.h",
-    "features.mm",
-  ]
-  deps = [ "//base" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index 9b6b8db4c08..ca4de7e752f 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -96,7 +96,6 @@ source_set("util") {
     "//ios/chrome/browser:utils",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/common:timing",
     "//ios/chrome/common/ui/util",
     "//ios/chrome/common/ui/util:dynamic_type_util",
@@ -140,6 +139,7 @@ source_set("unit_tests") {
     "manual_text_framer_unittest.mm",
     "named_guide_unittest.mm",
     "optional_property_animator_unittest.mm",
+    "pasteboard_util_unittest.mm",
     "terms_util_unittest.mm",
     "text_region_mapper_unittest.mm",
     "ui_util_unittest.mm",
diff --git a/chromium/ios/chrome/browser/upgrade/BUILD.gn b/chromium/ios/chrome/browser/upgrade/BUILD.gn
index fcf595e106d..78c57b324a0 100644
--- a/chromium/ios/chrome/browser/upgrade/BUILD.gn
+++ b/chromium/ios/chrome/browser/upgrade/BUILD.gn
@@ -10,6 +10,7 @@ source_set("upgrade") {
     "upgrade_recommended_details.h",
   ]
   deps = [
+    ":public",
     "resources:infobar_update",
     "//base",
     "//components/infobars/core",
@@ -25,6 +26,18 @@ source_set("upgrade") {
   frameworks = [ "UIKit.framework" ]
 }
 
+source_set("public") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "upgrade_constants.h",
+    "upgrade_constants.mm",
+    "upgrade_utils.h",
+    "upgrade_utils.mm",
+  ]
+  deps = [ "//ios/chrome/browser" ]
+  frameworks = [ "UIKit.framework" ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/browser/url_loading/BUILD.gn b/chromium/ios/chrome/browser/url_loading/BUILD.gn
index 86102b085df..ce2983f45ca 100644
--- a/chromium/ios/chrome/browser/url_loading/BUILD.gn
+++ b/chromium/ios/chrome/browser/url_loading/BUILD.gn
@@ -48,6 +48,16 @@ source_set("url_loading") {
   ]
 }
 
+source_set("url_loading_params_header") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [ "url_loading_params.h" ]
+  deps = [
+    "//ios/chrome/browser/ui/commands",
+    "//ios/web/public",
+    "//ui/base",
+  ]
+}
+
 source_set("test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 0c7b498fce0..7298b212d23 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -57,6 +57,7 @@ source_set("web") {
     "//ios/components/ui_util",
     "//ios/components/webui:url_constants",
     "//ios/net",
+    "//ios/public/provider/chrome/browser:browser",
     "//ios/web",
     "//ios/web/common",
     "//ios/web/public/js_messaging",
@@ -182,15 +183,13 @@ js_compile_bundle("chrome_bundle_main_frame") {
   closure_entry_point = "__crWeb.chromeBundleMainFrame"
   sources = [
     "//components/password_manager/ios/resources/password_controller.js",
+    "//ios/chrome/browser/link_to_text/resources/link_to_text.js",
     "//ios/chrome/browser/search_engines/resources/search_engine.js",
+    "//third_party/text-fragments-polyfill/src/src/fragment-generation-utils.js",
+    "//third_party/text-fragments-polyfill/src/src/text-fragment-utils.js",
     "resources/chrome_bundle_main_frame.js",
     "resources/image_fetch.js",
   ]
-  deps = [ ":credential_manager" ]
-}
-
-js_compile_checked("credential_manager") {
-  sources = [ "resources/credential_manager.js" ]
 }
 
 js_compile_checked("accessibility") {
diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
index ef06252f8a0..f78f880b7e0 100644
--- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
@@ -2,6 +2,18 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+source_set("session_metrics") {
+  sources = [
+    "session_metrics.cc",
+    "session_metrics.h",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/browser_state:browser_state",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("web_state_list") {
   sources = [
     "active_web_state_observation_forwarder.h",
@@ -46,8 +58,14 @@ source_set("agents") {
     "web_state_list_metrics_browser_agent.mm",
   ]
   deps = [
+    ":session_metrics",
     ":web_state_list",
+    "//components/navigation_metrics",
+    "//components/profile_metrics",
+    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/browser_state_metrics",
+    "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/sessions:restoration_agent",
     "//ios/chrome/browser/sessions:restoration_observer",
@@ -75,6 +93,7 @@ source_set("unit_tests") {
   sources = [
     "active_web_state_observation_forwarder_unittest.mm",
     "all_web_state_observation_forwarder_unittest.mm",
+    "session_metrics_unittest.cc",
     "tab_insertion_browser_agent_unittest.mm",
     "web_state_list_favicon_driver_observer_unittest.mm",
     "web_state_list_order_controller_unittest.mm",
@@ -84,9 +103,11 @@ source_set("unit_tests") {
   ]
   deps = [
     ":agents",
+    ":session_metrics",
     ":test_support",
     ":web_state_list",
     "//base",
+    "//base/test:test_support",
     "//components/favicon/ios",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
diff --git a/chromium/ios/chrome/browser/window_activities/BUILD.gn b/chromium/ios/chrome/browser/window_activities/BUILD.gn
index 0a578a1bb2d..c4789375916 100644
--- a/chromium/ios/chrome/browser/window_activities/BUILD.gn
+++ b/chromium/ios/chrome/browser/window_activities/BUILD.gn
@@ -15,7 +15,7 @@ source_set("window_activities") {
     ":ios_move_tab_activity_type_buildflags",
     "//base",
     "//ios/chrome/browser:chrome_url_constants",
-    "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/url_loading:url_loading_params_header",
     "//ios/web/public/navigation",
     "//net",
     "//url",
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-11-18 16:35:47 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-11-18 15:45:54 +0000
commit	32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch)
tree	eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/ios/chrome/browser
parent	99677208ff3b216fdfec551fbe548da5520cd6fb (diff)
download	qtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz