BASELINE: Update Chromium to 63.0.3239.58

Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2017-11-20 15:06:40 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2017-11-22 11:48:58 +0000
commit: daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch)
tree: 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/ios
parent: be59a35641616a4cf23c4a13fa0632624b021c1b (diff)
download: qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz
109 files changed, 1254 insertions, 272 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index 55d32e64bc2..6f20571d690 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -13,16 +13,10 @@ source_set("app") {
   sources = [
     "deferred_initialization_runner.h",
     "deferred_initialization_runner.mm",
-    "safe_mode_crashing_modules_config.h",
-    "safe_mode_crashing_modules_config.mm",
-    "safe_mode_util.cc",
-    "safe_mode_util.h",
   ]
 
   deps = [
-    ":resources",
     "//base",
-    ios_packed_resources_target,
   ]
 
   libs = [ "Foundation.framework" ]
@@ -32,12 +26,10 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "chrome_app_startup_parameters_unittest.mm",
     "chrome_overlay_window_testing.h",
     "deferred_initialization_runner_unittest.mm",
     "main_application_delegate_unittest.mm",
     "main_controller_unittest.mm",
-    "safe_mode_util_unittest.cc",
   ]
   deps = [
     ":app",
@@ -76,16 +68,6 @@ source_set("tests_fake_hook") {
   ]
 }
 
-bundle_data("resources") {
-  visibility = [ ":app" ]
-  sources = [
-    "resources/SafeModeCrashingModules.plist",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
-}
-
 tweak_info_plist("info_plist") {
   info_plists = [
     "resources/Info.plist",
@@ -103,11 +85,10 @@ tweak_info_plist("info_plist") {
   ]
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
-  plist_templates = [ "resources/Chrome.entitlements" ]
+compile_entitlements("entitlements") {
+  entitlements_templates = [ "resources/Chrome.entitlements" ]
   if (ios_chrome_entitlements_additions != []) {
-    plist_templates += ios_chrome_entitlements_additions
+    entitlements_templates += ios_chrome_entitlements_additions
   }
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/$chromium_short_name.entitlements"
@@ -117,8 +98,6 @@ source_set("app_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "application_mode.h",
-    "chrome_app_startup_parameters.h",
-    "chrome_app_startup_parameters.mm",
     "chrome_overlay_window.h",
     "chrome_overlay_window.mm",
     "main_application_delegate.h",
@@ -163,7 +142,6 @@ source_set("app_internal") {
     "//components/web_resource",
     "//ios/chrome/app/application_delegate",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
-    "//ios/chrome/app/safe_mode",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
     "//ios/chrome/app/startup:startup_basic",
@@ -191,6 +169,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/omaha",
     "//ios/chrome/browser/payments",
+    "//ios/chrome/browser/payments:constants",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -228,6 +207,7 @@ source_set("app_internal") {
     "//ios/public/provider/chrome/browser/distribution",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/user_feedback",
+    "//ios/testing/perf:startup",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
     "//ios/web/public/app",
@@ -263,6 +243,7 @@ source_set("main") {
     "//ios/chrome/browser:browser_internal",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/common",
+    "//ios/testing/perf:startup",
     "//third_party/google_toolbox_for_mac",
   ]
 }
diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn
index 6f346ea1b03..f9f9ff805d2 100644
--- a/chromium/ios/chrome/app/application_delegate/BUILD.gn
+++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn
@@ -34,12 +34,10 @@ source_set("unit_tests") {
     ":test_support",
     "//base",
     "//base/test:test_support",
-    "//breakpad:client",
     "//components/handoff",
     "//components/metrics",
     "//ios/chrome/app",
     "//ios/chrome/app:app_internal",
-    "//ios/chrome/app/safe_mode",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
     "//ios/chrome/browser",
@@ -51,7 +49,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/u2f",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/test:test_support",
     "//ios/chrome/test/base",
@@ -64,6 +64,7 @@ source_set("unit_tests") {
     "//ios/web/public/test",
     "//net:test_support",
     "//testing/gtest",
+    "//third_party/breakpad:client",
     "//third_party/ocmock",
     "//ui/base",
     "//url",
@@ -103,7 +104,6 @@ source_set("application_delegate_internal") {
     "//components/payments/core",
     "//components/prefs",
     "//ios/chrome/app",
-    "//ios/chrome/app/safe_mode",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
     "//ios/chrome/browser",
@@ -123,6 +123,7 @@ source_set("application_delegate_internal") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/common/app_group:main_app",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/app/resources/BUILD.gn b/chromium/ios/chrome/app/resources/BUILD.gn
index f270ee364c2..1df3a161167 100644
--- a/chromium/ios/chrome/app/resources/BUILD.gn
+++ b/chromium/ios/chrome/app/resources/BUILD.gn
@@ -75,6 +75,7 @@ repack("repack_unscaled_resources") {
 appiconset("chromium_icons") {
   sources = [
     "chromium/AppIcon.appiconset/Contents.json",
+    "chromium/AppIcon.appiconset/Icon-1024.png",
     "chromium/AppIcon.appiconset/Icon-120.png",
     "chromium/AppIcon.appiconset/Icon-152.png",
     "chromium/AppIcon.appiconset/Icon-167.png",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index 576e845ae91..7d1dd59cd01 100644
--- a/chromium/ios/chrome/app/startup/BUILD.gn
+++ b/chromium/ios/chrome/app/startup/BUILD.gn
@@ -35,6 +35,8 @@ source_set("startup_basic") {
 
 source_set("startup") {
   sources = [
+    "chrome_app_startup_parameters.h",
+    "chrome_app_startup_parameters.mm",
     "client_registration.h",
     "client_registration.mm",
     "content_suggestions_scheduler_notifications.h",
@@ -54,9 +56,13 @@ source_set("startup") {
     "//ios/chrome/browser",
     "//ios/chrome/browser:browser_internal",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/first_run",
+    "//ios/chrome/browser/net:net",
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:web_internal",
+    "//ios/chrome/common",
+    "//ios/chrome/common/app_group",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
     "//ios/web",
@@ -64,3 +70,19 @@ source_set("startup") {
     ios_provider_target,
   ]
 }
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "chrome_app_startup_parameters_unittest.mm",
+  ]
+  deps = [
+    ":startup",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/common/app_group",
+    "//testing/gtest",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index be8c91347e0..c9a575e758f 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -120,8 +120,12 @@ source_set("browser") {
     "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
+    "//ios/chrome/browser/payments:constants",
     "//ios/chrome/browser/ssl:features",
     "//ios/chrome/browser/sync/glue",
+    "//ios/chrome/browser/ui/history:history_base_feature",
+    "//ios/chrome/browser/ui/main:feature_flags",
+    "//ios/chrome/browser/ui/toolbar:toolbar_base_feature",
     "//ios/chrome/browser/web:features",
     "//ios/chrome/common",
     "//ios/components/io_thread",
@@ -163,7 +167,7 @@ source_set("browser_impl") {
     "//components/history/core/browser",
     "//components/keyed_service/core",
     "//components/language_usage_metrics",
-    "//components/metrics:profiler_ios",
+    "//components/metrics",
     "//components/metrics_services_manager",
     "//components/net_log",
     "//components/network_time",
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index f4b8be9cdc8..318a982bf72 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -10,11 +10,14 @@ source_set("autofill") {
     "form_input_accessory_view_controller.h",
     "form_input_accessory_view_controller.mm",
     "form_input_accessory_view_delegate.h",
+    "form_input_accessory_view_tab_helper.h",
+    "form_input_accessory_view_tab_helper.mm",
     "form_suggestion_controller.h",
     "form_suggestion_controller.mm",
     "form_suggestion_label.h",
     "form_suggestion_label.mm",
-    "form_suggestion_provider.h",
+    "form_suggestion_tab_helper.h",
+    "form_suggestion_tab_helper.mm",
     "form_suggestion_view.h",
     "form_suggestion_view.mm",
     "form_suggestion_view_client.h",
@@ -65,10 +68,10 @@ source_set("autofill") {
 source_set("autofill_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "autofill_agent.h",
-    "autofill_agent.mm",
     "autofill_controller.h",
     "autofill_controller.mm",
+    "autofill_tab_helper.h",
+    "autofill_tab_helper.mm",
   ]
   deps = [
     ":autofill",
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 168122a57e8..b83c6c3bfaa 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -72,6 +72,7 @@ source_set("browser_state_impl") {
     "//components/proxy_config/ios",
     "//components/signin/core/browser",
     "//components/signin/core/common",
+    "//components/signin/ios/browser:active_state_manager",
     "//components/sync",
     "//components/sync_preferences",
     "//components/user_prefs",
@@ -106,6 +107,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/browser_list:browser_list_impl",
     "//ios/chrome/browser/undo",
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/net",
diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
index 8e998f4bdc8..4cd33ee96bb 100644
--- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
@@ -68,8 +68,11 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/browsing_data/core",
+    "//components/pref_registry",
     "//components/prefs",
     "//components/prefs:test_support",
+    "//components/sync_preferences",
+    "//components/sync_preferences:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/web",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
index 0bc68fc940a..0876efbdda9 100644
--- a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
@@ -23,6 +23,8 @@ source_set("content_suggestions") {
     "content_suggestions_service_bridge_observer.mm",
     "mediator_util.h",
     "mediator_util.mm",
+    "ntp_home_mediator.h",
+    "ntp_home_mediator.mm",
     "ntp_home_metrics.h",
     "ntp_home_metrics.mm",
   ]
diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn
index 2c2953282a0..1b3c3752748 100644
--- a/chromium/ios/chrome/browser/crash_report/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn
@@ -22,11 +22,11 @@ source_set("crash_report") {
 
   deps = [
     "//base",
-    "//breakpad:client",
     "//components/crash/core/common",
     "//components/upload_list",
     "//ios/chrome/browser",
     "//ios/web",
+    "//third_party/breakpad:client",
   ]
 }
 
@@ -70,7 +70,6 @@ source_set("unit_tests") {
     ":crash_report",
     ":crash_report_internal",
     "//base",
-    "//breakpad:client",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/sessions:serialisation",
@@ -79,6 +78,7 @@ source_set("unit_tests") {
     "//ios/web/public/test",
     "//testing/gmock",
     "//testing/gtest",
+    "//third_party/breakpad:client",
     "//third_party/ocmock",
   ]
 }
diff --git a/chromium/ios/chrome/browser/history/BUILD.gn b/chromium/ios/chrome/browser/history/BUILD.gn
index ad7c447aae0..ac59bcedb7f 100644
--- a/chromium/ios/chrome/browser/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/history/BUILD.gn
@@ -38,3 +38,42 @@ source_set("history") {
     "//url",
   ]
 }
+
+source_set("tab_helper") {
+  sources = [
+    "history_tab_helper.h",
+    "history_tab_helper.mm",
+  ]
+  deps = [
+    ":history",
+    "//base",
+    "//components/history/core/browser",
+    "//components/keyed_service/core",
+    "//components/strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "history_tab_helper_unittest.mm",
+  ]
+  deps = [
+    ":history",
+    ":tab_helper",
+    "//base",
+    "//base/test:test_support",
+    "//components/history/core/browser",
+    "//components/keyed_service/core",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/web",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/language/BUILD.gn b/chromium/ios/chrome/browser/language/BUILD.gn
index 9c11dcb1db1..2949ae5d76f 100644
--- a/chromium/ios/chrome/browser/language/BUILD.gn
+++ b/chromium/ios/chrome/browser/language/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("language") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "language_model_factory.cc",
+    "language_model_factory.h",
     "url_language_histogram_factory.cc",
     "url_language_histogram_factory.h",
   ]
@@ -23,12 +25,14 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "language_model_factory_unittest.cc",
     "url_language_histogram_factory_unittest.cc",
   ]
   deps = [
     ":language",
     "//base",
     "//base/test:test_support",
+    "//components/language/core/browser",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/web:test_support",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index d85407e58f7..2de216057b7 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -29,7 +29,6 @@ source_set("metrics") {
     "//components/keyed_service/ios",
     "//components/metrics",
     "//components/metrics:net",
-    "//components/metrics:profiler",
     "//components/metrics:ui",
     "//components/metrics_services_manager",
     "//components/navigation_metrics",
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index 7a6b1698bdf..b83b2ba65fe 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -25,10 +25,15 @@ source_set("passwords") {
     "ios_chrome_save_password_infobar_delegate.mm",
     "ios_chrome_update_password_infobar_delegate.h",
     "ios_chrome_update_password_infobar_delegate.mm",
+    "js_credential_manager.h",
+    "js_credential_manager.mm",
     "js_password_manager.h",
     "js_password_manager.mm",
+    "notify_auto_signin_view_controller.h",
+    "notify_auto_signin_view_controller.mm",
     "password_controller.h",
     "password_controller.mm",
+    "password_form_filler.h",
     "password_generation_agent.h",
     "password_generation_agent.mm",
     "password_generation_edit_view.h",
@@ -36,6 +41,8 @@ source_set("passwords") {
     "password_generation_offer_view.h",
     "password_generation_offer_view.mm",
     "password_generation_prompt_delegate.h",
+    "password_tab_helper.h",
+    "password_tab_helper.mm",
     "passwords_ui_delegate.h",
     "update_password_infobar_controller.h",
     "update_password_infobar_controller.mm",
@@ -48,6 +55,8 @@ source_set("passwords") {
     "//components/autofill/core/common",
     "//components/autofill/ios/browser",
     "//components/browser_sync",
+    "//components/image_fetcher/core",
+    "//components/image_fetcher/ios",
     "//components/infobars/core",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
@@ -67,10 +76,6 @@ source_set("passwords") {
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/infobars",
-
-    # TODO(crbug.com/435048): Remove payments dependency after landing
-    # https://chromium-review.googlesource.com/c/chromium/src/+/631881.
-    "//ios/chrome/browser/payments",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/sync/glue",
@@ -78,9 +83,12 @@ source_set("passwords") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/infobars",
+    "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
+    "//ios/third_party/material_components_ios:material_components_ios",
     "//ios/web",
+    "//third_party/material_design_icons:ic_account_circle",
     "//ui/base",
     "//url",
   ]
@@ -110,6 +118,7 @@ source_set("unit_tests") {
   sources = [
     "credential_manager_unittest.mm",
     "credential_manager_util_unittest.cc",
+    "js_credential_manager_unittest.mm",
     "password_controller_js_unittest.mm",
     "password_controller_off_the_record_unittest.mm",
     "password_controller_unittest.mm",
@@ -142,6 +151,36 @@ source_set("unit_tests") {
   ]
 }
 
+source_set("eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "credential_manager_egtest.mm",
+  ]
+
+  deps = [
+    ":passwords",
+    "//base",
+    "//base/test:test_support",
+    "//components/autofill/core/common",
+    "//components/autofill/ios/browser",
+    "//components/keyed_service/core",
+    "//components/password_manager/core/browser",
+    "//components/password_manager/core/browser:test_support",
+    "//components/password_manager/core/common",
+    "//components/prefs",
+    "//components/prefs:test_support",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing:ios_test_support",
+    "//ios/web/public/test/http_server",
+  ]
+  libs = [
+    "UIKit.framework",
+    "XCTest.framework",
+  ]
+}
+
 # TODO(crbug.com/487804): use js_compile_checked instead once the errors have
 # been fixed.
 js_compile_unchecked("injected_js") {
diff --git a/chromium/ios/chrome/browser/payments/BUILD.gn b/chromium/ios/chrome/browser/payments/BUILD.gn
index 84f2e85802e..afed6424cf4 100644
--- a/chromium/ios/chrome/browser/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/payments/BUILD.gn
@@ -19,8 +19,6 @@ source_set("payments") {
     "ios_payment_instrument_launcher_factory.mm",
     "ios_payment_request_cache_factory.h",
     "ios_payment_request_cache_factory.mm",
-    "origin_security_checker.h",
-    "origin_security_checker.mm",
     "payment_request.h",
     "payment_request.mm",
     "payment_request_cache.h",
@@ -31,6 +29,7 @@ source_set("payments") {
     "payment_response_helper.mm",
   ]
   deps = [
+    ":constants",
     "//base",
     "//components/autofill/core/browser",
     "//components/image_fetcher/ios",
@@ -52,6 +51,14 @@ source_set("payments") {
   libs = [ "UIKit.framework" ]
 }
 
+source_set("constants") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "payment_request_constants.cc",
+    "payment_request_constants.h",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -59,6 +66,7 @@ source_set("unit_tests") {
     "ios_payment_instrument_finder_unittest.mm",
     "ios_payment_instrument_launcher_unittest.mm",
     "payment_request_unittest.mm",
+    "payment_request_util_unittest.mm",
     "payment_response_helper_unittest.mm",
   ]
   deps = [
@@ -88,6 +96,8 @@ source_set("test_support") {
   sources = [
     "payment_request_test_util.h",
     "payment_request_test_util.mm",
+    "payment_request_unittest_base.h",
+    "payment_request_unittest_base.mm",
     "test_payment_request.h",
     "test_payment_request.mm",
   ]
@@ -99,6 +109,12 @@ source_set("test_support") {
     "//components/payments/core",
     "//components/payments/core:test_support",
     "//components/prefs",
+    "//components/signin/core/browser",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/signin:test_support",
     "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
   ]
 }
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index 731882d2c9e..7e40556d1c9 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -15,7 +15,6 @@ source_set("prerender") {
   ]
 
   deps = [
-    ":provider",
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
@@ -32,16 +31,6 @@ source_set("prerender") {
   ]
 }
 
-source_set("provider") {
-  sources = [
-    "preload_provider.h",
-  ]
-  deps = [
-    "//ui/base",
-    "//url",
-  ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn
index fe219ecd5df..8ee4da3ba67 100644
--- a/chromium/ios/chrome/browser/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn
@@ -40,7 +40,6 @@ source_set("reading_list") {
     "//components/reading_list/ios",
     "//components/sync",
     "//ios/chrome/browser",
-    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
diff --git a/chromium/ios/chrome/browser/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/safe_mode/BUILD.gn
new file mode 100644
index 00000000000..7cd500e806f
--- /dev/null
+++ b/chromium/ios/chrome/browser/safe_mode/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ios/public/provider/chrome/browser/build_config.gni")
+
+source_set("safe_mode") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safe_mode_crashing_modules_config.h",
+    "safe_mode_crashing_modules_config.mm",
+    "safe_mode_util.cc",
+    "safe_mode_util.h",
+  ]
+
+  deps = [
+    ":resources",
+    "//base",
+    ios_packed_resources_target,
+  ]
+
+  libs = [ "UIKit.framework" ]
+}
+
+bundle_data("resources") {
+  visibility = [ ":safe_mode" ]
+  sources = [
+    "resources/SafeModeCrashingModules.plist",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "safe_mode_util_unittest.cc",
+  ]
+  deps = [
+    ":safe_mode",
+    "//base",
+    "//testing/gtest",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 613405951e4..0c8cfea6661 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -30,6 +30,8 @@ source_set("signin") {
     "gaia_auth_fetcher_ios_private.h",
     "gaia_cookie_manager_service_factory.cc",
     "gaia_cookie_manager_service_factory.h",
+    "ios_chrome_signin_client.h",
+    "ios_chrome_signin_client.mm",
     "ios_chrome_signin_status_metrics_provider_delegate.cc",
     "ios_chrome_signin_status_metrics_provider_delegate.h",
     "oauth2_token_service_factory.h",
@@ -38,8 +40,6 @@ source_set("signin") {
     "profile_oauth2_token_service_ios_provider_impl.mm",
     "signin_client_factory.cc",
     "signin_client_factory.h",
-    "signin_client_impl.h",
-    "signin_client_impl.mm",
     "signin_error_controller_factory.cc",
     "signin_error_controller_factory.h",
     "signin_manager_factory.cc",
@@ -59,6 +59,7 @@ source_set("signin") {
     "//components/prefs",
     "//components/signin/core/browser",
     "//components/signin/ios/browser",
+    "//components/signin/ios/browser:active_state_manager",
     "//components/sync",
     "//google_apis",
     "//ios/chrome/browser",
@@ -124,6 +125,7 @@ source_set("unit_tests") {
     "//google_apis",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn
index 8b4aecc6f3a..dd06c9324fa 100644
--- a/chromium/ios/chrome/browser/snapshots/BUILD.gn
+++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn
@@ -11,6 +11,7 @@ source_set("snapshots") {
     "snapshot_cache_factory.h",
     "snapshot_cache_factory.mm",
     "snapshot_cache_internal.h",
+    "snapshot_cache_observer.h",
     "snapshot_cache_web_state_list_observer.h",
     "snapshot_cache_web_state_list_observer.mm",
     "snapshot_constants.h",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index 6891c204e5c..71c46c0e0bd 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -19,6 +19,8 @@ source_set("sync") {
     "sync_setup_service.h",
     "sync_setup_service_factory.cc",
     "sync_setup_service_factory.h",
+    "synced_sessions_bridge.h",
+    "synced_sessions_bridge.mm",
   ]
   deps = [
     "//base",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index fc0f8a257b8..a2c2def877b 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -95,6 +95,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -120,9 +121,9 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/downloads",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/sad_tab",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/chrome/browser/web:web_internal",
@@ -161,6 +162,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn
index c38e7157236..8da34d13580 100644
--- a/chromium/ios/chrome/browser/ui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/BUILD.gn
@@ -25,8 +25,6 @@ source_set("ui") {
     "prerender_final_status.h",
     "reversed_animation.h",
     "reversed_animation.mm",
-    "show_mail_composer_util.h",
-    "show_mail_composer_util.mm",
     "side_swipe_gesture_recognizer.h",
     "side_swipe_gesture_recognizer.mm",
     "url_loader.h",
@@ -62,6 +60,7 @@ source_set("ui_util") {
     "//base",
     "//base:i18n",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui/toolbar:toolbar_base_feature",
     "//ios/web",
     "//ui/base",
     "//ui/gfx",
@@ -109,6 +108,7 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/find_in_page",
@@ -224,7 +224,10 @@ source_set("ui_internal") {
     "external_file_controller.h",
     "external_file_controller.mm",
     "external_file_remover.h",
-    "external_file_remover.mm",
+    "external_file_remover_factory.h",
+    "external_file_remover_factory.mm",
+    "external_file_remover_impl.h",
+    "external_file_remover_impl.mm",
     "fade_truncated_label.h",
     "fade_truncated_label.mm",
     "fullscreen_controller.h",
@@ -252,14 +255,17 @@ source_set("ui_internal") {
     "//base",
     "//base:i18n",
     "//components/bookmarks/browser",
+    "//components/favicon/ios",
     "//components/feature_engagement",
     "//components/image_fetcher/ios",
     "//components/infobars/core",
+    "//components/keyed_service/ios",
     "//components/payments/core",
     "//components/prefs",
     "//components/reading_list/core",
     "//components/search_engines",
     "//components/sessions",
+    "//components/signin/ios/browser:active_state_manager",
     "//components/strings",
     "//components/toolbar",
     "//components/url_formatter",
@@ -314,24 +320,32 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/ntp/recent_tabs",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/overscroll_actions",
+    "//ios/chrome/browser/ui/page_info:coordinator",
+    "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/payments",
     "//ios/chrome/browser/ui/print",
     "//ios/chrome/browser/ui/qr_scanner:coordinator",
     "//ios/chrome/browser/ui/qr_scanner/requirements",
     "//ios/chrome/browser/ui/reading_list",
+    "//ios/chrome/browser/ui/sad_tab:coordinator",
+    "//ios/chrome/browser/ui/settings/sync_utils",
+    "//ios/chrome/browser/ui/snackbar",
     "//ios/chrome/browser/ui/stack_view",
     "//ios/chrome/browser/ui/static_content",
-    "//ios/chrome/browser/ui/sync",
     "//ios/chrome/browser/ui/tab_switcher",
-    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/tabs:coordinator",
+    "//ios/chrome/browser/ui/tabs/requirements",
+    "//ios/chrome/browser/ui/toolbar:toolbar_base_feature",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/webui",
     "//ios/chrome/common",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
@@ -356,7 +370,7 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/stack_view",
     "//ios/chrome/browser/ui/tab_switcher",
-    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/tabs:coordinator",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web:web_internal",
   ]
@@ -436,7 +450,6 @@ source_set("eg_tests") {
     "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index 17f15d9aeae..5cc7ee8e81f 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -41,6 +41,9 @@ source_set("activity_services") {
     "//ui/base",
     "//url",
   ]
+  public_deps = [
+    "//ios/third_party/material_components_ios",
+  ]
   libs = [
     "MobileCoreServices.framework",
     "UIKit.framework",
@@ -57,6 +60,7 @@ source_set("coordinator") {
     ":activity_services",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
@@ -81,6 +85,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/chrome/browser/ui/commands",
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn
index 2307fdca9ef..f6079ea154c 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn
@@ -7,6 +7,5 @@ source_set("requirements") {
     "activity_service_password.h",
     "activity_service_positioner.h",
     "activity_service_presentation.h",
-    "activity_service_snackbar.h",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index 37034c1ae80..99017aaa722 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -156,6 +156,7 @@ source_set("eg_tests") {
     "signin_interaction_controller_egtest.mm",
   ]
   deps = [
+    ":eg_test_support",
     "//base",
     "//base/test:test_support",
     "//components/signin/core/browser",
@@ -184,12 +185,18 @@ source_set("eg_test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "signin_promo_view_earlgrey_utils.h",
-    "signin_promo_view_earlgrey_utils.mm",
+    "signin_earlgrey_utils.h",
+    "signin_earlgrey_utils.mm",
   ]
   deps = [
     ":authentication_ui",
+    "//components/signin/core/browser:browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/public/provider/chrome/browser/signin",
+    "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/third_party/earl_grey",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index 2bced58fc89..628ff9eb375 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -5,13 +5,13 @@
 source_set("autofill") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "autofill_client_ios.h",
-    "autofill_client_ios.mm",
     "autofill_save_card_infobar.mm",
     "autofill_ui_type_util.h",
     "autofill_ui_type_util.mm",
     "card_unmask_prompt_view_bridge.h",
     "card_unmask_prompt_view_bridge.mm",
+    "chrome_autofill_client_ios.h",
+    "chrome_autofill_client_ios.mm",
     "storage_switch_tooltip.h",
     "storage_switch_tooltip.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 45d3f4cb73f..c82405c4baf 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -51,10 +51,10 @@ source_set("bookmarks") {
     "bookmark_navigation_controller.mm",
     "bookmark_panel_view.h",
     "bookmark_panel_view.mm",
+    "bookmark_path_cache.h",
+    "bookmark_path_cache.mm",
     "bookmark_position_cache.h",
     "bookmark_position_cache.mm",
-    "bookmark_promo_cell.h",
-    "bookmark_promo_cell.mm",
     "bookmark_promo_controller.h",
     "bookmark_promo_controller.mm",
     "bookmark_signin_promo_cell.h",
@@ -82,6 +82,7 @@ source_set("bookmarks") {
     "resources:bookmark_gray_close",
     "resources:bookmark_gray_edit",
     "resources:bookmark_gray_folder",
+    "resources:bookmark_gray_folder_new",
     "resources:bookmark_gray_menu",
     "resources:bookmark_gray_new_folder",
     "resources:bookmark_gray_star_large",
@@ -113,6 +114,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
@@ -128,7 +130,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/ntp",
-    "//ios/chrome/browser/ui/sync",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/undo",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
@@ -159,16 +161,19 @@ source_set("unit_tests") {
     "bookmark_home_view_controller_unittest.mm",
     "bookmark_ios_unittest.h",
     "bookmark_ios_unittest.mm",
+    "bookmark_path_cache_unittest.mm",
     "bookmark_position_cache_unittest.mm",
     "bookmark_utils_ios_unittest.mm",
   ]
   deps = [
     ":bookmarks",
     "//base",
+    "//base/test:test_support",
     "//components/bookmarks/browser",
     "//components/bookmarks/test",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/web/public/test",
     "//testing/gtest",
@@ -196,6 +201,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/tools_menu",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index 944f4c4a76e..9fc312927e4 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -8,8 +8,6 @@ source_set("cells") {
     "bookmark_parent_folder_item.mm",
     "bookmark_table_cell.h",
     "bookmark_table_cell.mm",
-    "bookmark_table_promo_cell.h",
-    "bookmark_table_promo_cell.mm",
     "bookmark_table_signin_promo_cell.h",
     "bookmark_table_signin_promo_cell.mm",
     "bookmark_text_field_item.h",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
index 321821204e0..811b52b25e4 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
@@ -121,6 +121,15 @@ imageset("bookmark_gray_folder") {
   ]
 }
 
+imageset("bookmark_gray_folder_new") {
+  sources = [
+    "bookmark_gray_folder_new.imageset/Contents.json",
+    "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new.png",
+    "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new@2x.png",
+    "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new@3x.png",
+  ]
+}
+
 imageset("bookmark_gray_menu") {
   sources = [
     "bookmark_gray_menu.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn
index f5ecaafc2a7..3fff254aef0 100644
--- a/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn
@@ -8,18 +8,44 @@ source_set("browser_list") {
     "browser.mm",
     "browser_list.h",
     "browser_list.mm",
+    "browser_list_factory.h",
     "browser_list_observer.h",
     "browser_list_observer.mm",
     "browser_list_session_service.h",
     "browser_list_session_service_factory.h",
+    "browser_user_data.h",
+  ]
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser/ui/broadcaster",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+# This is a separate target to break circular dependencies. The "browser_list"
+# target must not depends on this one.
+source_set("browser_list_impl") {
+  visibility = [
+    ":unit_tests",
+    "//ios/chrome/browser/browser_state:browser_state_impl",
+  ]
+  sources = [
+    "browser_list_factory.mm",
+    "browser_list_impl.h",
+    "browser_list_impl.mm",
     "browser_list_session_service_factory.mm",
     "browser_list_session_service_impl.h",
     "browser_list_session_service_impl.mm",
-    "browser_user_data.h",
     "browser_web_state_list_delegate.h",
     "browser_web_state_list_delegate.mm",
   ]
   deps = [
+    ":browser_list",
     "//base",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
@@ -29,8 +55,6 @@ source_set("browser_list") {
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/ssl",
-    "//ios/chrome/browser/ui/broadcaster",
-    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/web",
@@ -41,13 +65,16 @@ source_set("browser_list") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "browser_list_unittest.mm",
+    "browser_list_impl_unittest.mm",
   ]
   deps = [
     ":browser_list",
+    ":browser_list_impl",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
     "//testing/gtest",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
index e648f4aeb97..da0c01b1878 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -22,13 +22,13 @@ source_set("commands") {
     "open_new_tab_command.mm",
     "open_url_command.h",
     "open_url_command.mm",
+    "page_info_commands.h",
     "qr_scanner_commands.h",
     "reading_list_add_command.h",
     "reading_list_add_command.mm",
-    "show_mail_composer_command.h",
-    "show_mail_composer_command.mm",
     "show_signin_command.h",
     "show_signin_command.mm",
+    "snackbar_commands.h",
     "start_voice_search_command.h",
     "start_voice_search_command.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 7530e385506..00fdec9efcc 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -25,7 +25,6 @@ source_set("content_suggestions") {
     "content_suggestions_view_controller.h",
     "content_suggestions_view_controller.mm",
     "content_suggestions_view_controller_audience.h",
-    "content_suggestions_view_controller_delegate.h",
   ]
   deps = [
     ":content_suggestions_constant",
@@ -36,6 +35,7 @@ source_set("content_suggestions") {
     "//components/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/collection_view",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/favicon:favicon_ui",
@@ -109,13 +109,14 @@ source_set("eg_tests") {
     "ntp_home_egtest.mm",
     "ntp_home_provider_test_singleton.h",
     "ntp_home_provider_test_singleton.mm",
+    "ntp_home_test_utils.h",
+    "ntp_home_test_utils.mm",
   ]
   deps = [
     ":content_suggestions",
     ":content_suggestions_constant",
     ":content_suggestions_util",
     "//base",
-    "//base/test:test_support",
     "//components/keyed_service/ios",
     "//components/ntp_snippets",
     "//components/ntp_snippets:test_support",
@@ -128,6 +129,8 @@ source_set("eg_tests") {
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
+    "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing:ios_test_support",
diff --git a/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn
index 422056f472c..2517cb0a9cc 100644
--- a/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn
@@ -24,6 +24,8 @@ source_set("test_support") {
   sources = [
     "browser_coordinator_test.h",
     "browser_coordinator_test.mm",
+    "browser_coordinator_test_util.h",
+    "browser_coordinator_test_util.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -31,9 +33,11 @@ source_set("test_support") {
   deps = [
     ":coordinators",
     "//base",
-    "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/testing:ios_test_support",
+    "//ios/web/public/test",
     "//testing/gtest",
   ]
 }
@@ -49,5 +53,6 @@ source_set("unit_tests") {
   deps = [
     ":coordinators",
     ":test_support",
+    "//ios/chrome/browser/ui/commands",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
index 540226b4331..8253a6c1c19 100644
--- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
@@ -40,6 +40,8 @@ source_set("dialogs_internal") {
     "dialog_presenter.mm",
     "java_script_dialog_presenter_impl.h",
     "java_script_dialog_presenter_impl.mm",
+    "nsurl_protection_space_util.h",
+    "nsurl_protection_space_util.mm",
   ]
   deps = [
     ":dialogs",
@@ -49,7 +51,6 @@ source_set("dialogs_internal") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/shared/chrome/browser/ui/dialogs",
     "//ios/web",
     "//ui/base",
     "//url",
@@ -62,6 +63,8 @@ source_set("unit_tests_internal") {
   testonly = true
   sources = [
     "dialog_presenter_unittest.mm",
+    "java_script_dialog_presenter_impl_unittest.mm",
+    "nsurl_protection_space_util_unittest.mm",
   ]
   deps = [
     ":dialogs_internal",
@@ -69,7 +72,6 @@ source_set("unit_tests_internal") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/shared/chrome/browser/ui/dialogs:unit_tests",
     "//ios/web",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index d9770cfa739..30e4e3a6d8c 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -40,7 +40,7 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/promos",
     "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/sync",
+    "//ios/chrome/browser/ui/settings/sync_utils",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
@@ -99,6 +99,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/geolocation:test_support",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/public/provider/chrome/browser/signin:test_support",
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 83decf6b4ab..02acfe02ff1 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -31,6 +31,7 @@ source_set("history") {
     "ios_browsing_history_driver.mm",
   ]
   deps = [
+    ":history_base_feature",
     "//base",
     "//base:i18n",
     "//components/browser_sync",
@@ -80,6 +81,16 @@ source_set("history") {
   ]
 }
 
+source_set("history_base_feature") {
+  sources = [
+    "history_base_feature.h",
+    "history_base_feature.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -161,6 +172,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui:ui",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index 33426997e33..0cbf92d129b 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -14,6 +14,7 @@ source_set("main") {
     "main_view_controller.mm",
   ]
   deps = [
+    ":feature_flags",
     "//base",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -34,6 +35,17 @@ source_set("main") {
   libs = [ "UIKit.framework" ]
 }
 
+source_set("feature_flags") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "main_feature_flags.cc",
+    "main_feature_flags.h",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -43,13 +55,16 @@ source_set("unit_tests") {
     "main_view_controller_unittest.mm",
   ]
   deps = [
+    ":feature_flags",
     ":main",
     "//base",
+    "//base/test:test_support",
     "//components/bookmarks/test",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/test:block_cleanup_test",
     "//ios/web/public/test",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/ui/metrics/BUILD.gn b/chromium/ios/chrome/browser/ui/metrics/BUILD.gn
index ec8a781e879..2e1cdbc5474 100644
--- a/chromium/ios/chrome/browser/ui/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/metrics/BUILD.gn
@@ -6,6 +6,17 @@ source_set("metrics") {
   sources = [
     "metrics_recorder.h",
   ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
 
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "metrics_test_util.h",
+    "metrics_test_util.mm",
+  ]
+  deps = [
+    "//base",
+  ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index 960249d6af7..73c2d8e5935 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -4,6 +4,7 @@
 
 source_set("ntp") {
   sources = [
+    "incognito_view_controller_delegate.h",
     "new_tab_page_header_constants.h",
     "new_tab_page_header_constants.mm",
     "new_tab_page_panel_protocol.h",
@@ -33,6 +34,7 @@ source_set("ntp_header") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_util",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar:resource_macros",
+    "//ios/chrome/browser/ui/toolbar:toolbar_base_feature",
     "//ios/chrome/common",
     "//ui/base",
   ]
@@ -80,8 +82,12 @@ source_set("ntp_internal") {
     "google_landing_mediator.mm",
     "google_landing_view_controller.h",
     "google_landing_view_controller.mm",
-    "incognito_panel_controller.h",
-    "incognito_panel_controller.mm",
+    "incognito_view.h",
+    "incognito_view.mm",
+    "incognito_view_controller.h",
+    "incognito_view_controller.mm",
+    "modal_ntp.h",
+    "modal_ntp.mm",
     "most_visited_cell.h",
     "most_visited_cell.mm",
     "most_visited_layout.h",
@@ -159,6 +165,7 @@ source_set("ntp_internal") {
     "//components/suggestions",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
@@ -172,6 +179,7 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_util",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/context_menu",
@@ -237,6 +245,7 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
@@ -244,6 +253,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/browser/web_state_list:web_state_list",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
index b0424109c00..5b143a6b5ef 100644
--- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
@@ -5,8 +5,8 @@
 source_set("recent_tabs") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "recent_tabs_bridges.h",
-    "recent_tabs_bridges.mm",
+    "closed_tabs_observer_bridge.h",
+    "closed_tabs_observer_bridge.mm",
     "recent_tabs_handset_coordinator.h",
     "recent_tabs_handset_coordinator.mm",
     "recent_tabs_handset_view_controller.h",
@@ -38,7 +38,6 @@ source_set("recent_tabs") {
     "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp/recent_tabs/views",
-    "//ios/chrome/browser/ui/sync/",
     "//ios/web",
     "//ui/base",
     "//url",
@@ -83,14 +82,17 @@ source_set("eg_tests") {
     "recent_tabs_table_egtest.mm",
   ]
   deps = [
+    "//base/test:test_support",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/earl_grey",
     "//ios/web/public/test/http_server",
+    "//ui/base",
   ]
   libs = [ "XCTest.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn
index 2a203c2e12a..b93c20bd81b 100644
--- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn
@@ -24,8 +24,6 @@ source_set("views") {
     "signed_in_sync_off_view.mm",
     "signed_in_sync_on_no_sessions_view.h",
     "signed_in_sync_on_no_sessions_view.mm",
-    "signed_out_view.h",
-    "signed_out_view.mm",
     "spacers_view.h",
     "spacers_view.mm",
     "views_utils.h",
@@ -42,7 +40,7 @@ source_set("views") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/material_components",
-    "//ios/chrome/browser/ui/sync",
+    "//ios/chrome/browser/ui/settings/sync_utils",
     "//ios/chrome/browser/ui/tab_switcher:utils",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index 43c0942c697..496184a4500 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -1,9 +1,24 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 source_set("omnibox") {
   sources = [
+    "location_bar_controller.cc",
+    "location_bar_controller.h",
+    "location_bar_delegate.h",
+    "web_omnibox_edit_controller.cc",
+    "web_omnibox_edit_controller.h",
+  ]
+  deps = [
+    "//base",
+    "//components/omnibox/browser",
+    "//ui/base",
+  ]
+}
+
+source_set("omnibox_util") {
+  sources = [
     "omnibox_util.cc",
     "omnibox_util.h",
   ]
@@ -18,15 +33,25 @@ source_set("omnibox") {
 source_set("omnibox_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "autocomplete_match_formatter.h",
+    "autocomplete_match_formatter.mm",
+    "autocomplete_result_consumer.h",
+    "autocomplete_suggestion.h",
     "chrome_omnibox_client_ios.h",
     "chrome_omnibox_client_ios.mm",
+    "image_retriever.h",
     "location_bar_controller_impl.h",
     "location_bar_controller_impl.mm",
-    "omnibox_popup_material_row.h",
-    "omnibox_popup_material_row.mm",
-    "omnibox_popup_material_view_controller.h",
-    "omnibox_popup_material_view_controller.mm",
+    "omnibox_popup_mediator.h",
+    "omnibox_popup_mediator.mm",
     "omnibox_popup_positioner.h",
+    "omnibox_popup_presenter.h",
+    "omnibox_popup_presenter.mm",
+    "omnibox_popup_provider.h",
+    "omnibox_popup_row.h",
+    "omnibox_popup_row.mm",
+    "omnibox_popup_view_controller.h",
+    "omnibox_popup_view_controller.mm",
     "omnibox_popup_view_ios.h",
     "omnibox_popup_view_ios.mm",
     "omnibox_popup_view_suggestions_delegate.h",
@@ -37,28 +62,21 @@ source_set("omnibox_internal") {
     "omnibox_text_field_paste_delegate.mm",
     "omnibox_view_ios.h",
     "omnibox_view_ios.mm",
-    "page_info_model.cc",
-    "page_info_model.h",
-    "page_info_model_observer.h",
-    "page_info_view_controller.h",
-    "page_info_view_controller.mm",
     "truncating_attributed_label.h",
     "truncating_attributed_label.mm",
   ]
   deps = [
     ":omnibox",
+    ":omnibox_util",
     "resources:omnibox_background",
     "resources:omnibox_transparent_background",
     "//base",
-    "//base:i18n",
     "//components/favicon/ios",
     "//components/image_fetcher/ios",
-    "//components/keyed_service/core",
     "//components/open_from_clipboard",
     "//components/resources",
     "//components/search_engines",
     "//components/security_state/core",
-    "//components/ssl_errors",
     "//components/strings",
     "//components/toolbar",
     "//ios/chrome/app/strings",
@@ -70,16 +88,12 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/net",
     "//ios/chrome/browser/prerender",
-    "//ios/chrome/browser/prerender:provider",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/fancy_ui",
-    "//ios/chrome/browser/ui/popup_menu",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index bd98076af88..bcf9a0a2918 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -23,6 +23,7 @@ source_set("overscroll_actions") {
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/history_popup/requirements",
+    "//ios/chrome/browser/ui/page_info:coordinator",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
new file mode 100644
index 00000000000..f62ca29f6ed
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn
@@ -0,0 +1,57 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("page_info") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "page_info_model.cc",
+    "page_info_model.h",
+    "page_info_model_observer.h",
+    "page_info_view_controller.h",
+    "page_info_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//components/keyed_service/core",
+    "//components/ssl_errors",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/app/theme",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/fancy_ui",
+    "//ios/chrome/browser/ui/page_info/requirements",
+    "//ios/chrome/browser/ui/popup_menu",
+    "//ios/chrome/common",
+    "//ios/web",
+    "//ui/base",
+    "//ui/gfx",
+    "//url",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "page_info_legacy_coordinator.h",
+    "page_info_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":page_info",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/reading_list",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/page_info/requirements",
+    "//ios/web",
+    "//ios/web:reload_type",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn
new file mode 100644
index 00000000000..82032f28f2e
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("requirements") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "page_info_presentation.h",
+    "page_info_reloading.h",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
index b5dedf6bff5..c09813b4ccd 100644
--- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
@@ -114,6 +114,8 @@ source_set("payments_ui") {
     "payment_request_error_view_controller.h",
     "payment_request_error_view_controller.mm",
     "payment_request_error_view_controller_actions.h",
+    "payment_request_navigation_controller.h",
+    "payment_request_navigation_controller.mm",
     "payment_request_picker_row.h",
     "payment_request_picker_row.mm",
     "payment_request_picker_view_controller.h",
@@ -172,8 +174,6 @@ source_set("unit_tests") {
     "payment_request_error_view_controller_unittest.mm",
     "payment_request_mediator_unittest.mm",
     "payment_request_selector_view_controller_unittest.mm",
-    "payment_request_unittest_base.h",
-    "payment_request_unittest_base.mm",
     "payment_request_view_controller_unittest.mm",
     "region_data_loader_unittest.mm",
     "shipping_address_selection_coordinator_unittest.mm",
@@ -195,12 +195,10 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autofill:autofill_internal",
-    "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/payments",
     "//ios/chrome/browser/payments:test_support",
     "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/autofill:autofill_ui",
     "//ios/chrome/browser/ui/autofill/cells",
@@ -214,7 +212,6 @@ source_set("unit_tests") {
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web/public/test",
-    "//ios/web/public/test/fakes",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index 418a0d5c59a..5a64ccad603 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -71,11 +71,11 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/base",
     "//ios/chrome/test/earl_grey:test_support",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey",
     "//ios/web/public/test/http_server",
diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
index 4b96b076c33..406d74f2d1c 100644
--- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn
@@ -28,6 +28,21 @@ source_set("sad_tab") {
   libs = [ "UIKit.framework" ]
 }
 
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "sad_tab_legacy_coordinator.h",
+    "sad_tab_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":sad_tab",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web:tab_helper_delegates",
+    "//ios/web",
+  ]
+}
+
 source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/app/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
index fa95210df50..e95e8537482 100644
--- a/chromium/ios/chrome/app/safe_mode/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
@@ -18,6 +18,7 @@ source_set("safe_mode") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/crash_report",
+    "//ios/chrome/browser/safe_mode",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/fancy_ui",
     "//ui/gfx",
@@ -54,11 +55,11 @@ source_set("unit_tests") {
   deps = [
     ":safe_mode",
     "//base",
-    "//breakpad:client",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/test/base",
     "//ios/chrome/test/ocmock",
     "//testing/gtest",
+    "//third_party/breakpad:client",
     "//third_party/ocmock",
   ]
   libs = [ "UIKit.framework" ]
diff --git a/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/resources/BUILD.gn
index 1a834b95870..1a834b95870 100644
--- a/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/safe_mode/resources/BUILD.gn
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index aeca277e594..5ae6ec71b40 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -149,8 +149,8 @@ source_set("settings") {
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/payments/cells",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/sync_utils",
     "//ios/chrome/browser/ui/settings/utils",
-    "//ios/chrome/browser/ui/sync",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web:features",
     "//ios/chrome/browser/web:web",
@@ -289,7 +289,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/settings/cells",
-    "//ios/chrome/browser/ui/sync",
+    "//ios/chrome/browser/ui/settings/sync_utils",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:features",
@@ -350,6 +350,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/util:util",
diff --git a/chromium/ios/chrome/browser/ui/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync_utils/BUILD.gn
index de187ce54e3..e31229ad3c1 100644
--- a/chromium/ios/chrome/browser/ui/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync_utils/BUILD.gn
@@ -4,15 +4,13 @@
 
 import("//ios/public/provider/chrome/browser/build_config.gni")
 
-source_set("sync") {
+source_set("sync_utils") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "sync_error_infobar_delegate.h",
     "sync_error_infobar_delegate.mm",
     "sync_util.h",
     "sync_util.mm",
-    "synced_sessions_bridge.h",
-    "synced_sessions_bridge.mm",
   ]
   deps = [
     "//base",
@@ -53,6 +51,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index 1ea03427b92..379b721166d 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -29,7 +29,7 @@ source_set("side_swipe") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/ntp",
-    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/tabs/requirements",
     "//ios/chrome/browser/web",
     "//ios/chrome/common",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn
new file mode 100644
index 00000000000..6c34a29c12d
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn
@@ -0,0 +1,30 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("snackbar") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "snackbar_coordinator.h",
+    "snackbar_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/commands",
+    "//ios/third_party/material_components_ios",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "snackbar_coordinator_unittest.mm",
+  ]
+  deps = [
+    ":snackbar",
+    "//ios/chrome/browser/ui/commands",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
index b4e6c9ceec1..07e67bff966 100644
--- a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
@@ -42,6 +42,7 @@ source_set("stack_view") {
     "resources:card_frame_shadow",
     "resources:stack_view_background_noise",
     "//base",
+    "//components/favicon/ios",
     "//components/feature_engagement",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -54,8 +55,8 @@ source_set("stack_view") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/tab_switcher",
-    "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/ui/toolbar:toolbar_base_feature",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/common",
@@ -88,6 +89,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/test:test_support",
     "//ios/testing:ocmock_support",
+    "//ios/web/public/test/fakes",
     "//testing/gtest",
     "//third_party/ocmock",
   ]
@@ -107,7 +109,6 @@ source_set("eg_tests") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:ui_internal",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
index a074ded2e5c..df373cb398d 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
@@ -35,8 +35,6 @@ source_set("tab_switcher") {
     "tab_switcher_session_cell_data.mm",
     "tab_switcher_session_changes.h",
     "tab_switcher_session_changes.mm",
-    "tab_switcher_tab_strip_placeholder_view.h",
-    "tab_switcher_tab_strip_placeholder_view.mm",
     "tab_switcher_transition_context.h",
     "tab_switcher_transition_context.mm",
     "tab_switcher_view.h",
@@ -59,6 +57,7 @@ source_set("tab_switcher") {
     "resources:tabswitcher_tablet",
     "//base",
     "//components/browser_sync",
+    "//components/favicon/ios",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/sync",
@@ -83,8 +82,8 @@ source_set("tab_switcher") {
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/ntp/recent_tabs/views",
-    "//ios/chrome/browser/ui/sync",
-    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/settings/sync_utils",
+    "//ios/chrome/browser/ui/tabs/requirements",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:ios_app_bundle_id_prefix_header",
@@ -100,7 +99,6 @@ source_set("tab_switcher") {
   public_deps = [
     "//ios/chrome/browser/ui/ntp/recent_tabs",
   ]
-  allow_circular_includes_from = [ "//ios/chrome/browser/ui/tabs" ]
   libs = [
     "QuartzCore.framework",
     "UIKit.framework",
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index dab654aa9e6..3817f5d2733 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -5,10 +5,11 @@
 source_set("tabs") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "tab_strip_controller+tab_switcher_animation.h",
+    "tab_strip_controller+placeholder_view.h",
     "tab_strip_controller.h",
     "tab_strip_controller.mm",
-    "tab_strip_controller_private.h",
+    "tab_strip_placeholder_view.h",
+    "tab_strip_placeholder_view.mm",
     "tab_strip_view.h",
     "tab_strip_view.mm",
     "tab_view.h",
@@ -36,6 +37,7 @@ source_set("tabs") {
     "resources:tabstrip_toggle_button_gradient",
     "//base",
     "//base:i18n",
+    "//components/favicon/ios",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -44,6 +46,7 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/tabs/requirements",
     "//ios/chrome/browser/ui/util",
     "//ios/third_party/material_components_ios",
     "//ios/web",
@@ -54,6 +57,22 @@ source_set("tabs") {
   libs = [ "UIKit.framework" ]
 }
 
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_strip_legacy_coordinator.h",
+    "tab_strip_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":tabs",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/bubble",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/tabs/requirements",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -68,6 +87,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
     "//testing/gtest",
     "//third_party/ocmock",
   ]
diff --git a/chromium/ios/chrome/browser/ui/tabs/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/requirements/BUILD.gn
new file mode 100644
index 00000000000..d75a2a66244
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/tabs/requirements/BUILD.gn
@@ -0,0 +1,18 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("requirements") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_strip_constants.h",
+    "tab_strip_constants.mm",
+    "tab_strip_fold_animation.h",
+    "tab_strip_highlighting.h",
+    "tab_strip_presentation.h",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui:ui_util",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index e4c5d5622ce..c2986eb95df 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -7,11 +7,16 @@ source_set("toolbar") {
   sources = [
     "new_tab_button.h",
     "new_tab_button.mm",
+    "omnibox_focuser.h",
     "toolbar_button_tints.h",
     "toolbar_button_tints.mm",
     "toolbar_controller+protected.h",
     "toolbar_controller.h",
     "toolbar_controller.mm",
+    "toolbar_controller_constants.h",
+    "toolbar_controller_constants.mm",
+    "toolbar_coordinator.h",
+    "toolbar_coordinator.mm",
     "toolbar_model_delegate_ios.h",
     "toolbar_model_delegate_ios.mm",
     "toolbar_model_impl_ios.h",
@@ -20,13 +25,20 @@ source_set("toolbar") {
     "toolbar_owner.h",
     "toolbar_tools_menu_button.h",
     "toolbar_tools_menu_button.mm",
+    "toolbar_view.h",
+    "toolbar_view.mm",
+    "toolbar_view_delegate.h",
     "tools_menu_button_observer_bridge.h",
     "tools_menu_button_observer_bridge.mm",
     "web_toolbar_controller.h",
     "web_toolbar_controller.mm",
+    "web_toolbar_controller_constants.h",
+    "web_toolbar_controller_constants.mm",
+    "web_toolbar_delegate.h",
   ]
   deps = [
     ":resource_macros",
+    ":toolbar_base_feature",
     "resources:collapse",
     "resources:collapse_incognito",
     "resources:collapse_pressed",
@@ -67,6 +79,8 @@ source_set("toolbar") {
     "//ios/chrome/browser/ui/history",
     "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/ntp",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/popup_menu",
     "//ios/chrome/browser/ui/qr_scanner/requirements",
     "//ios/chrome/browser/ui/toolbar/keyboard_assist",
@@ -79,7 +93,6 @@ source_set("toolbar") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/voice",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
@@ -113,6 +126,16 @@ source_set("resource_macros") {
   ]
 }
 
+source_set("toolbar_base_feature") {
+  sources = [
+    "toolbar_controller_base_feature.h",
+    "toolbar_controller_base_feature.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
index 260b2e9b8e2..dc2e0e5df64 100644
--- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
@@ -99,7 +99,6 @@ source_set("eg_tests") {
     "//ios/chrome/browser:browser",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:ui_internal",
-    "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/earl_grey",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index 07b0b749e43..8b46d82d5db 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -9,6 +9,8 @@ source_set("util") {
     "CRUILabel+AttributeUtils.mm",
     "core_text_util.h",
     "core_text_util.mm",
+    "form_sheet_navigation_controller.h",
+    "form_sheet_navigation_controller.mm",
     "i18n_string.h",
     "i18n_string.mm",
     "label_link_controller.h",
@@ -17,6 +19,8 @@ source_set("util") {
     "label_observer.mm",
     "manual_text_framer.h",
     "manual_text_framer.mm",
+    "named_guide.h",
+    "named_guide.mm",
     "pasteboard_util.h",
     "pasteboard_util.mm",
     "relaxed_bounds_constraints_hittest.h",
@@ -53,6 +57,7 @@ source_set("unit_tests") {
     "label_link_controller_unittest.mm",
     "label_observer_unittest.mm",
     "manual_text_framer_unittest.mm",
+    "named_guide_unittest.mm",
     "text_region_mapper_unittest.mm",
   ]
   deps = [
diff --git a/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn
index 969f0a400fd..25d8f49a18a 100644
--- a/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn
@@ -3,9 +3,10 @@
 # found in the LICENSE file.
 
 source_set("net_export") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "net_export_ui.cc",
     "net_export_ui.h",
+    "net_export_ui.mm",
   ]
   deps = [
     "//base",
@@ -14,7 +15,7 @@ source_set("net_export") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/webui",
     "//ios/chrome/common:common",
     "//ios/web",
     "//net:net",
diff --git a/chromium/ios/chrome/browser/voice/BUILD.gn b/chromium/ios/chrome/browser/voice/BUILD.gn
index 5d81ae39c80..22d37de5218 100644
--- a/chromium/ios/chrome/browser/voice/BUILD.gn
+++ b/chromium/ios/chrome/browser/voice/BUILD.gn
@@ -12,6 +12,8 @@ source_set("voice") {
     "speech_input_locale_config_impl.mm",
     "speech_input_locale_match_config.h",
     "speech_input_locale_match_config.mm",
+    "voice_search_navigations_tab_helper.h",
+    "voice_search_navigations_tab_helper.mm",
   ]
 
   deps = [
@@ -20,6 +22,7 @@ source_set("voice") {
     "//components/prefs",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/voice",
+    "//ios/web",
   ]
 }
 
@@ -69,10 +72,12 @@ source_set("unit_tests") {
   sources = [
     "text_to_speech_listener_unittest.mm",
     "text_to_speech_parser_unittest.mm",
+    "voice_search_navigations_tab_helper_unittest.mm",
   ]
 
   deps = [
     ":tts",
+    ":voice",
     "//base",
     "//ios/web",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index fe92e021b06..cb6caa47e87 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -15,6 +15,8 @@ source_set("web") {
     "mailto_handler.mm",
     "mailto_handler_gmail.h",
     "mailto_handler_gmail.mm",
+    "mailto_handler_inbox.h",
+    "mailto_handler_inbox.mm",
     "mailto_handler_system_mail.h",
     "mailto_handler_system_mail.mm",
     "mailto_url_rewriter.h",
@@ -42,7 +44,6 @@ source_set("web") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/alert_coordinator:alert_coordinator",
     "//ios/chrome/browser/ui/commands:commands",
     "//ios/chrome/browser/ui/util:util",
     "//ios/web",
@@ -65,6 +66,7 @@ source_set("tab_helper_delegates") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "page_placeholder_tab_helper_delegate.h",
+    "repost_form_tab_helper_delegate.h",
     "sad_tab_tab_helper_delegate.h",
   ]
 }
@@ -75,6 +77,7 @@ source_set("unit_tests") {
   sources = [
     "legacy_mailto_url_rewriter_unittest.mm",
     "mailto_handler_gmail_unittest.mm",
+    "mailto_handler_inbox_unittest.mm",
     "mailto_handler_system_mail_unittest.mm",
     "mailto_handler_unittest.mm",
     "navigation_manager_util_unittest.mm",
@@ -91,8 +94,7 @@ source_set("unit_tests") {
     ":web",
     "//base:base",
     "//base/test:test_support",
-    "//components/strings:components_strings_grit",
-    "//ios/chrome/browser/ui:ui",
+    "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/test:test_support",
     "//ios/web:web",
     "//ios/web/public/test",
@@ -132,10 +134,6 @@ js_compile_checked("credential_manager") {
 source_set("web_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "auto_reload_bridge.h",
-    "auto_reload_bridge.mm",
-    "auto_reload_controller.h",
-    "auto_reload_controller.mm",
     "blocked_popup_tab_helper.h",
     "blocked_popup_tab_helper.mm",
     "chrome_web_client.h",
@@ -147,8 +145,9 @@ source_set("web_internal") {
     "external_app_launcher.h",
     "external_app_launcher.mm",
     "passkit_dialog_provider.h",
-    "print_observer.h",
-    "print_observer.mm",
+    "print_tab_helper.h",
+    "print_tab_helper.mm",
+    "web_state_printer.h",
   ]
   deps = [
     ":chrome_bundle",
@@ -188,7 +187,10 @@ source_set("web_internal") {
     "//ui/gfx",
     "//url",
   ]
-  libs = [ "UIKit.framework" ]
+  libs = [
+    "UIKit.framework",
+    "Foundation.framework",
+  ]
 }
 
 source_set("test_support") {
@@ -215,7 +217,6 @@ source_set("unit_tests_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "auto_reload_controller_unittest.mm",
     "blocked_popup_tab_helper_unittest.mm",
     "chrome_web_client_unittest.mm",
     "error_page_generator_unittest.mm",
@@ -305,10 +306,11 @@ source_set("perf_tests") {
   ]
   deps = [
     "//base",
+    "//base/test:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/test/base:perf_test_support",
     "//ios/web",
     "//ios/web/public/test",
-    "//ios/web/public/test/fakes",
   ]
   libs = [ "WebKit.framework" ]
 }
diff --git a/chromium/ios/shared/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/webui/BUILD.gn
index a04eaea93fb..b8ea0123317 100644
--- a/chromium/ios/shared/chrome/browser/ui/dialogs/BUILD.gn
+++ b/chromium/ios/chrome/browser/webui/BUILD.gn
@@ -1,40 +1,34 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("dialogs") {
+source_set("webui") {
+  sources = [
+    "net_export_tab_helper.h",
+    "net_export_tab_helper.mm",
+    "net_export_tab_helper_delegate.h",
+    "show_mail_composer_context.h",
+    "show_mail_composer_context.mm",
+  ]
   deps = [
     "//base",
-    "//components/strings",
-    "//components/url_formatter",
     "//ios/web",
-    "//ui/base",
-  ]
-
-  sources = [
-    "nsurl_protection_space_util.h",
-    "nsurl_protection_space_util.mm",
   ]
-
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-
   sources = [
-    "nsurl_protection_space_util_unittest.mm",
+    "net_export_tab_helper_unittest.mm",
   ]
-
   deps = [
-    ":dialogs",
+    ":webui",
     "//base",
     "//components/strings",
     "//ios/web",
-    "//ios/web/public/test/fakes",
+    "//ios/web/public/test",
     "//testing/gtest",
-    "//ui/base",
   ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/common/BUILD.gn b/chromium/ios/chrome/common/BUILD.gn
index f38e2705982..6297153ad98 100644
--- a/chromium/ios/chrome/common/BUILD.gn
+++ b/chromium/ios/chrome/common/BUILD.gn
@@ -10,8 +10,6 @@ source_set("common") {
   sources = [
     "channel_info.h",
     "channel_info.mm",
-    "material_timing.h",
-    "material_timing.mm",
     "string_util.h",
     "string_util.mm",
     "x_callback_url.cc",
@@ -28,9 +26,39 @@ source_set("common") {
     "//url",
   ]
 
+  public_deps = [
+    ":timing",
+  ]
+
   libs = [ "QuartzCore.framework" ]
 }
 
+source_set("common_extension") {
+  sources = [
+    "highlight_button.h",
+    "highlight_button.mm",
+  ]
+
+  libs = [ "UIKit.framework" ]
+
+  public_deps = [
+    ":timing",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("timing") {
+  sources = [
+    "material_timing.h",
+    "material_timing.mm",
+  ]
+
+  libs = [ "QuartzCore.framework" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
diff --git a/chromium/ios/chrome/common/app_group/BUILD.gn b/chromium/ios/chrome/common/app_group/BUILD.gn
index 2f482d83fdb..89c9cac3841 100644
--- a/chromium/ios/chrome/common/app_group/BUILD.gn
+++ b/chromium/ios/chrome/common/app_group/BUILD.gn
@@ -11,6 +11,8 @@ source_set("app_group") {
     "app_group_constants.mm",
     "app_group_metrics.h",
     "app_group_metrics.mm",
+    "app_group_utils.h",
+    "app_group_utils.mm",
   ]
 
   deps = [
diff --git a/chromium/ios/chrome/content_widget_extension/BUILD.gn b/chromium/ios/chrome/content_widget_extension/BUILD.gn
index ee094430af7..83ca365dddd 100644
--- a/chromium/ios/chrome/content_widget_extension/BUILD.gn
+++ b/chromium/ios/chrome/content_widget_extension/BUILD.gn
@@ -14,11 +14,10 @@ tweak_info_plist("tweak_info_plist") {
   info_plist = "Info.plist"
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
+compile_entitlements("entitlements") {
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/content_widget_extension.appex.entitlements"
-  plist_templates =
+  entitlements_templates =
       [ "entitlements/external/content_widget_extension.appex.entitlements" ]
 }
 
@@ -53,6 +52,7 @@ source_set("content_widget") {
     "//ios/chrome/browser/ui/favicon:favicon_ui",
     "//ios/chrome/browser/ui/ntp:ntp_tile",
     "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common:common_extension",
     "//ios/chrome/common/app_group",
   ]
 
diff --git a/chromium/ios/chrome/search_widget_extension/BUILD.gn b/chromium/ios/chrome/search_widget_extension/BUILD.gn
index 71f05916b38..ca3ce9ccc30 100644
--- a/chromium/ios/chrome/search_widget_extension/BUILD.gn
+++ b/chromium/ios/chrome/search_widget_extension/BUILD.gn
@@ -14,11 +14,10 @@ tweak_info_plist("tweak_info_plist") {
   info_plist = "Info.plist"
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
+compile_entitlements("entitlements") {
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/search_widget_extension.appex.entitlements"
-  plist_templates =
+  entitlements_templates =
       [ "entitlements/external/search_widget_extension.appex.entitlements" ]
 }
 
@@ -60,6 +59,7 @@ source_set("search_widget") {
     "//base",
     "//components/open_from_clipboard:open_from_clipboard_impl",
     "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common:common_extension",
     "//ios/chrome/common/app_group",
   ]
 
diff --git a/chromium/ios/chrome/share_extension/BUILD.gn b/chromium/ios/chrome/share_extension/BUILD.gn
index c1ff17d1706..5d2d0ab4f46 100644
--- a/chromium/ios/chrome/share_extension/BUILD.gn
+++ b/chromium/ios/chrome/share_extension/BUILD.gn
@@ -27,11 +27,10 @@ tweak_info_plist("tweak_info_plist") {
   info_plist = "Info.plist"
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
+compile_entitlements("entitlements") {
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/share_extension.appex.entitlements"
-  plist_templates =
+  entitlements_templates =
       [ "entitlements/external/share_extension.appex.entitlements" ]
 }
 
diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 6131302d583..ee1eeb58c65 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -128,8 +128,8 @@ test("ios_chrome_unittests") {
     ":unit_tests",
     "//ios/chrome/app:unit_tests",
     "//ios/chrome/app/application_delegate:unit_tests",
-    "//ios/chrome/app/safe_mode:unit_tests",
     "//ios/chrome/app/spotlight:unit_tests",
+    "//ios/chrome/app/startup:unit_tests",
     "//ios/chrome/browser:unit_tests",
     "//ios/chrome/browser/autofill:unit_tests",
     "//ios/chrome/browser/browsing_data:unit_tests",
@@ -140,6 +140,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/favicon:unit_tests",
     "//ios/chrome/browser/find_in_page:unit_tests",
     "//ios/chrome/browser/geolocation:unit_tests",
+    "//ios/chrome/browser/history:unit_tests",
     "//ios/chrome/browser/itunes_links:unit_tests",
     "//ios/chrome/browser/language:unit_tests",
     "//ios/chrome/browser/metrics:unit_tests",
@@ -150,6 +151,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/payments:unit_tests",
     "//ios/chrome/browser/prerender:unit_tests",
     "//ios/chrome/browser/reading_list:unit_tests",
+    "//ios/chrome/browser/safe_mode:unit_tests",
     "//ios/chrome/browser/sessions:unit_tests",
     "//ios/chrome/browser/signin:unit_tests",
     "//ios/chrome/browser/snapshots:unit_tests",
@@ -200,9 +202,11 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/payments/cells:unit_tests",
     "//ios/chrome/browser/ui/promos:unit_tests",
     "//ios/chrome/browser/ui/reading_list:unit_tests",
+    "//ios/chrome/browser/ui/safe_mode:unit_tests",
     "//ios/chrome/browser/ui/settings:unit_tests",
     "//ios/chrome/browser/ui/settings/cells:unit_tests",
     "//ios/chrome/browser/ui/side_swipe:unit_tests",
+    "//ios/chrome/browser/ui/snackbar:unit_tests",
     "//ios/chrome/browser/ui/stack_view:unit_tests",
     "//ios/chrome/browser/ui/static_content:unit_tests",
     "//ios/chrome/browser/ui/tab_switcher:unit_tests",
@@ -217,11 +221,11 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/web:unit_tests_internal",
     "//ios/chrome/browser/web_resource:unit_tests",
     "//ios/chrome/browser/web_state_list:unit_tests",
+    "//ios/chrome/browser/webui:unit_tests",
     "//ios/chrome/common:unit_tests",
     "//ios/chrome/content_widget_extension:unit_tests",
     "//ios/chrome/search_widget_extension:unit_tests",
     "//ios/chrome/test/base:unit_tests",
-    "//ios/shared/chrome/browser/ui/dialogs:unit_tests",
     "//ios/testing:http_server_bundle_data",
   ]
 
diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn
index bdd90add225..a6377f8b736 100644
--- a/chromium/ios/chrome/test/app/BUILD.gn
+++ b/chromium/ios/chrome/test/app/BUILD.gn
@@ -16,6 +16,8 @@ source_set("test_support") {
     "history_test_util.mm",
     "navigation_test_util.h",
     "navigation_test_util.mm",
+    "password_test_util.h",
+    "password_test_util.mm",
     "settings_test_util.h",
     "settings_test_util.mm",
     "signin_test_util.h",
@@ -34,7 +36,6 @@ source_set("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//breakpad:client",
     "//components/autofill/core/browser",
     "//components/bookmarks/browser",
     "//components/browser_sync",
@@ -67,14 +68,18 @@ source_set("test_support") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/ui/stack_view",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/testing:ios_test_support",
@@ -82,6 +87,7 @@ source_set("test_support") {
     "//ios/web/public/test",
     "//net",
     "//net:test_support",
+    "//third_party/breakpad:client",
     "//url",
   ]
 }
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index 19aabb06c7a..6226c51bc2a 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -12,6 +12,7 @@ group("all_tests") {
     ":ios_chrome_flaky_egtests",
     ":ios_chrome_integration_egtests",
     ":ios_chrome_multitasking_egtests",
+    ":ios_chrome_perf_egtests",
     ":ios_chrome_reading_list_egtests",
     ":ios_chrome_settings_egtests",
     ":ios_chrome_smoke_egtests",
@@ -28,9 +29,9 @@ chrome_ios_eg_test("ios_chrome_integration_egtests") {
     "//ios/chrome/browser/metrics:eg_tests",
     "//ios/chrome/browser/net:eg_tests",
     "//ios/chrome/browser/ntp_tiles:eg_tests",
+    "//ios/chrome/browser/passwords:eg_tests",
   ]
 }
-
 chrome_ios_eg_test("ios_chrome_payments_egtests") {
   deps = [
     ":test_support",
@@ -54,7 +55,6 @@ chrome_ios_eg_test("ios_chrome_settings_egtests") {
 
 chrome_ios_eg_test("ios_chrome_ui_egtests") {
   deps = [
-    "//ios/chrome/app/safe_mode:eg_tests",
     "//ios/chrome/browser/ui:eg_tests",
     "//ios/chrome/browser/ui/activity_services:eg_tests",
     "//ios/chrome/browser/ui/alert_coordinator:eg_tests",
@@ -72,8 +72,9 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") {
     "//ios/chrome/browser/ui/print:eg_tests",
     "//ios/chrome/browser/ui/qr_scanner:eg_tests",
     "//ios/chrome/browser/ui/sad_tab:eg_tests",
+    "//ios/chrome/browser/ui/safe_mode:eg_tests",
+    "//ios/chrome/browser/ui/settings/sync_utils:eg_tests",
     "//ios/chrome/browser/ui/stack_view:eg_tests",
-    "//ios/chrome/browser/ui/sync:eg_tests",
     "//ios/chrome/browser/ui/tab_switcher:eg_tests",
     "//ios/chrome/browser/ui/tabs:eg_tests",
     "//ios/chrome/browser/ui/toolbar:eg_tests",
@@ -111,6 +112,12 @@ chrome_ios_eg_test("ios_chrome_multitasking_egtests") {
   eg_main_application_delegate = "MultitaskingTestApplicationDelegate"
 }
 
+chrome_ios_eg_test("ios_chrome_perf_egtests") {
+  deps = [
+    "//ios/chrome/test/perf:eg_tests",
+  ]
+}
+
 chrome_ios_eg_test("ios_chrome_device_check_egtests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -187,6 +194,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands:commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/payments:payments_ui",
     "//ios/chrome/browser/ui/settings:settings",
diff --git a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
index ee51dfdf93c..66af4a61aa7 100644
--- a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
+++ b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
@@ -48,14 +48,13 @@ template("chrome_ios_eg_test") {
   if (!defined(entitlements_path) && !defined(entitlements_target)) {
     _target_name = target_name
     _tweak_entitlements = target_name + "_tweak_entitlements"
-    compile_plist(_tweak_entitlements) {
-      format = "xml1"
+    compile_entitlements(_tweak_entitlements) {
       substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
       output_name = "$target_gen_dir/$_target_name.entitlements"
-      plist_templates =
+      entitlements_templates =
           [ "//ios/chrome/test/earl_grey/resources/Chrome.entitlements" ]
       if (ios_egtests_entitlements_additions != []) {
-        plist_templates += ios_egtests_entitlements_additions
+        entitlements_templates += ios_egtests_entitlements_additions
       }
     }
   }
diff --git a/chromium/ios/chrome/test/ocmock/BUILD.gn b/chromium/ios/chrome/test/ocmock/BUILD.gn
index cc3ebdf3808..ed27b7c069f 100644
--- a/chromium/ios/chrome/test/ocmock/BUILD.gn
+++ b/chromium/ios/chrome/test/ocmock/BUILD.gn
@@ -11,8 +11,8 @@ source_set("ocmock") {
   ]
   deps = [
     "//base",
-    "//breakpad:client",
     "//testing/gtest",
+    "//third_party/breakpad:client",
     "//third_party/ocmock",
   ]
 }
diff --git a/chromium/ios/chrome/test/perf/BUILD.gn b/chromium/ios/chrome/test/perf/BUILD.gn
new file mode 100644
index 00000000000..93723b00bb4
--- /dev/null
+++ b/chromium/ios/chrome/test/perf/BUILD.gn
@@ -0,0 +1,16 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "chrome_perf_egtest.mm",
+  ]
+  deps = [
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing/perf:startup",
+  ]
+}
diff --git a/chromium/ios/clean/chrome/app/BUILD.gn b/chromium/ios/clean/chrome/app/BUILD.gn
index ea8f853ec7f..c76f8d8ff34 100644
--- a/chromium/ios/clean/chrome/app/BUILD.gn
+++ b/chromium/ios/clean/chrome/app/BUILD.gn
@@ -27,13 +27,12 @@ tweak_info_plist("info_plist") {
   ]
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
-  plist_templates = [ "resources/Chrome.entitlements" ]
+compile_entitlements("entitlements") {
+  entitlements_templates = [ "resources/Chrome.entitlements" ]
   if (ios_chrome_entitlements_additions != []) {
     # TODO(crbug.com/707206): Allow additional entitlements once the CSChromium
     # mobile provisioning profiles have been updated.
-    # plist_templates += ios_chrome_entitlements_additions
+    # entitlements_templates += ios_chrome_entitlements_additions
   }
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/$chromium_short_name.entitlements"
@@ -83,7 +82,6 @@ source_set("main") {
     ":app",
     "//base",
     "//components/crash/core/common",
-    "//ios/chrome/app:app_internal",
     "//ios/chrome/app/startup",
     "//ios/chrome/app/startup:startup_basic",
     "//ios/chrome/browser",
@@ -126,9 +124,11 @@ source_set("app") {
   deps = [
     ":application_state",
     "//base",
+    "//ios/chrome/app/startup",
     "//ios/clean/chrome/app/steps:step_runner",
     "//ios/clean/chrome/app/steps:steps",
     "//ios/clean/chrome/browser",
     "//ios/testing/perf:startup",
+    "//net",
   ]
 }
diff --git a/chromium/ios/clean/chrome/app/steps/BUILD.gn b/chromium/ios/clean/chrome/app/steps/BUILD.gn
index b056e816f7b..92053f05e10 100644
--- a/chromium/ios/clean/chrome/app/steps/BUILD.gn
+++ b/chromium/ios/clean/chrome/app/steps/BUILD.gn
@@ -33,6 +33,8 @@ source_set("steps") {
     "provider_initializer.mm",
     "root_coordinator_initializer.h",
     "root_coordinator_initializer.mm",
+    "scheduled_tasks.h",
+    "scheduled_tasks.mm",
     "simple_application_step.h",
     "simple_application_step.mm",
     "step_collections.h",
@@ -48,7 +50,6 @@ source_set("steps") {
   deps = [
     ":step_runner",
     "//base",
-    "//breakpad:client",
     "//components/content_settings/core/browser",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/startup",
@@ -59,12 +60,15 @@ source_set("steps") {
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/webui:webui_internal",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser/ui/root",
     "//ios/net",
-    "//ios/web:web",
+    "//ios/web",
+    "//third_party/breakpad:client",
   ]
 }
 
diff --git a/chromium/ios/clean/chrome/browser/ui/actions/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/actions/BUILD.gn
index b449fd331a7..34065341631 100644
--- a/chromium/ios/clean/chrome/browser/ui/actions/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/actions/BUILD.gn
@@ -4,7 +4,6 @@
 
 source_set("actions") {
   sources = [
-    "settings_actions.h",
     "tab_grid_actions.h",
     "tab_strip_actions.h",
   ]
diff --git a/chromium/ios/clean/chrome/browser/ui/adaptor/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/adaptor/BUILD.gn
new file mode 100644
index 00000000000..f2a26b3913d
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/adaptor/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("adaptor") {
+  sources = [
+    "application_commands_adaptor.h",
+    "application_commands_adaptor.mm",
+    "browser_commands_adaptor.h",
+    "browser_commands_adaptor.mm",
+    "url_loader_adaptor.h",
+    "url_loader_adaptor.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/web",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
index 6fa9e645c65..183b82c4641 100644
--- a/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
@@ -11,10 +11,18 @@ source_set("bookmarks") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    "//components/bookmarks/browser",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/bookmarks:features",
+    "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/clean/chrome/browser/ui/adaptor",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/web",
   ]
 }
 
diff --git a/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
index dbca23bff36..1f46d383dfb 100644
--- a/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
@@ -8,14 +8,18 @@ source_set("commands") {
     "dialog_commands.h",
     "find_in_page_search_commands.h",
     "find_in_page_visibility_commands.h",
+    "http_auth_dialog_commands.h",
+    "java_script_dialog_blocking_commands.h",
     "java_script_dialog_commands.h",
     "navigation_commands.h",
     "ntp_commands.h",
     "settings_commands.h",
     "tab_commands.h",
     "tab_grid_commands.h",
+    "tab_grid_toolbar_commands.h",
     "tab_strip_commands.h",
     "tools_menu_commands.h",
+    "unavailable_feature_dialog_commands.h",
   ]
   deps = [
     "//base",
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/context_menu/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/context_menu/BUILD.gn
index 1352061b091..db46c79db96 100644
--- a/chromium/ios/clean/chrome/browser/ui/dialogs/context_menu/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/context_menu/BUILD.gn
@@ -24,6 +24,7 @@ source_set("context_menu") {
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
     "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/unavailable_feature_dialogs",
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/web",
     "//ui/base",
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/http_auth_dialogs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/http_auth_dialogs/BUILD.gn
new file mode 100644
index 00000000000..e3d8a7a69f6
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/http_auth_dialogs/BUILD.gn
@@ -0,0 +1,67 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("http_auth_dialogs") {
+  sources = [
+    "http_auth_dialog_coordinator.h",
+    "http_auth_dialog_coordinator.mm",
+    "http_auth_dialog_mediator.h",
+    "http_auth_dialog_mediator.mm",
+    "http_auth_dialog_request.h",
+    "http_auth_dialog_request.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/dialogs:dialogs_internal",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/overlays",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "http_auth_dialog_coordinator_unittest.mm",
+    "http_auth_dialog_mediator_unittest.mm",
+    "http_auth_dialog_request_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":http_auth_dialogs",
+    "//base",
+    "//base/test:test_support",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/dialogs:dialogs_internal",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test/base",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/test_helpers",
+    "//ios/clean/chrome/browser/ui/overlays/test_helpers",
+    "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn
index 9db8fa1a35c..6e541157609 100644
--- a/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn
@@ -10,22 +10,26 @@ source_set("java_script_dialogs") {
     "java_script_dialog_mediator.mm",
     "java_script_dialog_overlay_presenter.h",
     "java_script_dialog_overlay_presenter.mm",
-    "java_script_dialog_request.h",
-    "java_script_dialog_request.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
+  public_deps = [
+    ":java_script_dialog_request",
+  ]
+
   deps = [
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/dialogs",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
     "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/dialog_blocking",
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/web",
     "//ui/base",
@@ -33,6 +37,23 @@ source_set("java_script_dialogs") {
   ]
 }
 
+source_set("java_script_dialog_request") {
+  sources = [
+    "java_script_dialog_request.h",
+    "java_script_dialog_request.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/strings",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -42,6 +63,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":java_script_dialog_request",
     ":java_script_dialogs",
     "//base",
     "//base/test:test_support",
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/dialog_blocking/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/dialog_blocking/BUILD.gn
new file mode 100644
index 00000000000..742d4b17396
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/dialog_blocking/BUILD.gn
@@ -0,0 +1,64 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("dialog_blocking") {
+  sources = [
+    "java_script_dialog_blocking_confirmation_coordinator.h",
+    "java_script_dialog_blocking_confirmation_coordinator.mm",
+    "java_script_dialog_blocking_confirmation_mediator.h",
+    "java_script_dialog_blocking_confirmation_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/dialogs",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs:java_script_dialog_request",
+    "//ios/clean/chrome/browser/ui/overlays",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "java_script_dialog_blocking_confirmation_mediator_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":dialog_blocking",
+    "//base",
+    "//base/test:test_support",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test/base",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs:java_script_dialog_request",
+    "//ios/clean/chrome/browser/ui/dialogs/test_helpers",
+    "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/unavailable_feature_dialogs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/unavailable_feature_dialogs/BUILD.gn
new file mode 100644
index 00000000000..f516540af44
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/unavailable_feature_dialogs/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("unavailable_feature_dialogs") {
+  sources = [
+    "unavailable_feature_dialog_coordinator.h",
+    "unavailable_feature_dialog_coordinator.mm",
+    "unavailable_feature_dialog_mediator.h",
+    "unavailable_feature_dialog_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/overlays",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "unavailable_feature_dialog_mediator_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":unavailable_feature_dialogs",
+    "//base",
+    "//base/test:test_support",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/test/base",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/dialogs:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/clean/chrome/browser/ui/dialogs/test_helpers",
+    "//ios/clean/chrome/browser/ui/overlays/test_helpers",
+    "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
index ede76aab87b..e67042dcde7 100644
--- a/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
@@ -10,18 +10,22 @@ source_set("ntp") {
     "ntp_home_coordinator.mm",
     "ntp_home_header_coordinator.h",
     "ntp_home_header_coordinator.mm",
-    "ntp_home_header_mediator.h",
-    "ntp_home_header_mediator.mm",
+    "ntp_incognito_coordinator.h",
+    "ntp_incognito_coordinator.mm",
     "ntp_mediator.h",
     "ntp_mediator.mm",
+    "ntp_metrics_recorder.h",
+    "ntp_metrics_recorder.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
     ":ntp_ui",
+    "//base",
     "//components/ntp_snippets",
     "//components/ntp_tiles",
+    "//components/prefs",
     "//components/reading_list/core",
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
@@ -42,10 +46,13 @@ source_set("ntp") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_util",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/metrics",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/clean/chrome/browser/ui/adaptor",
     "//ios/clean/chrome/browser/ui/bookmarks",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/recent_tabs",
@@ -58,8 +65,6 @@ source_set("ntp") {
 source_set("ntp_ui") {
   sources = [
     "ntp_consumer.h",
-    "ntp_home_header_consumer.h",
-    "ntp_home_header_provider.h",
     "ntp_home_header_view_controller.h",
     "ntp_home_header_view_controller.mm",
     "ntp_view_controller.h",
@@ -74,6 +79,7 @@ source_set("ntp_ui") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui:ui",
+    "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_util",
@@ -95,15 +101,24 @@ source_set("unit_tests") {
     "ntp_coordinator_unittest.mm",
     "ntp_home_coordinator_unittest.mm",
     "ntp_home_header_coordinator_unittest.mm",
-    "ntp_home_header_mediator_unittest.mm",
     "ntp_home_header_view_controller_unittest.mm",
+    "ntp_incognito_coordinator_unittest.mm",
     "ntp_mediator_unittest.mm",
+    "ntp_metrics_recorder_unittest.mm",
     "ntp_view_controller_unittest.mm",
   ]
 
   deps = [
     ":ntp",
     ":ntp_ui",
+    "//base",
+    "//base/test:test_support",
+    "//components/prefs",
+    "//components/prefs:test_support",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/metrics:test_support",
+    "//ios/clean/chrome/browser/ui/commands",
     "//testing/gtest",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
index 7b8474be6f8..61bb86fb054 100644
--- a/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
@@ -14,13 +14,14 @@ source_set("omnibox") {
     "//base",
     "//components/toolbar",
     "//ios/chrome/browser/ssl",
+    "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser",
-    "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/web",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn
index 972772fef9e..9685401b322 100644
--- a/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn
@@ -78,9 +78,9 @@ source_set("unit_tests") {
     ":overlays_internal",
     "//base",
     "//base/test:test_support",
-    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/coordinators:test_support",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test/base",
     "//ios/clean/chrome/browser/ui/commands",
diff --git a/chromium/ios/clean/chrome/browser/ui/overlays/test_helpers/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/overlays/test_helpers/BUILD.gn
index a7bf81a3d9b..ce7ed7d5983 100644
--- a/chromium/ios/clean/chrome/browser/ui/overlays/test_helpers/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/overlays/test_helpers/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("test_helpers") {
   testonly = true
   sources = [
+    "overlay_coordinator_test.h",
+    "overlay_coordinator_test.mm",
     "test_overlay_coordinator.h",
     "test_overlay_coordinator.mm",
     "test_overlay_parent_coordinator.h",
@@ -23,10 +25,12 @@ source_set("test_helpers") {
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/coordinators:test_support",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/clean/chrome/browser/ui/overlays:overlays_internal",
+    "//ios/testing:ios_test_support",
     "//ios/web",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn
index 9b2148f7ed0..e4360e234a9 100644
--- a/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -11,10 +11,18 @@ source_set("recent_tabs") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    "//components/browser_sync",
+    "//components/sessions",
+    "//components/sync_sessions",
+    "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
+    "//ios/clean/chrome/browser/ui",
+    "//ios/clean/chrome/browser/ui/adaptor",
+    "//ios/clean/chrome/browser/ui/commands",
   ]
 }
 
diff --git a/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
index 1a53096b54f..7dfeb8313c1 100644
--- a/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
@@ -8,11 +8,14 @@ source_set("tab") {
     "tab_coordinator.mm",
     "tab_navigation_controller.h",
     "tab_navigation_controller.mm",
+    "tab_strip_tab_coordinator.h",
+    "tab_strip_tab_coordinator.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":features",
     ":tab_ui",
     "//base",
     "//ios/chrome/browser",
@@ -25,6 +28,7 @@ source_set("tab") {
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/find_in_page",
     "//ios/clean/chrome/browser/ui/ntp",
+    "//ios/clean/chrome/browser/ui/settings",
     "//ios/clean/chrome/browser/ui/tab_strip",
     "//ios/clean/chrome/browser/ui/toolbar",
     "//ios/clean/chrome/browser/ui/transitions",
@@ -33,11 +37,30 @@ source_set("tab") {
   ]
 }
 
+source_set("features") {
+  sources = [
+    "tab_features.cc",
+    "tab_features.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("tab_ui") {
   sources = [
+    "tab_container_view_controller+internal.h",
     "tab_container_view_controller.h",
     "tab_container_view_controller.mm",
+    "tab_strip_tab_container_view_controller.h",
+    "tab_strip_tab_container_view_controller.mm",
   ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
   deps = [
     "//base",
     "//ios/chrome/browser/ui",
@@ -47,8 +70,8 @@ source_set("tab_ui") {
     "//ios/clean/chrome/browser/ui/transitions/animators",
     "//ios/clean/chrome/browser/ui/transitions/presenters",
   ]
+
   libs = [ "UIKit.framework" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("unit_tests") {
@@ -64,10 +87,12 @@ source_set("unit_tests") {
     ":tab",
     ":tab_ui",
     "//base",
+    "//base/test:test_support",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/ui/coordinators:test_support",
     "//ios/chrome/browser/ui/toolbar/test",
+    "//ios/clean/chrome/browser/ui/tab:features",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
diff --git a/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn
index 84d895348cc..600871cec5b 100644
--- a/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn
@@ -4,6 +4,8 @@
 
 source_set("tab_grid") {
   sources = [
+    "tab_grid_container_coordinator.h",
+    "tab_grid_container_coordinator.mm",
     "tab_grid_coordinator.h",
     "tab_grid_coordinator.mm",
     "tab_grid_mediator.h",
@@ -28,6 +30,7 @@ source_set("tab_grid") {
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/clean/chrome/browser/ui/settings",
     "//ios/clean/chrome/browser/ui/tab",
+    "//ios/clean/chrome/browser/ui/tab:features",
     "//ios/clean/chrome/browser/ui/tab_collection",
     "//ios/clean/chrome/browser/ui/tab_collection:tab_collection_ui",
     "//ios/clean/chrome/browser/ui/tools",
@@ -44,14 +47,15 @@ source_set("tab_grid_ui") {
     "tab_grid_collection_view_layout.h",
     "tab_grid_collection_view_layout.mm",
     "tab_grid_consumer.h",
+    "tab_grid_container_view_controller.h",
+    "tab_grid_container_view_controller.mm",
     "tab_grid_toolbar.h",
     "tab_grid_toolbar.mm",
+    "tab_grid_toolbar_commands.h",
     "tab_grid_view_controller.h",
     "tab_grid_view_controller.mm",
     "ui_button+cr_tab_grid.h",
     "ui_button+cr_tab_grid.mm",
-    "ui_stack_view+cr_tab_grid.h",
-    "ui_stack_view+cr_tab_grid.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -75,6 +79,7 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
+    "tab_grid_container_coordinator_unittest.mm",
     "tab_grid_mediator_unittest.mm",
   ]
 
@@ -85,6 +90,8 @@ source_set("unit_tests") {
     ":tab_grid_ui",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/coordinators:test_support",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
diff --git a/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
index fbb5a815a6a..a78a5e6ac9b 100644
--- a/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
@@ -13,9 +13,11 @@ source_set("toolbar") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":toolbar_components_ui",
     ":toolbar_ui",
     "//base",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/commands",
@@ -27,6 +29,7 @@ source_set("toolbar") {
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/history_popup",
     "//ios/clean/chrome/browser/ui/omnibox",
+    "//ios/clean/chrome/browser/ui/overlays",
     "//ios/clean/chrome/browser/ui/tools",
     "//ios/web",
   ]
@@ -44,6 +47,7 @@ source_set("toolbar_ui") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/history_popup/requirements",
+    "//ios/chrome/browser/ui/toolbar",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/tools",
     "//ios/clean/chrome/browser/ui/transitions/animators",
@@ -55,13 +59,16 @@ source_set("toolbar_ui") {
 
 source_set("toolbar_components_ui") {
   sources = [
-    "toolbar_button+factory.h",
-    "toolbar_button+factory.mm",
     "toolbar_button.h",
     "toolbar_button.mm",
+    "toolbar_button_factory.h",
+    "toolbar_button_factory.mm",
     "toolbar_component_options.h",
+    "toolbar_configuration.h",
+    "toolbar_configuration.mm",
     "toolbar_constants.h",
     "toolbar_constants.mm",
+    "toolbar_style.h",
   ]
   deps = [
     "//base",
@@ -69,6 +76,7 @@ source_set("toolbar_components_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/toolbar:resource_macros",
     "//ui/base",
   ]
   libs = [ "UIKit.framework" ]
diff --git a/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
index 0394e3b71f4..971b53e3e0b 100644
--- a/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
@@ -20,6 +20,7 @@ source_set("tools") {
     "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/overlays",
     "//ios/clean/chrome/browser/ui/transitions",
     "//ios/web",
     "//ui/base",
diff --git a/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn
index 4f8954f45cb..96e55dc77cb 100644
--- a/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn
@@ -18,8 +18,12 @@ source_set("web_contents") {
     "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/sad_tab",
+    "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/dialogs/context_menu",
+    "//ios/clean/chrome/browser/ui/dialogs/http_auth_dialogs",
     "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs",
     "//ios/clean/chrome/browser/ui/overlays",
     "//ios/web",
diff --git a/chromium/ios/clean/chrome/test/BUILD.gn b/chromium/ios/clean/chrome/test/BUILD.gn
index f188af66d79..16601d001c4 100644
--- a/chromium/ios/clean/chrome/test/BUILD.gn
+++ b/chromium/ios/clean/chrome/test/BUILD.gn
@@ -25,7 +25,10 @@ test("ios_clean_chrome_unittests") {
     "//ios/clean/chrome/browser/ui/bookmarks:unit_tests",
     "//ios/clean/chrome/browser/ui/dialogs:unit_tests",
     "//ios/clean/chrome/browser/ui/dialogs/context_menu:unit_tests",
+    "//ios/clean/chrome/browser/ui/dialogs/http_auth_dialogs:unit_tests",
     "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs:unit_tests",
+    "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/dialog_blocking:unit_tests",
+    "//ios/clean/chrome/browser/ui/dialogs/unavailable_feature_dialogs:unit_tests",
     "//ios/clean/chrome/browser/ui/find_in_page:unit_tests",
     "//ios/clean/chrome/browser/ui/history_popup:unit_tests",
     "//ios/clean/chrome/browser/ui/ntp:unit_tests",
diff --git a/chromium/ios/clean/chrome/test/perf/BUILD.gn b/chromium/ios/clean/chrome/test/perf/BUILD.gn
index ff5f81cebbe..4496adb5bf5 100644
--- a/chromium/ios/clean/chrome/test/perf/BUILD.gn
+++ b/chromium/ios/clean/chrome/test/perf/BUILD.gn
@@ -27,13 +27,12 @@ tweak_info_plist("info_plist") {
   ]
 }
 
-compile_plist("entitlements") {
-  format = "xml1"
-  plist_templates = [ "resources/Chrome.entitlements" ]
+compile_entitlements("entitlements") {
+  entitlements_templates = [ "resources/Chrome.entitlements" ]
   if (ios_chrome_entitlements_additions != []) {
     # TODO(crbug.com/707206): Allow additional entitlements once the CSChromium
     # mobile provisioning profiles have been updated.
-    # plist_templates += ios_chrome_entitlements_additions
+    # entitlements_templates += ios_chrome_entitlements_additions
   }
   substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
   output_name = "$target_gen_dir/$chromium_short_name.entitlements"
@@ -44,7 +43,7 @@ ios_eg_test("ios_clean_skeleton_perf_egtests") {
   info_plist_target = ":info_plist"
 
   sources = [
-    "startup_egtests.mm",
+    "startup_egtest.mm",
   ]
 
   deps = [
diff --git a/chromium/ios/net/BUILD.gn b/chromium/ios/net/BUILD.gn
index 6c9ab8902cc..618a989a42f 100644
--- a/chromium/ios/net/BUILD.gn
+++ b/chromium/ios/net/BUILD.gn
@@ -42,6 +42,10 @@ source_set("net") {
     "cookies/cookie_store_ios_client.mm",
     "cookies/cookie_store_ios_persistent.h",
     "cookies/cookie_store_ios_persistent.mm",
+    "cookies/ns_http_system_cookie_store.h",
+    "cookies/ns_http_system_cookie_store.mm",
+    "cookies/system_cookie_store.h",
+    "cookies/system_cookie_store.mm",
     "cookies/system_cookie_util.h",
     "cookies/system_cookie_util.mm",
     "crn_http_protocol_handler.h",
@@ -92,6 +96,7 @@ test("ios_net_unittests") {
     "cookies/cookie_store_ios_test_util.h",
     "cookies/cookie_store_ios_test_util.mm",
     "cookies/cookie_store_ios_unittest.mm",
+    "cookies/ns_http_system_cookie_store_unittest.mm",
     "cookies/system_cookie_util_unittest.mm",
     "http_response_headers_util_unittest.mm",
     "nsurlrequest_util_unittest.mm",
diff --git a/chromium/ios/showcase/ntp/BUILD.gn b/chromium/ios/showcase/ntp/BUILD.gn
index 74ce7336d5d..e269b196b8b 100644
--- a/chromium/ios/showcase/ntp/BUILD.gn
+++ b/chromium/ios/showcase/ntp/BUILD.gn
@@ -8,6 +8,7 @@ source_set("ntp") {
     "sc_ntp_coordinator.mm",
   ]
   deps = [
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/ntp:ntp_ui",
diff --git a/chromium/ios/showcase/toolbar/BUILD.gn b/chromium/ios/showcase/toolbar/BUILD.gn
index c007f41cceb..6703af37b07 100644
--- a/chromium/ios/showcase/toolbar/BUILD.gn
+++ b/chromium/ios/showcase/toolbar/BUILD.gn
@@ -9,6 +9,7 @@ source_set("toolbar") {
   ]
   deps = [
     "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/toolbar:toolbar_components_ui",
     "//ios/clean/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/showcase/common",
   ]
diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn
index 37035edc00f..62ec1c407d1 100644
--- a/chromium/ios/third_party/material_components_ios/BUILD.gn
+++ b/chromium/ios/third_party/material_components_ios/BUILD.gn
@@ -18,6 +18,7 @@ config("config") {
     "src/components/FlexibleHeader/src",
     "src/components/HeaderStackView/src",
     "src/components/Ink/src",
+    "src/components/private/UIMetrics/src",
     "src/components/NavigationBar/src",
     "src/components/OverlayWindow/src",
     "src/components/Palettes/src",
@@ -236,6 +237,9 @@ source_set("material_components_ios") {
     "src/components/private/ThumbTrack/src/MDCThumbView.h",
     "src/components/private/ThumbTrack/src/MDCThumbView.m",
     "src/components/private/ThumbTrack/src/MaterialThumbTrack.h",
+    "src/components/private/UIMetrics/src/MDCLayoutMetrics.h",
+    "src/components/private/UIMetrics/src/MDCLayoutMetrics.m",
+    "src/components/private/UIMetrics/src/MaterialUIMetrics.h",
   ]
   include_dirs = [
     "src/components/ActivityIndicator/src",
@@ -272,9 +276,14 @@ source_set("material_components_ios") {
     ":material_collection_cells_bundle",
     ":material_collections_bundle",
     ":material_component_ic_arrow_back_bundle",
+    "//ios/third_party/material_internationalization_ios:material_internationalization_ios+link",
     "//ios/third_party/material_text_accessibility_ios",
   ]
 
+  if (current_toolchain == default_toolchain) {
+    deps += [ "//ios/third_party/material_internationalization_ios:material_internationalization_ios+bundle" ]
+  }
+
   foreach(icon_name, _icon_names) {
     deps += [ ":material_component_${icon_name}_bundle" ]
   }
diff --git a/chromium/ios/third_party/material_internationalization_ios/BUILD.gn b/chromium/ios/third_party/material_internationalization_ios/BUILD.gn
new file mode 100644
index 00000000000..f20ab985b74
--- /dev/null
+++ b/chromium/ios/third_party/material_internationalization_ios/BUILD.gn
@@ -0,0 +1,55 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/ios_sdk.gni")
+import("//build/config/ios/rules.gni")
+import("//ios/build/chrome_build.gni")
+
+config("config") {
+  include_dirs = [ "src/Sources" ]
+  visibility = [ ":material_internationalization_ios" ]
+}
+
+ios_framework_bundle("material_internationalization_ios") {
+  output_name = "MDFInternationalization"
+  sources = [
+    "src/Sources/MDFInternationalization.h",
+    "src/Sources/MDFRTL.h",
+    "src/Sources/MDFRTL.m",
+    "src/Sources/UIImage+MaterialRTL.h",
+    "src/Sources/UIImage+MaterialRTL.m",
+    "src/Sources/UIView+MaterialRTL.h",
+    "src/Sources/UIView+MaterialRTL.m",
+  ]
+  public_headers = [
+    "src/Sources/MDFRTL.h",
+    "src/Sources/UIImage+MaterialRTL.h",
+    "src/Sources/UIView+MaterialRTL.h",
+  ]
+
+  libs = [
+    "CoreImage.framework",
+    "UIKit.framework",
+  ]
+  public_configs = [ ":config" ]
+  configs -= [
+    "//build/config/gcc:symbol_visibility_hidden",
+    "//build/config/compiler:chromium_code",
+  ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/compiler:no_chromium_code",
+    "//build/config/gcc:symbol_visibility_default",
+  ]
+
+  _project_version = "1.0"
+  _bundle_identifier =
+      "$ios_app_bundle_id_prefix.$chromium_bundle_id.$output_name"
+
+  info_plist = "src/Sources/Info.plist"
+  extra_substitutions = [
+    "PRODUCT_BUNDLE_IDENTIFIER=$_bundle_identifier",
+    "CURRENT_PROJECT_VERSION=$_project_version",
+  ]
+}
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index d0e8f907913..ce8834636e9 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -25,6 +25,7 @@ source_set("web") {
   deps = [
     ":core",
     ":js_resources",
+    ":navigation_resources",
     ":reload_type",
     ":resources",
     ":user_agent",
@@ -49,8 +50,6 @@ source_set("web") {
   ]
 
   sources = [
-    "active_state_manager_impl.h",
-    "active_state_manager_impl.mm",
     "browser_state.mm",
     "browser_url_rewriter_impl.h",
     "browser_url_rewriter_impl.mm",
@@ -101,20 +100,16 @@ source_set("web") {
     "net/cookie_notification_bridge.mm",
     "net/crw_cert_verification_controller.h",
     "net/crw_cert_verification_controller.mm",
-    "net/crw_request_tracker_delegate.h",
     "net/crw_ssl_status_updater.h",
     "net/crw_ssl_status_updater.mm",
     "net/request_group_util.h",
     "net/request_group_util.mm",
-    "net/request_tracker_data_memoizing_store.h",
     "net/request_tracker_factory_impl.h",
     "net/request_tracker_factory_impl.mm",
     "net/request_tracker_impl.h",
     "net/request_tracker_impl.mm",
     "net/web_http_protocol_handler_delegate.h",
     "net/web_http_protocol_handler_delegate.mm",
-    "payments/payment_request.cc",
-    "public/active_state_manager.h",
     "public/block_types.h",
     "public/browser_state.h",
     "public/browser_url_rewriter.h",
@@ -142,7 +137,6 @@ source_set("web") {
     "public/navigation_manager.h",
     "public/origin_util.h",
     "public/origin_util.mm",
-    "public/payments/payment_request.h",
     "public/referrer.h",
     "public/referrer_util.cc",
     "public/referrer_util.h",
@@ -453,10 +447,8 @@ source_set("ios_web_general_unittests") {
   ]
 
   sources = [
-    "active_state_manager_impl_unittest.mm",
     "browser_state_unittest.cc",
     "history_state_util_unittest.mm",
-    "payments/payment_request_unittest.cc",
     "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
     "url_scheme_util_unittest.mm",
@@ -850,6 +842,15 @@ js_compile_checked("js_resources") {
   ]
 }
 
+bundle_data("navigation_resources") {
+  sources = [
+    "navigation/resources/restore_session.html",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
 grit("resources") {
   source = "ios_web_resources.grd"
 
diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn
index 584377f7da1..fa8bc67f805 100644
--- a/chromium/ios/web/test/BUILD.gn
+++ b/chromium/ios/web/test/BUILD.gn
@@ -60,6 +60,7 @@ source_set("test_support") {
     "//ios/web/public/test/fakes",
     "//ios/web/public/test/http_server",
     "//ios/web/test/fakes",
+    "//net",
     "//testing/gtest",
     "//third_party/ocmock",
     "//ui/base",
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index 536123ff36e..06df48194cb 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/ios/ios_sdk.gni")
 import("//build/config/ios/rules.gni")
 import("//components/grpc_support/include/headers.gni")
 import("//ios/build/config.gni")
+import("//ios/web_view/features.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
@@ -29,6 +30,7 @@ ios_web_view_public_headers = [
   "public/cwv_navigation_delegate.h",
   "public/cwv_navigation_type.h",
   "public/cwv_preferences.h",
+  "public/cwv_preview_element_info.h",
   "public/cwv_scroll_view.h",
   "public/cwv_scroll_view_delegate.h",
   "public/cwv_translation_controller.h",
@@ -41,12 +43,25 @@ ios_web_view_public_headers = [
   "public/cwv_web_view.h",
   "public/cwv_web_view_configuration.h",
 ]
+if (ios_web_view_enable_sync) {
+  ios_web_view_public_headers += [
+    "public/ChromeSync.h",
+    "public/cwv_authentication_controller.h",
+    "public/cwv_authentication_controller_delegate.h",
+    "public/cwv_identity.h",
+    "public/cwv_web_view_configuration+sync.h",
+  ]
+}
 
 ios_web_view_sources = [
   "internal/app/application_context.cc",
   "internal/app/application_context.h",
   "internal/app/web_view_io_thread.h",
   "internal/app/web_view_io_thread.mm",
+  "internal/content_settings/web_view_cookie_settings_factory.cc",
+  "internal/content_settings/web_view_cookie_settings_factory.h",
+  "internal/content_settings/web_view_host_content_settings_map_factory.cc",
+  "internal/content_settings/web_view_host_content_settings_map_factory.h",
   "internal/cwv_html_element.mm",
   "internal/cwv_html_element_internal.h",
   "internal/cwv_navigation_action.mm",
@@ -55,6 +70,8 @@ ios_web_view_sources = [
   "internal/cwv_navigation_type_internal.h",
   "internal/cwv_preferences.mm",
   "internal/cwv_preferences_internal.h",
+  "internal/cwv_preview_element_info.mm",
+  "internal/cwv_preview_element_info_internal.h",
   "internal/cwv_scroll_view.mm",
   "internal/cwv_scroll_view_internal.h",
   "internal/cwv_user_content_controller.mm",
@@ -66,6 +83,24 @@ ios_web_view_sources = [
   "internal/ios_global_state_web_view_configuration.cc",
   "internal/pref_names.cc",
   "internal/pref_names.h",
+  "internal/signin/ios_web_view_signin_client.h",
+  "internal/signin/ios_web_view_signin_client.mm",
+  "internal/signin/web_view_account_fetcher_service_factory.cc",
+  "internal/signin/web_view_account_fetcher_service_factory.h",
+  "internal/signin/web_view_account_tracker_service_factory.cc",
+  "internal/signin/web_view_account_tracker_service_factory.h",
+  "internal/signin/web_view_gaia_cookie_manager_service_factory.cc",
+  "internal/signin/web_view_gaia_cookie_manager_service_factory.h",
+  "internal/signin/web_view_oauth2_token_service_factory.h",
+  "internal/signin/web_view_oauth2_token_service_factory.mm",
+  "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.h",
+  "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.mm",
+  "internal/signin/web_view_signin_client_factory.cc",
+  "internal/signin/web_view_signin_client_factory.h",
+  "internal/signin/web_view_signin_error_controller_factory.cc",
+  "internal/signin/web_view_signin_error_controller_factory.h",
+  "internal/signin/web_view_signin_manager_factory.cc",
+  "internal/signin/web_view_signin_manager_factory.h",
   "internal/translate/cwv_translation_controller.mm",
   "internal/translate/cwv_translation_controller_internal.h",
   "internal/translate/cwv_translation_language_internal.h",
@@ -101,10 +136,19 @@ ios_web_view_sources = [
   "internal/web_view_web_state_policy_decider.mm",
 ]
 ios_web_view_sources += ios_web_view_public_headers
+if (ios_web_view_enable_sync) {
+  ios_web_view_sources += [
+    "internal/cwv_web_view_configuration+sync.mm",
+    "internal/signin/cwv_authentication_controller.mm",
+    "internal/signin/cwv_authentication_controller_internal.h",
+    "internal/signin/cwv_identity.mm",
+  ]
+}
 
 ios_web_view_deps = [
   ":packed_resources",
   "//base",
+  "//components/content_settings/core/browser",
   "//components/flags_ui",
   "//components/infobars/core",
   "//components/keyed_service/core",
@@ -113,6 +157,9 @@ ios_web_view_deps = [
   "//components/pref_registry",
   "//components/prefs",
   "//components/proxy_config",
+  "//components/signin/core/browser",
+  "//components/signin/ios/browser",
+  "//components/signin/ios/browser:active_state_manager",
   "//components/ssl_config",
   "//components/translate/core/browser",
   "//components/translate/core/common",
@@ -133,60 +180,47 @@ ios_web_view_deps = [
 ]
 
 ios_framework_bundle("web_view") {
-  output_name = "ChromeWebView"
-  info_plist = "Info.plist"
-
-  public_headers = ios_web_view_public_headers
-
-  public = [
-    "public/ChromeWebView.h",
-  ]
-
-  sources = ios_web_view_sources
-
-  deps = ios_web_view_deps
-
-  configs += [
-    ":config",
-    "//build/config/compiler:enable_arc",
-  ]
-}
-
-# Same framework as ChromeWebView above, but also exposes Cronet.
-ios_framework_bundle("cronet_web_view_combined") {
-  output_name = "CronetChromeWebView"
+  output_name = ios_web_view_output_name
   info_plist = "Info.plist"
 
   public_headers = ios_web_view_public_headers
-  public_headers += [ "//components/cronet/ios/Cronet.h" ]
-  public_headers += grpc_public_headers
+  if (ios_web_view_include_cronet) {
+    public_headers += [ "//components/cronet/ios/Cronet.h" ]
+    public_headers += grpc_public_headers
+  }
 
   public = [
     "public/ChromeWebView.h",
   ]
+  if (ios_web_view_enable_sync) {
+    public += [ "public/ChromeSync.h" ]
+  }
 
   sources = ios_web_view_sources
-  sources += [ "//components/cronet/ios/Cronet.h" ]
+  if (ios_web_view_include_cronet) {
+    sources += [ "//components/cronet/ios/Cronet.h" ]
+  }
 
   deps = ios_web_view_deps
-  deps += [ "//components/cronet/ios:cronet_sources" ]
-
-  public_deps = [
-    "//components/grpc_support",
-  ]
+  if (ios_web_view_include_cronet) {
+    deps += [ "//components/cronet/ios:cronet_sources" ]
+  }
 
-  configs -= [ "//build/config/compiler:default_symbols" ]
   configs += [
     ":config",
-    "//build/config/compiler:symbols",
     "//build/config/compiler:enable_arc",
   ]
+  if (ios_web_view_include_cronet) {
+    configs -= [ "//build/config/compiler:default_symbols" ]
+    configs += [ "//build/config/compiler:symbols" ]
+  }
 }
 
 test("ios_web_view_unittests") {
   testonly = true
   sources = [
     "internal/cwv_html_element_unittest.mm",
+    "internal/cwv_preview_element_info_unittest.mm",
   ]
   sources += ios_web_view_sources
 
@@ -230,9 +264,9 @@ bundle_data("packed_resources") {
 }
 
 if (additional_toolchains == [] || current_toolchain == default_toolchain) {
-  _package_dir = "$root_out_dir/cronet_ios_web_view"
+  _package_dir = "$root_out_dir/ios_web_view"
 
-  action("cronet_ios_web_view_generate_license") {
+  action("ios_web_view_generate_license") {
     _license_path = "$_package_dir/LICENSE"
 
     script = "//tools/licenses.py"
@@ -252,9 +286,9 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
     ]
   }
 
-  copy("cronet_ios_web_view_package_copy") {
+  copy("ios_web_view_package_copy") {
     sources = [
-      "$root_out_dir/CronetChromeWebView.framework",
+      "$root_out_dir/$ios_web_view_output_name.framework",
       "//AUTHORS",
       "//chrome/VERSION",
     ]
@@ -263,25 +297,25 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
     ]
 
     deps = [
-      ":cronet_web_view_combined",
+      ":web_view",
     ]
   }
 
   if (enable_dsyms) {
-    action("cronet_ios_web_view_dsym_archive") {
+    action("ios_web_view_dsym_archive") {
       script = "//chrome/tools/build/mac/archive_symbols.py"
 
       # These are the dSYMs that will be archived. The sources list must be
       # the target outputs that correspond to the dSYMs (since a dSYM is a
       # directory it cannot be listed as a source file). The targets that
       # generate both the dSYM and binary image are listed in deps.
-      _dsyms = [ "$root_out_dir/CronetChromeWebView.dSYM" ]
+      _dsyms = [ "$root_out_dir/$ios_web_view_output_name.dSYM" ]
 
       sources = [
-        "$root_out_dir/CronetChromeWebView.framework",
+        "$root_out_dir/$ios_web_view_output_name.framework",
       ]
 
-      _output = "$_package_dir/CronetChromeWebView.dSYM.tar.bz2"
+      _output = "$_package_dir/$ios_web_view_output_name.dSYM.tar.bz2"
 
       outputs = [
         _output,
@@ -291,19 +325,19 @@ if (additional_toolchains == [] || current_toolchain == default_toolchain) {
              rebase_path(_dsyms, root_out_dir)
 
       deps = [
-        ":cronet_web_view_combined",
+        ":web_view",
       ]
     }
   } else {
-    group("cronet_ios_web_view_dsym_archive") {
+    group("ios_web_view_dsym_archive") {
     }
   }
 
-  group("cronet_ios_web_view_package") {
+  group("ios_web_view_package") {
     deps = [
-      ":cronet_ios_web_view_dsym_archive",
-      ":cronet_ios_web_view_generate_license",
-      ":cronet_ios_web_view_package_copy",
+      ":ios_web_view_dsym_archive",
+      ":ios_web_view_generate_license",
+      ":ios_web_view_package_copy",
     ]
   }
 }
diff --git a/chromium/ios/web_view/features.gni b/chromium/ios/web_view/features.gni
new file mode 100644
index 00000000000..2e9d16751eb
--- /dev/null
+++ b/chromium/ios/web_view/features.gni
@@ -0,0 +1,14 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  # Controls if cronet is included.
+  ios_web_view_include_cronet = false
+
+  # Controls if sign and sync APIs are exposed.
+  ios_web_view_enable_sync = true
+
+  # Controls the output name of the built framework.
+  ios_web_view_output_name = "ChromeWebView"
+}
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2017-11-20 15:06:40 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2017-11-22 11:48:58 +0000
commit	daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch)
tree	96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/ios
parent	be59a35641616a4cf23c4a13fa0632624b021c1b (diff)
download	qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz