BASELINE: Update Chromium to 62.0.3202.101

Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2017-11-20 10:33:36 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2017-11-22 11:45:12 +0000
commit: be59a35641616a4cf23c4a13fa0632624b021c1b (patch)
tree: 9da183258bdf9cc413f7562079d25ace6955467f /chromium/ios
parent: d702e4b6a64574e97fc7df8fe3238cde70242080 (diff)
download: qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz
156 files changed, 1849 insertions, 1221 deletions
diff --git a/chromium/ios/BUILD.gn b/chromium/ios/BUILD.gn
index 43b032d442d..9c167bf5585 100644
--- a/chromium/ios/BUILD.gn
+++ b/chromium/ios/BUILD.gn
@@ -42,7 +42,6 @@ group("all") {
       "//ios/chrome/content_widget_extension",
       "//ios/chrome/search_widget_extension",
       "//ios/chrome/share_extension",
-      "//ios/chrome/today_extension",
       "//ios/clean/chrome/app:chrome_clean_skeleton",
       "//ios/showcase",
       "//ios/web/shell:ios_web_shell",
diff --git a/chromium/ios/build/chrome_build.gni b/chromium/ios/build/chrome_build.gni
index 9b2004ff5ee..408677ebba4 100644
--- a/chromium/ios/build/chrome_build.gni
+++ b/chromium/ios/build/chrome_build.gni
@@ -7,10 +7,9 @@ import("//build/config/ios/ios_sdk.gni")
 import("//build/config/mac/symbols.gni")
 
 declare_args() {
-  # Enable today extension.
-  ios_enable_today_extension = true
-  ios_enable_search_widget_extension = true
+  # Enable widget extensions.
   ios_enable_content_widget_extension = true
+  ios_enable_search_widget_extension = true
 
   # Enable share extension.
   ios_enable_share_extension = true
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index 4d493793608..55d32e64bc2 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -145,7 +145,7 @@ source_set("app_internal") {
     "//components/crash/core/common",
     "//components/favicon/core",
     "//components/favicon_base",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/handoff",
     "//components/history/core/browser",
     "//components/infobars/core",
@@ -153,6 +153,7 @@ source_set("app_internal") {
     "//components/keyed_service/ios",
     "//components/metrics",
     "//components/ntp_snippets",
+    "//components/payments/core",
     "//components/prefs",
     "//components/proxy_config",
     "//components/signin/core/browser",
@@ -178,7 +179,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/geolocation:geolocation_internal",
@@ -189,6 +190,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/net",
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/omaha",
+    "//ios/chrome/browser/payments",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
@@ -271,17 +273,19 @@ ios_app_bundle("chrome") {
   entitlements_target = ":entitlements"
   info_plist_target = ":info_plist"
 
+  bundle_deps = [ "//ios/chrome/app/resources" ]
+  if (!is_chrome_branded || ios_chrome_app_variants == []) {
+    bundle_deps += [ ios_application_icons_target ]
+  } else {
+    variants = ios_chrome_app_variants
+  }
+
   deps = [
     ":main",
     ":tests_fake_hook",
   ]
 
-  bundle_deps = [ "//ios/chrome/app/resources" ]
-
   if (current_toolchain == default_toolchain) {
-    if (ios_enable_today_extension) {
-      deps += [ ":today_extension_bundle" ]
-    }
     if (ios_enable_search_widget_extension) {
       deps += [ ":search_widget_extension_bundle" ]
     }
@@ -294,13 +298,14 @@ ios_app_bundle("chrome") {
   }
 
   extra_substitutions = [
+    "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
     "CHROMIUM_BUNDLE_ID=$chromium_bundle_id",
     "CHROMIUM_HANDOFF_ID=$chromium_handoff_id",
     "CHROMIUM_SHORT_NAME=$chromium_short_name",
     "CHROMIUM_URL_SCHEME_1=$url_unsecure_scheme",
     "CHROMIUM_URL_SCHEME_2=$url_secure_scheme",
     "CHROMIUM_URL_SCHEME_3=$url_x_callback_scheme",
-    "CHROMIUM_URL_SCHEME_4=$url_channel_scheme",
+    "CHROMIUM_URL_CHANNEL_SCHEME=$url_channel_scheme",
     "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
   ]
 
@@ -311,20 +316,6 @@ ios_app_bundle("chrome") {
 }
 
 if (current_toolchain == default_toolchain) {
-  if (ios_enable_today_extension) {
-    bundle_data("today_extension_bundle") {
-      public_deps = [
-        "//ios/chrome/today_extension",
-      ]
-      sources = [
-        "$root_out_dir/today_extension.appex",
-      ]
-      outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
-      ]
-    }
-  }
-
   if (ios_enable_content_widget_extension) {
     bundle_data("content_widget_extension_bundle") {
       public_deps = [
diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn
index 3644c118a86..6f346ea1b03 100644
--- a/chromium/ios/chrome/app/application_delegate/BUILD.gn
+++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn
@@ -41,6 +41,7 @@ source_set("unit_tests") {
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/safe_mode",
     "//ios/chrome/app/spotlight",
+    "//ios/chrome/app/startup",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/crash_report",
@@ -96,9 +97,10 @@ source_set("application_delegate_internal") {
     ":application_delegate",
     "//base",
     "//components/crash/core/common",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/handoff",
     "//components/metrics",
+    "//components/payments/core",
     "//components/prefs",
     "//ios/chrome/app",
     "//ios/chrome/app/safe_mode",
@@ -108,11 +110,12 @@ source_set("application_delegate_internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/device_sharing",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/geolocation",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/net",
+    "//ios/chrome/browser/payments",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/u2f",
     "//ios/chrome/browser/ui",
diff --git a/chromium/ios/chrome/app/resources/BUILD.gn b/chromium/ios/chrome/app/resources/BUILD.gn
index 0834a77b64a..f270ee364c2 100644
--- a/chromium/ios/chrome/app/resources/BUILD.gn
+++ b/chromium/ios/chrome/app/resources/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 import("//build/config/ios/rules.gni")
 import("//build/config/locales.gni")
 import("//ios/chrome/app/resources/ios_chrome_repack.gni")
@@ -16,7 +16,6 @@ group("resources") {
     ":launchscreen_xib",
     ":quick_action_icons",
     ":system_strings",
-    ios_application_icons_target,
     ios_packed_resources_target,
   ]
 }
@@ -73,39 +72,37 @@ repack("repack_unscaled_resources") {
   copy_data_to_bundle = true
 }
 
-bundle_data("chromium_icons") {
+appiconset("chromium_icons") {
   sources = [
-    "chromium/Icon-120.png",
-    "chromium/Icon-152.png",
-    "chromium/Icon-167.png",
-    "chromium/Icon-180.png",
-    "chromium/Icon-29.png",
-    "chromium/Icon-40.png",
-    "chromium/Icon-58.png",
-    "chromium/Icon-76.png",
-    "chromium/Icon-80.png",
-    "chromium/Icon-87.png",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
+    "chromium/AppIcon.appiconset/Contents.json",
+    "chromium/AppIcon.appiconset/Icon-120.png",
+    "chromium/AppIcon.appiconset/Icon-152.png",
+    "chromium/AppIcon.appiconset/Icon-167.png",
+    "chromium/AppIcon.appiconset/Icon-180.png",
+    "chromium/AppIcon.appiconset/Icon-29.png",
+    "chromium/AppIcon.appiconset/Icon-40.png",
+    "chromium/AppIcon.appiconset/Icon-58.png",
+    "chromium/AppIcon.appiconset/Icon-76.png",
+    "chromium/AppIcon.appiconset/Icon-80.png",
+    "chromium/AppIcon.appiconset/Icon-87.png",
   ]
 }
 
 imageset("launchscreen_app_logo") {
   sources = [
-    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json",
-    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png",
-    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png",
-    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png",
+    "launchscreen_app_logo.imageset/Contents.json",
+    "launchscreen_app_logo.imageset/launchscreen_app_logo.png",
+    "launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png",
+    "launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png",
   ]
 }
 
 imageset("launchscreen_brand_name") {
   sources = [
-    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json",
-    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png",
-    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png",
-    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png",
+    "launchscreen_brand_name.imageset/Contents.json",
+    "launchscreen_brand_name.imageset/launchscreen_brand_name.png",
+    "launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png",
+    "launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png",
   ]
 }
 
diff --git a/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn b/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn
index 53abdd258bc..1a834b95870 100644
--- a/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn
+++ b/chromium/ios/chrome/app/safe_mode/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("fatal_error") {
   sources = [
diff --git a/chromium/ios/chrome/app/spotlight/BUILD.gn b/chromium/ios/chrome/app/spotlight/BUILD.gn
index 962170f7467..dde51d7ea46 100644
--- a/chromium/ios/chrome/app/spotlight/BUILD.gn
+++ b/chromium/ios/chrome/app/spotlight/BUILD.gn
@@ -58,6 +58,7 @@ source_set("unit_tests") {
   deps = [
     ":spotlight",
     "//base",
+    "//base/test:test_support",
     "//components/bookmarks/browser",
     "//components/bookmarks/test",
     "//components/favicon/core",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index 8e236b6e54c..576e845ae91 100644
--- a/chromium/ios/chrome/app/startup/BUILD.gn
+++ b/chromium/ios/chrome/app/startup/BUILD.gn
@@ -35,8 +35,6 @@ source_set("startup_basic") {
 
 source_set("startup") {
   sources = [
-    "background_upload_alert.h",
-    "background_upload_alert.mm",
     "client_registration.h",
     "client_registration.mm",
     "content_suggestions_scheduler_notifications.h",
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index c797a72dea4..be8c91347e0 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -84,6 +84,7 @@ source_set("browser") {
     "//components/autofill/core/browser",
     "//components/autofill/core/common",
     "//components/dom_distiller/core",
+    "//components/feature_engagement",
     "//components/flags_ui",
     "//components/flags_ui:switches",
     "//components/handoff",
@@ -93,6 +94,7 @@ source_set("browser") {
     "//components/metrics_services_manager",
     "//components/net_log",
     "//components/ntp_tiles",
+    "//components/omnibox/browser",
     "//components/password_manager/core/common:common",
     "//components/payments/core",
     "//components/pref_registry",
@@ -101,6 +103,7 @@ source_set("browser") {
     "//components/proxy_config/ios",
     "//components/reading_list/ios",
     "//components/search_engines",
+    "//components/search_provider_logos",
     "//components/security_state/core",
     "//components/signin/core/browser",
     "//components/ssl_config",
@@ -114,10 +117,13 @@ source_set("browser") {
     "//components/webdata_services",
     "//google_apis",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
+    "//ios/chrome/browser/ssl:features",
     "//ios/chrome/browser/sync/glue",
+    "//ios/chrome/browser/web:features",
     "//ios/chrome/common",
-    "//ios/components/captive_portal",
     "//ios/components/io_thread",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
@@ -214,6 +220,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "app_startup_parameters_unittest.mm",
     "callback_counter_unittest.mm",
     "chrome_browser_provider_observer_bridge_unittest.mm",
     "chrome_url_util_unittest.mm",
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index a253eecbd62..f4b8be9cdc8 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -24,14 +24,6 @@ source_set("autofill") {
     "validation_rules_storage_factory.h",
   ]
   deps = [
-    "resources:autofill_card_american_express",
-    "resources:autofill_card_diners",
-    "resources:autofill_card_discover",
-    "resources:autofill_card_generic",
-    "resources:autofill_card_jcb",
-    "resources:autofill_card_mastercard",
-    "resources:autofill_card_unionpay",
-    "resources:autofill_card_visa",
     "resources:autofill_close",
     "resources:autofill_close_pressed",
     "resources:autofill_keyboard_background",
@@ -128,6 +120,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/autofill",
+    "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/test/base",
     "//ios/web",
diff --git a/chromium/ios/chrome/browser/autofill/resources/BUILD.gn b/chromium/ios/chrome/browser/autofill/resources/BUILD.gn
index ace0eff9444..04ce41815c2 100644
--- a/chromium/ios/chrome/browser/autofill/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/resources/BUILD.gn
@@ -2,95 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
-
-imageset("autofill_card_american_express") {
-  sources = [
-    "autofill_card_american_express.imageset/Contents.json",
-    "autofill_card_american_express.imageset/autofill_card_american_express.png",
-    "autofill_card_american_express.imageset/autofill_card_american_express@2x.png",
-    "autofill_card_american_express.imageset/autofill_card_american_express@2x~ipad.png",
-    "autofill_card_american_express.imageset/autofill_card_american_express@3x.png",
-    "autofill_card_american_express.imageset/autofill_card_american_express~ipad.png",
-  ]
-}
-
-imageset("autofill_card_diners") {
-  sources = [
-    "autofill_card_diners.imageset/Contents.json",
-    "autofill_card_diners.imageset/autofill_card_diners.png",
-    "autofill_card_diners.imageset/autofill_card_diners@2x.png",
-    "autofill_card_diners.imageset/autofill_card_diners@2x~ipad.png",
-    "autofill_card_diners.imageset/autofill_card_diners@3x.png",
-    "autofill_card_diners.imageset/autofill_card_diners~ipad.png",
-  ]
-}
-
-imageset("autofill_card_discover") {
-  sources = [
-    "autofill_card_discover.imageset/Contents.json",
-    "autofill_card_discover.imageset/autofill_card_discover.png",
-    "autofill_card_discover.imageset/autofill_card_discover@2x.png",
-    "autofill_card_discover.imageset/autofill_card_discover@2x~ipad.png",
-    "autofill_card_discover.imageset/autofill_card_discover@3x.png",
-    "autofill_card_discover.imageset/autofill_card_discover~ipad.png",
-  ]
-}
-
-imageset("autofill_card_generic") {
-  sources = [
-    "autofill_card_generic.imageset/Contents.json",
-    "autofill_card_generic.imageset/autofill_card_generic.png",
-    "autofill_card_generic.imageset/autofill_card_generic@2x.png",
-    "autofill_card_generic.imageset/autofill_card_generic@2x~ipad.png",
-    "autofill_card_generic.imageset/autofill_card_generic@3x.png",
-    "autofill_card_generic.imageset/autofill_card_generic~ipad.png",
-  ]
-}
-
-imageset("autofill_card_jcb") {
-  sources = [
-    "autofill_card_jcb.imageset/Contents.json",
-    "autofill_card_jcb.imageset/autofill_card_jcb.png",
-    "autofill_card_jcb.imageset/autofill_card_jcb@2x.png",
-    "autofill_card_jcb.imageset/autofill_card_jcb@2x~ipad.png",
-    "autofill_card_jcb.imageset/autofill_card_jcb@3x.png",
-    "autofill_card_jcb.imageset/autofill_card_jcb~ipad.png",
-  ]
-}
-
-imageset("autofill_card_mastercard") {
-  sources = [
-    "autofill_card_mastercard.imageset/Contents.json",
-    "autofill_card_mastercard.imageset/autofill_card_mastercard.png",
-    "autofill_card_mastercard.imageset/autofill_card_mastercard@2x.png",
-    "autofill_card_mastercard.imageset/autofill_card_mastercard@2x~ipad.png",
-    "autofill_card_mastercard.imageset/autofill_card_mastercard@3x.png",
-    "autofill_card_mastercard.imageset/autofill_card_mastercard~ipad.png",
-  ]
-}
-
-imageset("autofill_card_unionpay") {
-  sources = [
-    "autofill_card_unionpay.imageset/Contents.json",
-    "autofill_card_unionpay.imageset/autofill_card_unionpay.png",
-    "autofill_card_unionpay.imageset/autofill_card_unionpay@2x.png",
-    "autofill_card_unionpay.imageset/autofill_card_unionpay@2x~ipad.png",
-    "autofill_card_unionpay.imageset/autofill_card_unionpay@3x.png",
-    "autofill_card_unionpay.imageset/autofill_card_unionpay~ipad.png",
-  ]
-}
-
-imageset("autofill_card_visa") {
-  sources = [
-    "autofill_card_visa.imageset/Contents.json",
-    "autofill_card_visa.imageset/autofill_card_visa.png",
-    "autofill_card_visa.imageset/autofill_card_visa@2x.png",
-    "autofill_card_visa.imageset/autofill_card_visa@2x~ipad.png",
-    "autofill_card_visa.imageset/autofill_card_visa@3x.png",
-    "autofill_card_visa.imageset/autofill_card_visa~ipad.png",
-  ]
-}
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("autofill_close") {
   sources = [
diff --git a/chromium/ios/chrome/browser/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/bookmarks/BUILD.gn
index 1581e81d76b..c8f80590c74 100644
--- a/chromium/ios/chrome/browser/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/bookmarks/BUILD.gn
@@ -50,3 +50,13 @@ source_set("bookmarks_utils") {
     "//ios/chrome/browser/browser_state",
   ]
 }
+
+source_set("features") {
+  sources = [
+    "bookmark_new_generation_features.cc",
+    "bookmark_new_generation_features.h",
+  ]
+  deps = [
+    "//base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 109d33ec189..168122a57e8 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -85,7 +85,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/desktop_promotion",
     "//ios/chrome/browser/dom_distiller",
     "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/google",
     "//ios/chrome/browser/google:google_logo",
     "//ios/chrome/browser/history",
@@ -105,11 +105,12 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/translate",
+    "//ios/chrome/browser/ui/browser_list",
     "//ios/chrome/browser/undo",
+    "//ios/clean/chrome/browser/ui/overlays",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/shared/chrome/browser/ui/browser_list",
     "//ios/web",
     "//net",
     "//net:extras",
diff --git a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
index d913df674ab..0bc68fc940a 100644
--- a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn
@@ -5,7 +5,6 @@
 source_set("content_suggestions") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "content_suggestions_alert_commands.h",
     "content_suggestions_alert_factory.h",
     "content_suggestions_alert_factory.mm",
     "content_suggestions_category_wrapper.h",
@@ -14,16 +13,18 @@ source_set("content_suggestions") {
     "content_suggestions_coordinator.mm",
     "content_suggestions_favicon_mediator.h",
     "content_suggestions_favicon_mediator.mm",
-    "content_suggestions_header_provider.h",
     "content_suggestions_header_view_controller.h",
     "content_suggestions_header_view_controller.mm",
-    "content_suggestions_header_view_controller_delegate.h",
     "content_suggestions_mediator.h",
     "content_suggestions_mediator.mm",
+    "content_suggestions_metrics_recorder.h",
+    "content_suggestions_metrics_recorder.mm",
     "content_suggestions_service_bridge_observer.h",
     "content_suggestions_service_bridge_observer.mm",
     "mediator_util.h",
     "mediator_util.mm",
+    "ntp_home_metrics.h",
+    "ntp_home_metrics.mm",
   ]
   deps = [
     "//base",
@@ -41,11 +42,13 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/ntp_tiles",
     "//ios/chrome/browser/reading_list",
+    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//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/content_suggestions/cells:cells_ui",
@@ -57,6 +60,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/web_state_list",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/voice",
@@ -78,28 +82,3 @@ source_set("unit_tests") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
-
-source_set("eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "content_suggestions_alert_egtest.mm",
-  ]
-  deps = [
-    ":content_suggestions",
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/collection_view/cells",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ui/strings",
-  ]
-  libs = [
-    "UIKit.framework",
-    "XCTest.framework",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/context_menu/BUILD.gn b/chromium/ios/chrome/browser/context_menu/BUILD.gn
index 4de5c2018f8..86fffe74e8b 100644
--- a/chromium/ios/chrome/browser/context_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/context_menu/BUILD.gn
@@ -15,6 +15,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing:ios_test_support",
+    "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test/http_server",
diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn
index e94ef6d20fc..2c2953282a0 100644
--- a/chromium/ios/chrome/browser/crash_report/BUILD.gn
+++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn
@@ -48,9 +48,11 @@ source_set("crash_report_internal") {
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/web_state_list",
     "//ios/web",
     "//net",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
new file mode 100644
index 00000000000..de16ad13033
--- /dev/null
+++ b/chromium/ios/chrome/browser/drag_and_drop/BUILD.gn
@@ -0,0 +1,33 @@
+# 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("drag_and_drop") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "drag_and_drop_flag.h",
+    "drag_and_drop_flag.mm",
+    "drop_and_navigate_delegate.h",
+    "drop_and_navigate_interaction.h",
+    "drop_and_navigate_interaction.mm",
+  ]
+  deps = [
+    "//base",
+    "//net:net",
+    "//url:url",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "drop_and_navigate_interaction_unittest.mm",
+  ]
+  deps = [
+    ":drag_and_drop",
+    "//base",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/feature_engagement_tracker/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
index 480b628c1f9..d3c2c13352e 100644
--- a/chromium/ios/chrome/browser/feature_engagement_tracker/BUILD.gn
+++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
@@ -2,19 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("feature_engagement_tracker") {
+source_set("feature_engagement") {
   sources = [
-    "feature_engagement_tracker_factory.h",
-    "feature_engagement_tracker_factory.mm",
+    "tracker_factory.h",
+    "tracker_factory.mm",
+    "tracker_util.h",
+    "tracker_util.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
     "//base",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/keyed_service/ios",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/commands",
   ]
 }
diff --git a/chromium/ios/chrome/browser/google/BUILD.gn b/chromium/ios/chrome/browser/google/BUILD.gn
index 77508245f46..6e7cbd7c937 100644
--- a/chromium/ios/chrome/browser/google/BUILD.gn
+++ b/chromium/ios/chrome/browser/google/BUILD.gn
@@ -33,6 +33,7 @@ source_set("google_logo") {
   ]
   deps = [
     "//base",
+    "//components/image_fetcher/ios",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/search_engines",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index 5b55c011325..d85407e58f7 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -86,6 +86,8 @@ source_set("unit_tests") {
 source_set("metrics_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "drag_and_drop_recorder.h",
+    "drag_and_drop_recorder.mm",
     "first_user_action_recorder.cc",
     "first_user_action_recorder.h",
     "new_tab_page_uma.h",
@@ -93,7 +95,8 @@ source_set("metrics_internal") {
     "size_class_recorder.h",
     "size_class_recorder.mm",
     "size_class_recorder_private.h",
-    "tab_usage_recorder_delegate.h",
+    "tab_usage_recorder.h",
+    "tab_usage_recorder.mm",
   ]
   deps = [
     ":metrics",
@@ -101,56 +104,17 @@ source_set("metrics_internal") {
     "//components/google/core/browser",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/web_state_list",
     "//ios/web",
     "//ui/base",
     "//url",
   ]
-  public_deps = [
-    ":metrics_internal_arc",
-    ":metrics_internal_noarc",
-  ]
-  allow_circular_includes_from = [
-    ":metrics_internal_arc",
-    ":metrics_internal_noarc",
-  ]
   libs = [ "UIKit.framework" ]
 }
 
-source_set("metrics_internal_noarc") {
-  # TODO(crbug.com/731724) This target shouldn't be compiled with ARC until
-  # after it's converted to use WebStates instead of Tabs.
-  cflags_objc = [ "-fno-objc-arc" ]
-
-  sources = [
-    "tab_usage_recorder.h",
-    "tab_usage_recorder.mm",
-  ]
-
-  deps = [
-    ":metrics",
-    "//base",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/tabs",
-    "//ios/web",
-  ]
-}
-
-source_set("metrics_internal_arc") {
-  sources = [
-    "tab_usage_recorder_web_state_list_observer.h",
-    "tab_usage_recorder_web_state_list_observer.mm",
-  ]
-  deps = [
-    ":metrics_internal_noarc",
-    "//base",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/web_state_list",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("unit_tests_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -164,14 +128,14 @@ source_set("unit_tests_internal") {
     ":metrics_internal",
     "//base",
     "//base/test:test_support",
-    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
-    "//third_party/ocmock",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
index 7a6f37333ed..ff3941f5bf0 100644
--- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
+++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
@@ -6,6 +6,8 @@ source_set("ntp_snippets") {
   sources = [
     "ios_chrome_content_suggestions_service_factory.cc",
     "ios_chrome_content_suggestions_service_factory.h",
+    "ios_chrome_content_suggestions_service_factory_util.cc",
+    "ios_chrome_content_suggestions_service_factory_util.h",
   ]
   deps = [
     "//base",
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index c421d069fad..7a6b1698bdf 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -7,6 +7,12 @@ import("//ios/web/js_compile.gni")
 source_set("passwords") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "credential_manager.h",
+    "credential_manager.mm",
+    "credential_manager_features.cc",
+    "credential_manager_features.h",
+    "credential_manager_util.h",
+    "credential_manager_util.mm",
     "ios_chrome_password_manager_client.h",
     "ios_chrome_password_manager_client.mm",
     "ios_chrome_password_manager_driver.h",
@@ -49,6 +55,7 @@ source_set("passwords") {
     "//components/password_manager/core/common",
     "//components/password_manager/sync/browser",
     "//components/prefs",
+    "//components/security_state/core",
     "//components/signin/core/browser",
     "//components/strings",
     "//components/sync",
@@ -60,7 +67,12 @@ 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",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
@@ -96,6 +108,8 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "credential_manager_unittest.mm",
+    "credential_manager_util_unittest.cc",
     "password_controller_js_unittest.mm",
     "password_controller_off_the_record_unittest.mm",
     "password_controller_unittest.mm",
@@ -115,11 +129,13 @@ source_set("unit_tests") {
     "//google_apis",
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui/commands",
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
+    "//net:test_support",
     "//testing/gtest",
     "//third_party/ocmock",
     "//url",
diff --git a/chromium/ios/chrome/browser/payments/BUILD.gn b/chromium/ios/chrome/browser/payments/BUILD.gn
index 3c3ebc8d9ff..84f2e85802e 100644
--- a/chromium/ios/chrome/browser/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/payments/BUILD.gn
@@ -9,23 +9,35 @@ source_set("payments") {
   sources = [
     "ios_can_make_payment_query_factory.cc",
     "ios_can_make_payment_query_factory.h",
+    "ios_payment_instrument.h",
+    "ios_payment_instrument.mm",
+    "ios_payment_instrument_finder.h",
+    "ios_payment_instrument_finder.mm",
+    "ios_payment_instrument_launcher.h",
+    "ios_payment_instrument_launcher.mm",
+    "ios_payment_instrument_launcher_factory.h",
+    "ios_payment_instrument_launcher_factory.mm",
     "ios_payment_request_cache_factory.h",
     "ios_payment_request_cache_factory.mm",
-    "itunes_json_request.cc",
-    "itunes_json_request.h",
+    "origin_security_checker.h",
+    "origin_security_checker.mm",
     "payment_request.h",
     "payment_request.mm",
     "payment_request_cache.h",
     "payment_request_cache.mm",
     "payment_request_util.h",
     "payment_request_util.mm",
+    "payment_response_helper.h",
+    "payment_response_helper.mm",
   ]
   deps = [
     "//base",
     "//components/autofill/core/browser",
+    "//components/image_fetcher/ios",
     "//components/keyed_service/ios",
     "//components/payments/core",
     "//components/prefs",
+    "//components/security_state/core",
     "//components/signin/core/browser",
     "//components/strings:components_strings_grit",
     "//ios/chrome/browser",
@@ -44,7 +56,10 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "ios_payment_instrument_finder_unittest.mm",
+    "ios_payment_instrument_launcher_unittest.mm",
     "payment_request_unittest.mm",
+    "payment_response_helper_unittest.mm",
   ]
   deps = [
     ":payments",
@@ -56,10 +71,14 @@ source_set("unit_tests") {
     "//components/payments/core",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/web:test_support",
+    "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test/fakes",
+    "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
+    "//url",
   ]
 }
 
@@ -78,6 +97,7 @@ source_set("test_support") {
     "//components/autofill/core/browser",
     "//components/autofill/core/browser:test_support",
     "//components/payments/core",
+    "//components/payments/core:test_support",
     "//components/prefs",
     "//ios/web",
   ]
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index 3b108944726..e7f59a7c0e6 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -60,6 +60,7 @@ source_set("browser_prefs") {
     "//components/variations/service",
     "//components/web_resource",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/desktop_promotion",
     "//ios/chrome/browser/first_run",
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
new file mode 100644
index 00000000000..731882d2c9e
--- /dev/null
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -0,0 +1,64 @@
+# 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("prerender") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "preload_controller.h",
+    "preload_controller.mm",
+    "preload_controller_delegate.h",
+    "prerender_service.h",
+    "prerender_service.mm",
+    "prerender_service_factory.h",
+    "prerender_service_factory.mm",
+  ]
+
+  deps = [
+    ":provider",
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/prefs",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/net",
+    "//ios/chrome/browser/prefs",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui",
+    "//ios/web",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("provider") {
+  sources = [
+    "preload_provider.h",
+  ]
+  deps = [
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  sources = [
+    "preload_controller_unittest.mm",
+    "prerender_service_unittest.mm",
+  ]
+  deps = [
+    ":prerender",
+    "//base",
+    "//components/prefs",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//net:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn
index 5a6195cb7c2..9248aa7f124 100644
--- a/chromium/ios/chrome/browser/sessions/BUILD.gn
+++ b/chromium/ios/chrome/browser/sessions/BUILD.gn
@@ -49,6 +49,8 @@ source_set("serialisation") {
   ]
   deps = [
     "//base",
+    "//components/sessions",
+    "//ios/chrome/browser/browser_state",
     "//ios/web",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ssl/BUILD.gn b/chromium/ios/chrome/browser/ssl/BUILD.gn
index cd12309f8f3..b708fd13ebb 100644
--- a/chromium/ios/chrome/browser/ssl/BUILD.gn
+++ b/chromium/ios/chrome/browser/ssl/BUILD.gn
@@ -7,6 +7,9 @@ source_set("ssl") {
   sources = [
     "captive_portal_detector_tab_helper.h",
     "captive_portal_detector_tab_helper.mm",
+    "ios_captive_portal_blocking_page.h",
+    "ios_captive_portal_blocking_page.mm",
+    "ios_captive_portal_blocking_page_delegate.h",
     "ios_security_state_tab_helper.h",
     "ios_security_state_tab_helper.mm",
     "ios_ssl_blocking_page.h",
@@ -15,14 +18,20 @@ source_set("ssl") {
     "ios_ssl_error_handler.mm",
   ]
   deps = [
+    ":features",
     "//base",
+    "//base:i18n",
     "//components/captive_portal",
     "//components/security_interstitials/core",
     "//components/security_state/core",
     "//components/strings",
+    "//components/url_formatter",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/interstitials",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/captive_portal",
+    "//ios/chrome/browser/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/web",
     "//net",
@@ -31,15 +40,29 @@ source_set("ssl") {
   ]
 }
 
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "captive_portal_features.cc",
+    "captive_portal_features.h",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "ios_captive_portal_blocking_page_unittest.mm",
     "ios_ssl_error_handler_unittest.mm",
   ]
   deps = [
     ":ssl",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/web:test_support",
+    "//ios/testing:ios_test_support",
     "//ios/web",
     "//ios/web/public/test",
     "//net",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index bfbe6c97a7e..fc0f8a257b8 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -6,6 +6,7 @@ source_set("tabs") {
   sources = [
     "legacy_tab_helper.h",
     "tab.h",
+    "tab_constants.h",
     "tab_delegate.h",
     "tab_dialog_delegate.h",
     "tab_headers_delegate.h",
@@ -25,7 +26,7 @@ source_set("tabs") {
     "//components/sessions",
     "//components/signin/ios/browser",
     "//components/sync_sessions",
-    "//ios/chrome/browser/web:sad_tab_tab_helper_delegate",
+    "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/net",
     "//ios/web:user_agent",
     "//ui/base",
@@ -39,11 +40,14 @@ source_set("tabs_internal") {
     "legacy_tab_helper.mm",
     "tab.h",
     "tab.mm",
+    "tab_constants.cc",
     "tab_helper_util.mm",
     "tab_model.mm",
     "tab_model_closing_web_state_observer.h",
     "tab_model_closing_web_state_observer.mm",
     "tab_model_list.mm",
+    "tab_model_notification_observer.h",
+    "tab_model_notification_observer.mm",
     "tab_model_observers.h",
     "tab_model_observers.mm",
     "tab_model_observers_bridge.h",
@@ -54,6 +58,8 @@ source_set("tabs_internal") {
     "tab_model_synced_window_delegate_getter.mm",
     "tab_model_web_state_list_delegate.h",
     "tab_model_web_state_list_delegate.mm",
+    "tab_model_web_usage_enabled_observer.h",
+    "tab_model_web_usage_enabled_observer.mm",
     "tab_parenting_observer.h",
     "tab_parenting_observer.mm",
   ]
@@ -94,6 +100,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/passwords:passwords_internal",
+    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
@@ -113,12 +120,11 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/downloads",
     "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/reader_mode",
     "//ios/chrome/browser/ui/sad_tab",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web",
-    "//ios/chrome/browser/web:sad_tab_tab_helper_delegate",
+    "//ios/chrome/browser/web:tab_helper_delegates",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
     "//ios/net",
diff --git a/chromium/ios/chrome/browser/test/BUILD.gn b/chromium/ios/chrome/browser/test/BUILD.gn
index 992af1ff3c9..96a6c11e433 100644
--- a/chromium/ios/chrome/browser/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/test/BUILD.gn
@@ -17,6 +17,7 @@ source_set("perf_test_support") {
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/search_engines",
     "//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 5db31d0a8ce..c38e7157236 100644
--- a/chromium/ios/chrome/browser/ui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/BUILD.gn
@@ -25,31 +25,47 @@ source_set("ui") {
     "prerender_final_status.h",
     "reversed_animation.h",
     "reversed_animation.mm",
-    "rtl_geometry.h",
-    "rtl_geometry.mm",
     "show_mail_composer_util.h",
     "show_mail_composer_util.mm",
-    "show_privacy_settings_util.h",
-    "show_privacy_settings_util.mm",
     "side_swipe_gesture_recognizer.h",
     "side_swipe_gesture_recognizer.mm",
+    "url_loader.h",
+  ]
+  public_deps = [
+    ":ui_util",
+    "//ios/chrome/browser/ui/captive_portal",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+  ]
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/store_kit",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/web",
+    "//ui/base",
+  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/commands" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("ui_util") {
+  sources = [
+    "rtl_geometry.h",
+    "rtl_geometry.mm",
     "ui_util.h",
     "ui_util.mm",
     "uikit_ui_util.h",
     "uikit_ui_util.mm",
-    "url_loader.h",
   ]
   deps = [
     "//base",
     "//base:i18n",
     "//ios/chrome/browser",
-    "//ios/chrome/browser/store_kit",
-    "//ios/chrome/browser/ui/commands",
     "//ios/web",
     "//ui/base",
     "//ui/gfx",
   ]
-  allow_circular_includes_from = [ "//ios/chrome/browser/ui/commands" ]
   libs = [
     "Accelerate.framework",
     "CoreGraphics.framework",
@@ -73,7 +89,6 @@ source_set("unit_tests") {
     "open_in_controller_unittest.mm",
     "open_in_toolbar_unittest.mm",
     "page_not_available_controller_unittest.mm",
-    "preload_controller_unittest.mm",
     "ui_util_unittest.mm",
     "uikit_ui_util_unittest.mm",
   ]
@@ -86,6 +101,7 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/test",
+    "//components/payments/core",
     "//components/prefs:test_support",
     "//components/search_engines",
     "//components/sessions",
@@ -136,8 +152,10 @@ bundle_data("resources") {
     # On iOS, the terms of service file need to be loaded from the application
     # bundle, not from a datapack. As GetTermsOfServicePath() returns path to
     # those files, they are added to //ios/chrome/browser/ui:resources.
+    "//components/resources/terms/terms_am.html",
     "//components/resources/terms/terms_ar.html",
     "//components/resources/terms/terms_bg.html",
+    "//components/resources/terms/terms_bn.html",
     "//components/resources/terms/terms_ca.html",
     "//components/resources/terms/terms_cs.html",
     "//components/resources/terms/terms_da.html",
@@ -147,9 +165,12 @@ bundle_data("resources") {
     "//components/resources/terms/terms_en.html",
     "//components/resources/terms/terms_es-419.html",
     "//components/resources/terms/terms_es.html",
+    "//components/resources/terms/terms_et.html",
     "//components/resources/terms/terms_fa.html",
     "//components/resources/terms/terms_fi.html",
+    "//components/resources/terms/terms_fil.html",
     "//components/resources/terms/terms_fr.html",
+    "//components/resources/terms/terms_gu.html",
     "//components/resources/terms/terms_he.html",
     "//components/resources/terms/terms_hi.html",
     "//components/resources/terms/terms_hr.html",
@@ -157,8 +178,12 @@ bundle_data("resources") {
     "//components/resources/terms/terms_id.html",
     "//components/resources/terms/terms_it.html",
     "//components/resources/terms/terms_ja.html",
+    "//components/resources/terms/terms_kn.html",
     "//components/resources/terms/terms_ko.html",
     "//components/resources/terms/terms_lt.html",
+    "//components/resources/terms/terms_lv.html",
+    "//components/resources/terms/terms_ml.html",
+    "//components/resources/terms/terms_mr.html",
     "//components/resources/terms/terms_nb.html",
     "//components/resources/terms/terms_nl.html",
     "//components/resources/terms/terms_pl.html",
@@ -167,8 +192,12 @@ bundle_data("resources") {
     "//components/resources/terms/terms_ro.html",
     "//components/resources/terms/terms_ru.html",
     "//components/resources/terms/terms_sk.html",
+    "//components/resources/terms/terms_sl.html",
     "//components/resources/terms/terms_sr.html",
     "//components/resources/terms/terms_sv.html",
+    "//components/resources/terms/terms_sw.html",
+    "//components/resources/terms/terms_ta.html",
+    "//components/resources/terms/terms_te.html",
     "//components/resources/terms/terms_th.html",
     "//components/resources/terms/terms_tr.html",
     "//components/resources/terms/terms_uk.html",
@@ -181,9 +210,15 @@ bundle_data("resources") {
   ]
 }
 
-source_set("ui_internal_arc") {
+source_set("ui_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "browser_container_view.h",
+    "browser_container_view.mm",
+    "browser_view_controller.h",
+    "browser_view_controller.mm",
+    "browser_view_controller_dependency_factory.h",
+    "browser_view_controller_dependency_factory.mm",
     "chrome_web_view_factory.h",
     "chrome_web_view_factory.mm",
     "external_file_controller.h",
@@ -203,9 +238,6 @@ source_set("ui_internal_arc") {
     "open_in_toolbar.mm",
     "page_not_available_controller.h",
     "page_not_available_controller.mm",
-    "preload_controller.h",
-    "preload_controller.mm",
-    "preload_controller_delegate.h",
     "prerender_delegate.h",
   ]
   deps = [
@@ -220,126 +252,7 @@ source_set("ui_internal_arc") {
     "//base",
     "//base:i18n",
     "//components/bookmarks/browser",
-    "//components/image_fetcher/ios",
-    "//components/infobars/core",
-    "//components/prefs",
-    "//components/reading_list/core",
-    "//components/search_engines",
-    "//components/sessions",
-    "//components/strings",
-    "//components/toolbar",
-    "//components/url_formatter",
-    "//ios/chrome/app:tests_hook",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/content_suggestions",
-    "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/find_in_page",
-    "//ios/chrome/browser/first_run",
-    "//ios/chrome/browser/geolocation:geolocation_internal",
-    "//ios/chrome/browser/infobars",
-    "//ios/chrome/browser/metrics:metrics_internal",
-    "//ios/chrome/browser/net",
-    "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/prefs",
-    "//ios/chrome/browser/reading_list",
-    "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/snapshots",
-    "//ios/chrome/browser/snapshots:snapshots_internal",
-    "//ios/chrome/browser/store_kit",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/activity_services",
-    "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/bookmarks",
-    "//ios/chrome/browser/ui/colors",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/context_menu",
-    "//ios/chrome/browser/ui/dialogs:dialogs_internal",
-    "//ios/chrome/browser/ui/elements:elements_internal",
-    "//ios/chrome/browser/ui/find_bar",
-    "//ios/chrome/browser/ui/first_run",
-    "//ios/chrome/browser/ui/history",
-    "//ios/chrome/browser/ui/keyboard",
-    "//ios/chrome/browser/ui/ntp",
-    "//ios/chrome/browser/ui/ntp/recent_tabs",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/payments",
-    "//ios/chrome/browser/ui/print",
-    "//ios/chrome/browser/ui/qr_scanner",
-    "//ios/chrome/browser/ui/reading_list",
-    "//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/tools_menu",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/voice",
-    "//ios/chrome/browser/upgrade",
-    "//ios/chrome/browser/web",
-    "//ios/chrome/browser/web:web_internal",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/common",
-    "//ios/net",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/public/provider/chrome/browser/voice",
-    "//ios/third_party/material_components_ios",
-    "//ios/web",
-    "//ios/web:user_agent",
-    "//net",
-    "//third_party/google_toolbox_for_mac",
-    "//ui/base",
-    "//ui/gfx",
-    "//url",
-  ]
-  public_deps = [
-    "//ios/chrome/browser/ui/side_swipe",
-    "//ios/chrome/browser/ui/toolbar",
-  ]
-  allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/tabs",
-    "//ios/chrome/browser/ui/tab_switcher",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/snapshots:snapshots_internal",
-    "//ios/chrome/browser/web:web_internal",
-    "//ios/chrome/browser/ui/stack_view",
-  ]
-  libs = [
-    "AssetsLibrary.framework",
-    "MessageUI.framework",
-    "MobileCoreServices.framework",
-    "PassKit.framework",
-    "Photos.framework",
-    "QuartzCore.framework",
-    "StoreKit.framework",
-    "UIKit.framework",
-    "WebKit.framework",
-  ]
-}
-
-source_set("ui_internal") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "browser_container_view.h",
-    "browser_container_view.mm",
-    "browser_view_controller.h",
-    "browser_view_controller.mm",
-    "browser_view_controller_dependency_factory.h",
-    "browser_view_controller_dependency_factory.mm",
-  ]
-  deps = [
-    ":resources",
-    ":ui",
-    "//base",
-    "//base:i18n",
-    "//components/bookmarks/browser",
+    "//components/feature_engagement",
     "//components/image_fetcher/ios",
     "//components/infobars/core",
     "//components/payments/core",
@@ -357,6 +270,7 @@ source_set("ui_internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_suggestions",
     "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/geolocation:geolocation_internal",
@@ -365,20 +279,25 @@ source_set("ui_internal") {
     "//ios/chrome/browser/net",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/prefs",
+    "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/snapshots:snapshots_internal",
+    "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/activity_services",
+    "//ios/chrome/browser/ui/activity_services:coordinator",
+    "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/contextual_search",
     "//ios/chrome/browser/ui/dialogs:dialogs_internal",
@@ -386,6 +305,8 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/find_bar",
     "//ios/chrome/browser/ui/first_run",
     "//ios/chrome/browser/ui/history",
+    "//ios/chrome/browser/ui/history_popup:coordinator",
+    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
@@ -395,7 +316,8 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/payments",
     "//ios/chrome/browser/ui/print",
-    "//ios/chrome/browser/ui/qr_scanner",
+    "//ios/chrome/browser/ui/qr_scanner:coordinator",
+    "//ios/chrome/browser/ui/qr_scanner/requirements",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/stack_view",
     "//ios/chrome/browser/ui/static_content",
@@ -403,6 +325,7 @@ source_set("ui_internal") {
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/ui/tabs",
     "//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",
@@ -414,8 +337,6 @@ source_set("ui_internal") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/public/provider/chrome/browser/voice",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web:user_agent",
@@ -426,20 +347,18 @@ source_set("ui_internal") {
     "//url",
   ]
   public_deps = [
-    ":ui_internal_arc",
     "//ios/chrome/browser/ui/side_swipe",
     "//ios/chrome/browser/ui/toolbar",
   ]
   allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/tabs",
-    "//ios/chrome/browser/ui/tab_switcher",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/snapshots:snapshots_internal",
-    "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
+    "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/stack_view",
-    ":ui_internal_arc",
+    "//ios/chrome/browser/ui/tab_switcher",
+    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/web:web_internal",
   ]
   libs = [
     "AssetsLibrary.framework",
@@ -514,6 +433,7 @@ source_set("eg_tests") {
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/toolbar",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index 0786057e7b2..17f15d9aeae 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -32,8 +32,10 @@ source_set("activity_services") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
     "//net",
     "//ui/base",
@@ -45,6 +47,22 @@ source_set("activity_services") {
   ]
 }
 
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "activity_service_legacy_coordinator.h",
+    "activity_service_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":activity_services",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/chrome/browser/ui/commands",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -52,6 +70,7 @@ source_set("unit_tests") {
     "activity_service_controller_unittest.mm",
     "activity_type_util_unittest.mm",
     "chrome_activity_item_thumbnail_generator_unittest.mm",
+    "share_to_data_builder_unittest.mm",
   ]
   deps = [
     ":activity_services",
@@ -59,7 +78,11 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/testing:ocmock_support",
+    "//ios/web",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn
new file mode 100644
index 00000000000..2307fdca9ef
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/activity_services/requirements/BUILD.gn
@@ -0,0 +1,12 @@
+# 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") {
+  sources = [
+    "activity_service_password.h",
+    "activity_service_positioner.h",
+    "activity_service_presentation.h",
+    "activity_service_snackbar.h",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
index 171820f39c5..1475c664935 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("activity_services_print") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index 4753b1c8e21..37034c1ae80 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -18,6 +18,8 @@ source_set("authentication") {
     "chrome_signin_view_controller.mm",
     "re_signin_infobar_delegate.h",
     "re_signin_infobar_delegate.mm",
+    "resized_avatar_cache.h",
+    "resized_avatar_cache.mm",
     "signed_in_accounts_view_controller.h",
     "signed_in_accounts_view_controller.mm",
     "signin_account_selector_view_controller.h",
@@ -26,9 +28,10 @@ source_set("authentication") {
     "signin_confirmation_view_controller.mm",
     "signin_interaction_controller.h",
     "signin_interaction_controller.mm",
+    "signin_promo_view_mediator.h",
+    "signin_promo_view_mediator.mm",
   ]
   deps = [
-    ":authentication_arc",
     ":authentication_ui",
     "resources:signin_confirmation_more",
     "resources:signin_promo_close_gray",
@@ -61,7 +64,6 @@ source_set("authentication") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/shared/chrome/browser/ui/commands",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ui/base",
@@ -80,32 +82,6 @@ source_set("authentication") {
   ]
 }
 
-source_set("authentication_arc") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "resized_avatar_cache.h",
-    "resized_avatar_cache.mm",
-    "signin_promo_view_mediator.h",
-    "signin_promo_view_mediator.mm",
-  ]
-  deps = [
-    ":authentication_ui",
-    "//base",
-    "//components/prefs",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/signin",
-    "//ios/third_party/material_components_ios",
-    "//ui/base",
-  ]
-  libs = [ "UIKit.framework" ]
-}
-
 source_set("authentication_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -150,7 +126,6 @@ source_set("unit_tests") {
   ]
   deps = [
     ":authentication",
-    ":authentication_arc",
     ":authentication_ui",
     "//base",
     "//base/test:test_support",
@@ -186,9 +161,13 @@ source_set("eg_tests") {
     "//components/signin/core/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
@@ -200,3 +179,17 @@ source_set("eg_tests") {
   ]
   libs = [ "XCTest.framework" ]
 }
+
+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",
+  ]
+  deps = [
+    ":authentication_ui",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/third_party/earl_grey",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
index 9ef1905bd3d..02a9899ea9b 100644
--- a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("signin_confirmation_more") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index f7938545e9d..45d3f4cb73f 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -37,6 +37,8 @@ source_set("bookmarks") {
     "bookmark_home_waiting_view.mm",
     "bookmark_interaction_controller.h",
     "bookmark_interaction_controller.mm",
+    "bookmark_mediator.h",
+    "bookmark_mediator.mm",
     "bookmark_menu_cell.h",
     "bookmark_menu_cell.mm",
     "bookmark_menu_item.h",
@@ -57,6 +59,8 @@ source_set("bookmarks") {
     "bookmark_promo_controller.mm",
     "bookmark_signin_promo_cell.h",
     "bookmark_signin_promo_cell.mm",
+    "bookmark_table_view.h",
+    "bookmark_table_view.mm",
     "bookmark_utils_ios.h",
     "bookmark_utils_ios.mm",
     "undo_manager_bridge_observer.h",
@@ -104,6 +108,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -111,7 +116,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
-    "//ios/chrome/browser/ui/authentication:authentication_arc",
+    "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/bookmarks/bars",
     "//ios/chrome/browser/ui/bookmarks/cells",
@@ -123,6 +128,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/undo",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
@@ -174,6 +180,7 @@ source_set("eg_tests") {
   testonly = true
   sources = [
     "bookmarks_egtest.mm",
+    "bookmarks_new_generation_egtest.mm",
   ]
   deps = [
     "//base",
@@ -184,8 +191,11 @@ source_set("eg_tests") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//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/bars/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
index 6174d44a25e..fea0261b9e7 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("bars") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "bookmark_context_bar.h",
+    "bookmark_context_bar.mm",
     "bookmark_editing_bar.h",
     "bookmark_editing_bar.mm",
     "bookmark_navigation_bar.h",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index 13996b56794..944f4c4a76e 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -6,15 +6,24 @@ source_set("cells") {
   sources = [
     "bookmark_parent_folder_item.h",
     "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",
     "bookmark_text_field_item.mm",
   ]
 
   deps = [
     "//base",
+    "//components/bookmarks/browser:browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/collection_view/cells",
+    "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
index 8b0fc503e25..321821204e0 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("bookmark_bar_innershadow") {
   sources = [
diff --git a/chromium/ios/shared/chrome/browser/ui/broadcaster/BUILD.gn b/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn
index 6c327a213c0..9c644260937 100644
--- a/chromium/ios/shared/chrome/browser/ui/broadcaster/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/broadcaster/BUILD.gn
@@ -10,6 +10,7 @@ source_set("broadcaster") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/shared/chrome/browser/ui/browser_list/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn
index 23f76b5a879..f5ecaafc2a7 100644
--- a/chromium/ios/shared/chrome/browser/ui/browser_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/browser_list/BUILD.gn
@@ -29,10 +29,10 @@ 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/shared/chrome/browser/ui/broadcaster",
-    "//ios/shared/chrome/browser/ui/commands",
     "//ios/web",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -46,6 +46,7 @@ source_set("unit_tests") {
   deps = [
     ":browser_list",
     "//base",
+    "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
index bf0aeeb659a..c62cf399cc2 100644
--- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn
@@ -5,13 +5,23 @@
 source_set("bubble") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "bubble_util.h",
+    "bubble_util.mm",
     "bubble_view.h",
     "bubble_view.mm",
+    "bubble_view_anchor_point_provider.h",
     "bubble_view_controller.h",
     "bubble_view_controller.mm",
+    "bubble_view_controller_presenter.h",
+    "bubble_view_controller_presenter.mm",
   ]
   deps = [
     "//base",
+    "//base:i18n",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
   ]
   libs = [ "UIKit.framework" ]
 }
@@ -20,11 +30,15 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "bubble_view_controller_unittest.mm",
+    "bubble_util_unittest.mm",
+    "bubble_view_controller_presenter_unittest.mm",
+    "bubble_view_unittest.mm",
   ]
   deps = [
     ":bubble",
     "//base",
+    "//base:i18n",
     "//testing/gtest",
   ]
+  libs = [ "CoreGraphics.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/captive_portal/BUILD.gn b/chromium/ios/chrome/browser/ui/captive_portal/BUILD.gn
new file mode 100644
index 00000000000..ef2ea5ee4b2
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/captive_portal/BUILD.gn
@@ -0,0 +1,43 @@
+# 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("captive_portal") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "captive_portal_login_coordinator.h",
+    "captive_portal_login_coordinator.mm",
+    "captive_portal_login_view_controller.h",
+    "captive_portal_login_view_controller.mm",
+    "captive_portal_login_view_controller_delegate.h",
+  ]
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/app/theme",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/third_party/material_components_ios",
+    "//net",
+    "//ui/base",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "captive_portal_login_coordinator_unittest.mm",
+  ]
+  deps = [
+    ":captive_portal",
+    "//base/test:test_support",
+    "//ios/chrome/browser/ssl",
+    "//ios/chrome/browser/web:test_support",
+    "//ios/chrome/test:test_support",
+    "//ios/testing:ios_test_support",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
index 1da2ed3f97f..e648f4aeb97 100644
--- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn
@@ -7,31 +7,52 @@ source_set("commands") {
   sources = [
     "UIKit+ChromeExecuteCommand.h",
     "UIKit+ChromeExecuteCommand.mm",
+    "activity_service_commands.h",
     "application_commands.h",
     "browser_commands.h",
     "clear_browsing_data_command.h",
     "clear_browsing_data_command.mm",
+    "command_dispatcher.h",
+    "command_dispatcher.mm",
     "generic_chrome_command.h",
     "generic_chrome_command.mm",
+    "history_popup_commands.h",
     "ios_command_ids.h",
     "open_new_tab_command.h",
     "open_new_tab_command.mm",
     "open_url_command.h",
     "open_url_command.mm",
+    "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",
+    "start_voice_search_command.h",
+    "start_voice_search_command.mm",
   ]
   deps = [
     "//base",
     "//components/browsing_data/core",
     "//components/signin/core/browser",
-    "//ios/shared/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/metrics",
     "//ios/web",
     "//net",
     "//url",
   ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "command_dispatcher_unittest.mm",
+  ]
+  deps = [
+    ":commands",
+    "//base",
+    "//ios/chrome/browser/ui/metrics",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 247b51b8ffc..7530e385506 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -12,17 +12,23 @@ source_set("content_suggestions") {
     "content_suggestions_data_sink.h",
     "content_suggestions_data_source.h",
     "content_suggestions_header_controlling.h",
+    "content_suggestions_header_provider.h",
     "content_suggestions_header_synchronizer.h",
     "content_suggestions_header_synchronizer.mm",
     "content_suggestions_header_synchronizing.h",
+    "content_suggestions_header_view_controller_delegate.h",
     "content_suggestions_layout.h",
     "content_suggestions_layout.mm",
+    "content_suggestions_layout_handset.h",
+    "content_suggestions_layout_handset.mm",
+    "content_suggestions_metrics_recording.h",
     "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",
     ":content_suggestions_util",
     "resources:content_suggestions_no_image",
     "resources:content_suggestions_offline",
@@ -33,6 +39,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/favicon:favicon_ui",
+    "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_header",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ui/base",
@@ -43,18 +50,28 @@ source_set("content_suggestions") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("content_suggestions_constant") {
+  sources = [
+    "ntp_home_constant.h",
+    "ntp_home_constant.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("content_suggestions_util") {
   sources = [
     "content_suggestions_collection_utils.h",
     "content_suggestions_collection_utils.mm",
   ]
   deps = [
+    ":content_suggestions_constant",
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
+    "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/third_party/material_components_ios",
     "//mojo/common:common_custom_types",
@@ -84,3 +101,45 @@ source_set("unit_tests") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("eg_tests") {
+  testonly = true
+  sources = [
+    "content_suggestions_egtest.mm",
+    "ntp_home_egtest.mm",
+    "ntp_home_provider_test_singleton.h",
+    "ntp_home_provider_test_singleton.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",
+    "//components/reading_list/core",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ntp_snippets",
+    "//ios/chrome/browser/reading_list",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing:ios_test_support",
+    "//ios/testing/earl_grey:earl_grey_support",
+    "//ios/third_party/earl_grey",
+    "//ios/web/public/test/http_server",
+    "//testing/gmock",
+    "//ui/strings",
+  ]
+  libs = [
+    "UIKit.framework",
+    "XCTest.framework",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
index 5acdb95969a..69fb20bcaad 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn
@@ -4,6 +4,7 @@
 
 source_set("cells") {
   sources = [
+    "content_suggestions_gesture_commands.h",
     "content_suggestions_item.h",
     "content_suggestions_item.mm",
     "content_suggestions_most_visited_item.h",
@@ -31,6 +32,8 @@ source_set("cells_ui") {
     "content_suggestions_footer_item.mm",
     "content_suggestions_header_item.h",
     "content_suggestions_header_item.mm",
+    "content_suggestions_learn_more_item.h",
+    "content_suggestions_learn_more_item.mm",
     "content_suggestions_most_visited_cell.h",
     "content_suggestions_most_visited_cell.mm",
     "content_suggestions_text_item.h",
@@ -41,15 +44,20 @@ source_set("cells_ui") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/favicon:favicon_ui",
+    "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ui/base",
   ]
+  public_deps = [
+    "//ios/third_party/material_components_ios",
+  ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
@@ -59,6 +67,7 @@ source_set("unit_tests") {
     "content_suggestions_footer_item_unittest.mm",
     "content_suggestions_header_item_unittest.mm",
     "content_suggestions_item_unittest.mm",
+    "content_suggestions_learn_more_item_unittest.mm",
     "content_suggestions_most_visited_item_unittest.mm",
     "content_suggestions_whats_new_item_unittest.mm",
   ]
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/resources/BUILD.gn
index efddf80293c..599a408fcb4 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("content_suggestions_no_image") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/contextual_search/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/contextual_search/resources/BUILD.gn
index 30af686d874..a8ef89ef716 100644
--- a/chromium/ios/chrome/browser/ui/contextual_search/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/contextual_search/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("expand_less") {
   sources = [
diff --git a/chromium/ios/shared/chrome/browser/ui/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn
index 01805bb812b..422056f472c 100644
--- a/chromium/ios/shared/chrome/browser/ui/coordinators/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn
@@ -13,11 +13,9 @@ source_set("coordinators") {
 
   deps = [
     "//base",
-    "//ios/chrome/app:tests_fake_hook",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/tabs:tabs_internal",
-    "//ios/shared/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/browser_list",
   ]
 }
 
@@ -33,8 +31,9 @@ source_set("test_support") {
   deps = [
     ":coordinators",
     "//base",
+    "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
-    "//ios/shared/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/browser_list",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
index 4a505f1a127..540226b4331 100644
--- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
@@ -9,8 +9,8 @@ source_set("dialogs") {
   ]
 
   sources = [
-    "javascript_dialog_blocking_util.h",
-    "javascript_dialog_blocking_util.mm",
+    "java_script_dialog_blocking_state.h",
+    "java_script_dialog_blocking_state.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -20,7 +20,7 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
-    "javascript_dialog_blocking_util_unittest.mm",
+    "java_script_dialog_blocking_state_unittest.mm",
   ]
 
   deps = [
diff --git a/chromium/ios/chrome/browser/ui/downloads/BUILD.gn b/chromium/ios/chrome/browser/ui/downloads/BUILD.gn
index 64861f261b9..6efed452a0e 100644
--- a/chromium/ios/chrome/browser/ui/downloads/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/downloads/BUILD.gn
@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
-import("//build/config/ios/rules.gni")
-
 source_set("downloads") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -12,11 +9,11 @@ source_set("downloads") {
     "download_manager_controller.mm",
   ]
   deps = [
-    ":download_manager_controller_xib",
-    ":error_icon",
-    ":file_icon_body",
-    ":file_icon_fold",
-    ":file_icon_fold_complete",
+    "resources:download_manager_controller_xib",
+    "resources:error_icon",
+    "resources:file_icon_body",
+    "resources:file_icon_fold",
+    "resources:file_icon_fold_complete",
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -55,43 +52,3 @@ source_set("unit_tests") {
     "//third_party/ocmock:ocmock",
   ]
 }
-
-bundle_data_ib_file("download_manager_controller_xib") {
-  source = "resources/DownloadManagerController.xib"
-}
-
-imageset("error_icon") {
-  sources = [
-    "resources/download_manager_assets.xcassets/error_icon.imageset/Contents.json",
-    "resources/download_manager_assets.xcassets/error_icon.imageset/error_icon.png",
-    "resources/download_manager_assets.xcassets/error_icon.imageset/error_icon@2x.png",
-    "resources/download_manager_assets.xcassets/error_icon.imageset/error_icon@3x.png",
-  ]
-}
-
-imageset("file_icon_body") {
-  sources = [
-    "resources/download_manager_assets.xcassets/file_icon_body.imageset/Contents.json",
-    "resources/download_manager_assets.xcassets/file_icon_body.imageset/file_icon_body.png",
-    "resources/download_manager_assets.xcassets/file_icon_body.imageset/file_icon_body@2x.png",
-    "resources/download_manager_assets.xcassets/file_icon_body.imageset/file_icon_body@3x.png",
-  ]
-}
-
-imageset("file_icon_fold") {
-  sources = [
-    "resources/download_manager_assets.xcassets/file_icon_fold.imageset/Contents.json",
-    "resources/download_manager_assets.xcassets/file_icon_fold.imageset/file_icon_fold.png",
-    "resources/download_manager_assets.xcassets/file_icon_fold.imageset/file_icon_fold@2x.png",
-    "resources/download_manager_assets.xcassets/file_icon_fold.imageset/file_icon_fold@3x.png",
-  ]
-}
-
-imageset("file_icon_fold_complete") {
-  sources = [
-    "resources/download_manager_assets.xcassets/file_icon_fold_complete.imageset/Contents.json",
-    "resources/download_manager_assets.xcassets/file_icon_fold_complete.imageset/file_icon_fold_complete.png",
-    "resources/download_manager_assets.xcassets/file_icon_fold_complete.imageset/file_icon_fold_complete@2x.png",
-    "resources/download_manager_assets.xcassets/file_icon_fold_complete.imageset/file_icon_fold_complete@3x.png",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/downloads/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/downloads/resources/BUILD.gn
new file mode 100644
index 00000000000..4ff56bf795c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/downloads/resources/BUILD.gn
@@ -0,0 +1,46 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+import("//build/config/ios/rules.gni")
+
+bundle_data_ib_file("download_manager_controller_xib") {
+  source = "DownloadManagerController.xib"
+}
+
+imageset("error_icon") {
+  sources = [
+    "error_icon.imageset/Contents.json",
+    "error_icon.imageset/error_icon.png",
+    "error_icon.imageset/error_icon@2x.png",
+    "error_icon.imageset/error_icon@3x.png",
+  ]
+}
+
+imageset("file_icon_body") {
+  sources = [
+    "file_icon_body.imageset/Contents.json",
+    "file_icon_body.imageset/file_icon_body.png",
+    "file_icon_body.imageset/file_icon_body@2x.png",
+    "file_icon_body.imageset/file_icon_body@3x.png",
+  ]
+}
+
+imageset("file_icon_fold") {
+  sources = [
+    "file_icon_fold.imageset/Contents.json",
+    "file_icon_fold.imageset/file_icon_fold.png",
+    "file_icon_fold.imageset/file_icon_fold@2x.png",
+    "file_icon_fold.imageset/file_icon_fold@3x.png",
+  ]
+}
+
+imageset("file_icon_fold_complete") {
+  sources = [
+    "file_icon_fold_complete.imageset/Contents.json",
+    "file_icon_fold_complete.imageset/file_icon_fold_complete.png",
+    "file_icon_fold_complete.imageset/file_icon_fold_complete@2x.png",
+    "file_icon_fold_complete.imageset/file_icon_fold_complete@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/external_app/BUILD.gn b/chromium/ios/chrome/browser/ui/external_app/BUILD.gn
new file mode 100644
index 00000000000..9a6c36e129a
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/external_app/BUILD.gn
@@ -0,0 +1,40 @@
+# 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/rules.gni")
+
+source_set("external_app") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "open_mail_handler_view_controller.h",
+    "open_mail_handler_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/collection_view:collection_view",
+    "//ios/chrome/browser/web",
+    "//ui/base:base",
+    "//url:url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "open_mail_handler_view_controller_unittest.mm",
+  ]
+  deps = [
+    ":external_app",
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/collection_view:test_support",
+    "//ios/chrome/browser/ui/collection_view/cells:cells",
+    "//ios/chrome/browser/web",
+    "//ios/third_party/material_components_ios:material_components_ios",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/favicon/BUILD.gn b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn
index d31f2c23c00..68fdc0eb2cd 100644
--- a/chromium/ios/chrome/browser/ui/favicon/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn
@@ -27,7 +27,7 @@ source_set("favicon_ui") {
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/util:constraints_ui",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn
index 424a5683ff3..fc738bfea34 100644
--- a/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("find_prev_disabled_incognito") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index e80e8160094..d9770cfa739 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
-
 source_set("first_run") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -20,8 +18,8 @@ source_set("first_run") {
     "welcome_to_chrome_view_controller.mm",
   ]
   deps = [
-    ":checkbox",
-    ":checkbox_checked",
+    "resources:checkbox",
+    "resources:checkbox_checked",
     "//base",
     "//base:i18n",
     "//components/metrics",
@@ -110,25 +108,3 @@ source_set("eg_tests") {
   ]
   libs = [ "XCTest.framework" ]
 }
-
-imageset("checkbox") {
-  sources = [
-    "resources/FirstRun.xcassets/checkbox.imageset/Contents.json",
-    "resources/FirstRun.xcassets/checkbox.imageset/checkbox.png",
-    "resources/FirstRun.xcassets/checkbox.imageset/checkbox@2x.png",
-    "resources/FirstRun.xcassets/checkbox.imageset/checkbox@2x~ipad.png",
-    "resources/FirstRun.xcassets/checkbox.imageset/checkbox@3x.png",
-    "resources/FirstRun.xcassets/checkbox.imageset/checkbox~ipad.png",
-  ]
-}
-
-imageset("checkbox_checked") {
-  sources = [
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/Contents.json",
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/checkbox_checked.png",
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/checkbox_checked@2x.png",
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/checkbox_checked@2x~ipad.png",
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/checkbox_checked@3x.png",
-    "resources/FirstRun.xcassets/checkbox_checked.imageset/checkbox_checked~ipad.png",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn
new file mode 100644
index 00000000000..965ff8fd96c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("checkbox") {
+  sources = [
+    "checkbox.imageset/Contents.json",
+    "checkbox.imageset/checkbox.png",
+    "checkbox.imageset/checkbox@2x.png",
+    "checkbox.imageset/checkbox@2x~ipad.png",
+    "checkbox.imageset/checkbox@3x.png",
+    "checkbox.imageset/checkbox~ipad.png",
+  ]
+}
+
+imageset("checkbox_checked") {
+  sources = [
+    "checkbox_checked.imageset/Contents.json",
+    "checkbox_checked.imageset/checkbox_checked.png",
+    "checkbox_checked.imageset/checkbox_checked@2x.png",
+    "checkbox_checked.imageset/checkbox_checked@2x~ipad.png",
+    "checkbox_checked.imageset/checkbox_checked@3x.png",
+    "checkbox_checked.imageset/checkbox_checked~ipad.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 8a68a81c354..83decf6b4ab 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -15,8 +15,6 @@ source_set("history") {
     "history_collection_view_controller.mm",
     "history_entries_status_item.h",
     "history_entries_status_item.mm",
-    "history_entry.cc",
-    "history_entry.h",
     "history_entry_inserter.h",
     "history_entry_inserter.mm",
     "history_entry_item.h",
@@ -27,17 +25,10 @@ source_set("history") {
     "history_search_view.mm",
     "history_search_view_controller.h",
     "history_search_view_controller.mm",
-    "history_service_facade.h",
-    "history_service_facade.mm",
-    "history_service_facade_delegate.h",
     "history_util.h",
     "history_util.mm",
-    "tab_history_cell.h",
-    "tab_history_cell.mm",
-    "tab_history_popup_controller.h",
-    "tab_history_popup_controller.mm",
-    "tab_history_view_controller.h",
-    "tab_history_view_controller.mm",
+    "ios_browsing_history_driver.h",
+    "ios_browsing_history_driver.mm",
   ]
   deps = [
     "//base",
@@ -80,7 +71,6 @@ source_set("history") {
     "//net",
     "//skia",
     "//ui/base",
-    "//ui/gfx",
     "//url",
   ]
   libs = [
@@ -95,12 +85,11 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "favicon_view_provider_unittest.mm",
+    "history_collection_view_controller_unittest.mm",
     "history_entries_status_item_unittest.mm",
     "history_entry_inserter_unittest.mm",
     "history_entry_item_unittest.mm",
     "history_search_view_controller_unittest.mm",
-    "history_util_unittest.mm",
-    "tab_history_popup_controller_unittest.mm",
   ]
   deps = [
     ":history",
@@ -120,53 +109,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:test_support",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/collection_view",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/common",
-    "//ios/chrome/test:test_support",
-    "//ios/web",
-    "//ios/web/public/test",
-    "//skia",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//third_party/ocmock",
-    "//ui/base",
-    "//ui/gfx",
-    "//url",
-  ]
-
-  public_deps = [
-    ":unit_tests_arc",
-  ]
-  allow_circular_includes_from = [ ":unit_tests_arc" ]
-}
-
-source_set("unit_tests_arc") {
-  testonly = true
-  configs += [ "//build/config/compiler:enable_arc" ]
-
-  sources = [
-    "history_collection_view_controller_unittest.mm",
-    "history_service_facade_unittest.mm",
-  ]
-  deps = [
-    ":history",
-    ":resources_unit_tests",
-    "//base",
-    "//base/test:test_support",
-    "//components/favicon/core",
-    "//components/favicon_base",
-    "//components/history/core/browser",
-    "//components/keyed_service/core",
-    "//components/sessions",
-    "//components/strings",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/history",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync:sync",
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui",
@@ -206,7 +148,6 @@ source_set("eg_tests") {
   testonly = true
   sources = [
     "history_ui_egtest.mm",
-    "tab_history_popup_controller_egtest.mm",
   ]
   deps = [
     ":history",
@@ -218,6 +159,8 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui:ui",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn b/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn
new file mode 100644
index 00000000000..74ebde23687
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn
@@ -0,0 +1,79 @@
+# 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("history_popup") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_history_cell.h",
+    "tab_history_cell.mm",
+    "tab_history_popup_controller.h",
+    "tab_history_popup_controller.mm",
+    "tab_history_view_controller.h",
+    "tab_history_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/popup_menu",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ios/web",
+    "//ui/gfx",
+    "//url",
+  ]
+}
+
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tab_history_legacy_coordinator.h",
+    "tab_history_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":history_popup",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/history_popup/requirements",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "tab_history_popup_controller_unittest.mm",
+  ]
+  deps = [
+    ":history_popup",
+    "//components/sessions",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/util",
+    "//ios/web",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/gfx",
+  ]
+}
+
+source_set("eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "tab_history_popup_controller_egtest.mm",
+  ]
+  deps = [
+    ":history_popup",
+    "//base",
+    "//components/strings",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/http_server",
+  ]
+}
diff --git a/chromium/ios/shared/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/history_popup/requirements/BUILD.gn
index eb5a01d6c3a..f5dc3974fd6 100644
--- a/chromium/ios/shared/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history_popup/requirements/BUILD.gn
@@ -2,16 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("tools_menu") {
-  sources = [
-    "tools_menu_configuration.h",
-    "tools_menu_configuration.mm",
-  ]
-
+source_set("requirements") {
   configs += [ "//build/config/compiler:enable_arc" ]
-
-  deps = [
-    "//base",
-    "//ios/web:user_agent",
+  sources = [
+    "tab_history_constants.h",
+    "tab_history_constants.mm",
+    "tab_history_positioner.h",
+    "tab_history_presentation.h",
+    "tab_history_ui_updater.h",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index d5568ec2c31..a4f8eb0d9d6 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -57,6 +57,7 @@ source_set("eg_tests") {
     "//base",
     "//components/infobars/core",
     "//ios/chrome/app:app_internal",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
index 37afb860915..c060f758840 100644
--- a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("infobar_warning") {
   sources = [
diff --git a/chromium/ios/components/captive_portal/BUILD.gn b/chromium/ios/chrome/browser/ui/metrics/BUILD.gn
index a920cfa715d..ec8a781e879 100644
--- a/chromium/ios/components/captive_portal/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/metrics/BUILD.gn
@@ -2,13 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-component("captive_portal") {
-  deps = [
-    "//base",
-  ]
-
+source_set("metrics") {
   sources = [
-    "features.cc",
-    "features.h",
+    "metrics_recorder.h",
   ]
+
+  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 10dc6694243..960249d6af7 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -4,22 +4,24 @@
 
 source_set("ntp") {
   sources = [
+    "new_tab_page_header_constants.h",
+    "new_tab_page_header_constants.mm",
     "new_tab_page_panel_protocol.h",
   ]
+  configs += [ "//build/config/compiler:enable_arc" ]
 }
 
 source_set("ntp_header") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "google_landing_data_source.h",
-    "new_tab_page_header_constants.h",
-    "new_tab_page_header_constants.mm",
     "new_tab_page_header_view.h",
     "new_tab_page_header_view.mm",
     "new_tab_page_toolbar_controller.h",
     "new_tab_page_toolbar_controller.mm",
   ]
   deps = [
+    ":ntp",
     "//base",
     "//components/ntp_tiles",
     "//components/strings",
@@ -60,6 +62,7 @@ source_set("ntp_controller") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/public/provider/chrome/browser/voice",
@@ -94,6 +97,8 @@ source_set("ntp_internal") {
     "new_tab_page_view.mm",
     "notification_promo_whats_new.h",
     "notification_promo_whats_new.mm",
+    "ntp_tile_saver.h",
+    "ntp_tile_saver.mm",
     "whats_new_header_view.h",
     "whats_new_header_view.mm",
   ]
@@ -102,6 +107,7 @@ source_set("ntp_internal") {
   ]
   deps = [
     ":ntp",
+    ":ntp_tile",
     "resources:bookmarks_bar_bg",
     "resources:bookmarks_bar_bg_pressed",
     "resources:bookmarks_bar_breadcrumb",
@@ -173,11 +179,11 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
+    "//ios/chrome/common/app_group",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/public/provider/chrome/browser/voice",
-    "//ios/shared/chrome/browser/ui/commands",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
@@ -194,6 +200,14 @@ source_set("ntp_internal") {
   ]
 }
 
+source_set("ntp_tile") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "ntp_tile.h",
+    "ntp_tile.mm",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -204,15 +218,18 @@ source_set("unit_tests") {
     "new_tab_page_bar_unittest.mm",
     "new_tab_page_controller_unittest.mm",
     "notification_promo_whats_new_unittest.mm",
+    "ntp_tile_saver_unittest.mm",
   ]
   deps = [
     ":ntp",
     ":ntp_controller",
     ":ntp_internal",
+    ":ntp_tile",
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/test",
     "//components/metrics",
+    "//components/ntp_tiles",
     "//components/prefs:test_support",
     "//components/search_engines",
     "//components/sessions",
@@ -250,8 +267,10 @@ source_set("eg_tests") {
     ":ntp_internal",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks:features",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//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/ntp/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
index b16dc7c51c6..b0424109c00 100644
--- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
@@ -7,10 +7,12 @@ source_set("recent_tabs") {
   sources = [
     "recent_tabs_bridges.h",
     "recent_tabs_bridges.mm",
-    "recent_tabs_panel_controller.h",
-    "recent_tabs_panel_controller.mm",
-    "recent_tabs_panel_view_controller.h",
-    "recent_tabs_panel_view_controller.mm",
+    "recent_tabs_handset_coordinator.h",
+    "recent_tabs_handset_coordinator.mm",
+    "recent_tabs_handset_view_controller.h",
+    "recent_tabs_handset_view_controller.mm",
+    "recent_tabs_table_coordinator.h",
+    "recent_tabs_table_coordinator.mm",
     "recent_tabs_table_view_controller.h",
     "recent_tabs_table_view_controller.mm",
     "sessions_sync_user_state.h",
@@ -21,7 +23,6 @@ source_set("recent_tabs") {
     "//base",
     "//components/browser_sync",
     "//components/sessions",
-    "//components/signin/core/browser",
     "//components/sync",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
@@ -29,10 +30,9 @@ source_set("recent_tabs") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/authentication:authentication_arc",
+    "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/context_menu",
@@ -55,7 +55,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "recent_tabs_panel_controller_unittest.mm",
+    "recent_tabs_table_coordinator_unittest.mm",
   ]
   deps = [
     ":recent_tabs",
@@ -80,7 +80,7 @@ source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "recent_tabs_panel_controller_egtest.mm",
+    "recent_tabs_table_egtest.mm",
   ]
   deps = [
     "//components/strings",
diff --git a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
index 34e13c26b3e..abada302b84 100644
--- a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("ntp_mv_thumbnail_container") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index 8bb9c624fc9..43c0942c697 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -29,9 +29,12 @@ source_set("omnibox_internal") {
     "omnibox_popup_positioner.h",
     "omnibox_popup_view_ios.h",
     "omnibox_popup_view_ios.mm",
+    "omnibox_popup_view_suggestions_delegate.h",
     "omnibox_text_field_delegate.h",
     "omnibox_text_field_ios.h",
     "omnibox_text_field_ios.mm",
+    "omnibox_text_field_paste_delegate.h",
+    "omnibox_text_field_paste_delegate.mm",
     "omnibox_view_ios.h",
     "omnibox_view_ios.mm",
     "page_info_model.cc",
@@ -39,7 +42,6 @@ source_set("omnibox_internal") {
     "page_info_model_observer.h",
     "page_info_view_controller.h",
     "page_info_view_controller.mm",
-    "preload_provider.h",
     "truncating_attributed_label.h",
     "truncating_attributed_label.mm",
   ]
@@ -67,6 +69,8 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
     "//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",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn
index d5c76869e3c..bc3d303770c 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("omnibox_transparent_background") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 13b54b5cfd3..bd98076af88 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -22,6 +22,7 @@ source_set("overscroll_actions") {
     "//base",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
index 0f9e6b5001b..b2d491a6962 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("ptr_reload_active") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
index 011af52cb0b..b5dedf6bff5 100644
--- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
@@ -68,6 +68,7 @@ source_set("payments") {
     "//components/payments/core",
     "//components/signin/core/browser",
     "//components/strings",
+    "//components/url_formatter",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
@@ -137,8 +138,10 @@ source_set("payments_ui") {
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/payments/cells",
     "//ios/third_party/material_components_ios",
+    "//third_party/libaddressinput:strings_grit",
     "//ui/base",
   ]
   libs = [ "UIKit.framework" ]
@@ -149,6 +152,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "address_edit_coordinator_unittest.mm",
+    "address_edit_mediator_unittest.mm",
     "billing_address_selection_coordinator_unittest.mm",
     "billing_address_selection_mediator_unittest.mm",
     "contact_info_edit_coordinator_unittest.mm",
@@ -157,6 +161,7 @@ source_set("unit_tests") {
     "contact_info_selection_mediator_unittest.mm",
     "country_selection_coordinator_unittest.mm",
     "credit_card_edit_coordinator_unittest.mm",
+    "credit_card_edit_mediator_unittest.mm",
     "full_card_requester_unittest.mm",
     "payment_items_display_coordinator_unittest.mm",
     "payment_items_display_view_controller_unittest.mm",
@@ -221,7 +226,19 @@ source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "payments_accessibility_egtest.mm",
+    "payment_request_accessibility_egtest.mm",
+    "payment_request_can_make_payment_egtest.mm",
+    "payment_request_cancel_pay_abort_egtest.mm",
+    "payment_request_data_url_egtest.mm",
+    "payment_request_debit_egtest.mm",
+    "payment_request_egtest_base.h",
+    "payment_request_egtest_base.mm",
+    "payment_request_journey_logger_egtest.mm",
+    "payment_request_misc_egtest.mm",
+    "payment_request_payment_app_egtest.mm",
+    "payment_request_payment_method_identifier_egtest.mm",
+    "payment_request_payment_response_egtest.mm",
+    "payment_request_use_stats_egtest.mm",
   ]
 
   deps = [
@@ -229,18 +246,26 @@ source_set("eg_tests") {
     "//base",
     "//components/autofill/core/browser",
     "//components/autofill/core/browser:test_support",
+    "//components/image_fetcher/core",
     "//components/payments/core",
     "//components/strings",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/payments",
+    "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/payments/cells",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing:ios_test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/material_components_ios",
+    "//ios/web/public/test",
     "//ios/web/public/test/http_server",
+    "//testing/gtest",
+    "//third_party/libaddressinput:strings_grit",
+    "//ui/base",
+    "//url",
   ]
   libs = [
     "UIKit.framework",
diff --git a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn
index 46ab0e65a83..176a4dc4a73 100644
--- a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn
@@ -6,6 +6,8 @@ source_set("cells") {
   sources = [
     "accepted_payment_methods_item.h",
     "accepted_payment_methods_item.mm",
+    "accessibility_util.h",
+    "accessibility_util.mm",
     "autofill_profile_item.h",
     "autofill_profile_item.mm",
     "page_info_item.h",
@@ -39,6 +41,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "accepted_payment_methods_item_unittest.mm",
+    "accessibility_util_unittest.mm",
     "autofill_profile_item_unittest.mm",
     "page_info_item_unittest.mm",
     "payment_method_item_unittest.mm",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
index e7591410150..38ec1c10a99 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("popup_background") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index eac91450fb5..418a0d5c59a 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
-
 source_set("qr_scanner") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -19,14 +17,15 @@ source_set("qr_scanner") {
     "qr_scanner_view_controller.mm",
   ]
   deps = [
-    ":qr_scanner_torch_off",
-    ":qr_scanner_torch_on",
+    "resources:qr_scanner_torch_off",
+    "resources:qr_scanner_torch_on",
     "//base",
     "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/qr_scanner/requirements",
     "//ios/chrome/common:ios_app_bundle_id_prefix_header",
     "//ios/third_party/material_components_ios",
     "//ui/base",
@@ -37,6 +36,22 @@ source_set("qr_scanner") {
   ]
 }
 
+source_set("coordinator") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "qr_scanner_legacy_coordinator.h",
+    "qr_scanner_legacy_coordinator.mm",
+  ]
+  deps = [
+    ":qr_scanner",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/qr_scanner/requirements",
+  ]
+}
+
 source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -52,6 +67,7 @@ source_set("eg_tests") {
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui",
     "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
@@ -71,21 +87,3 @@ source_set("eg_tests") {
     "UIKit.framework",
   ]
 }
-
-imageset("qr_scanner_torch_off") {
-  sources = [
-    "resources/QRScanner.xcassets/qr_scanner_torch_off.imageset/Contents.json",
-    "resources/QRScanner.xcassets/qr_scanner_torch_off.imageset/torch_off.png",
-    "resources/QRScanner.xcassets/qr_scanner_torch_off.imageset/torch_off@2x.png",
-    "resources/QRScanner.xcassets/qr_scanner_torch_off.imageset/torch_off@3x.png",
-  ]
-}
-
-imageset("qr_scanner_torch_on") {
-  sources = [
-    "resources/QRScanner.xcassets/qr_scanner_torch_on.imageset/Contents.json",
-    "resources/QRScanner.xcassets/qr_scanner_torch_on.imageset/torch_on.png",
-    "resources/QRScanner.xcassets/qr_scanner_torch_on.imageset/torch_on@2x.png",
-    "resources/QRScanner.xcassets/qr_scanner_torch_on.imageset/torch_on@3x.png",
-  ]
-}
diff --git a/chromium/ios/shared/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/requirements/BUILD.gn
index a4877b96a68..370741b6b6b 100644
--- a/chromium/ios/shared/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/requirements/BUILD.gn
@@ -2,14 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("test_support") {
-  testonly = true
+source_set("requirements") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "toolbar_test_util.h",
-    "toolbar_test_util.mm",
-  ]
-  deps = [
-    "//ios/web/public/test/fakes",
+    "qr_scanner_presenting.h",
+    "qr_scanner_result_loading.h",
   ]
-  configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/resources/BUILD.gn
new file mode 100644
index 00000000000..dfc56991155
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/resources/BUILD.gn
@@ -0,0 +1,23 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("qr_scanner_torch_off") {
+  sources = [
+    "qr_scanner_torch_off.imageset/Contents.json",
+    "qr_scanner_torch_off.imageset/torch_off.png",
+    "qr_scanner_torch_off.imageset/torch_off@2x.png",
+    "qr_scanner_torch_off.imageset/torch_off@3x.png",
+  ]
+}
+
+imageset("qr_scanner_torch_on") {
+  sources = [
+    "qr_scanner_torch_on.imageset/Contents.json",
+    "qr_scanner_torch_on.imageset/torch_on.png",
+    "qr_scanner_torch_on.imageset/torch_on@2x.png",
+    "qr_scanner_torch_on.imageset/torch_on@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/reader_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/reader_mode/BUILD.gn
deleted file mode 100644
index 5cd0fb44599..00000000000
--- a/chromium/ios/chrome/browser/ui/reader_mode/BUILD.gn
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("reader_mode") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "reader_mode_checker.h",
-    "reader_mode_checker.mm",
-    "reader_mode_controller.h",
-    "reader_mode_controller.mm",
-    "reader_mode_infobar_delegate.h",
-    "reader_mode_infobar_delegate.mm",
-    "reader_mode_view.h",
-    "reader_mode_view.mm",
-  ]
-  deps = [
-    "//base",
-    "//components/dom_distiller/core",
-    "//components/infobars/core",
-    "//components/resources",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/dom_distiller",
-    "//ios/chrome/browser/infobars",
-    "//ios/chrome/browser/ui/material_components",
-    "//ios/third_party/material_components_ios",
-    "//ios/web",
-    "//ui/base",
-    "//url",
-  ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index e39825e760b..7a929ee2fb2 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -24,7 +24,7 @@ source_set("reading_list") {
     ":reading_list_ui",
     "//base",
     "//components/favicon/core",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/reading_list/core",
     "//components/reading_list/ios",
     "//components/url_formatter",
@@ -32,8 +32,10 @@ source_set("reading_list") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/reading_list",
+    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/favicon",
@@ -120,13 +122,13 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/favicon/core",
     "//components/favicon/core/test:test_support",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/prefs",
     "//components/reading_list/core",
     "//components/url_formatter",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/favicon",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn
index b7b624372b6..67f28ec899f 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("reading_list_share_icon") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/resources/BUILD.gn
index 8a05c99d5e7..8e14b774cfd 100644
--- a/chromium/ios/chrome/browser/ui/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("custom_row_voice_pressed") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 3ead793c3b9..aeca277e594 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -92,7 +92,7 @@ source_set("settings") {
     "//components/browsing_data/core",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
-    "//components/feature_engagement_tracker",
+    "//components/feature_engagement",
     "//components/google/core/browser",
     "//components/handoff",
     "//components/history/core/browser",
@@ -123,7 +123,7 @@ source_set("settings") {
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/content_settings",
-    "//ios/chrome/browser/feature_engagement_tracker",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/physical_web",
@@ -135,7 +135,6 @@ source_set("settings") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/authentication:authentication_arc",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/autofill:autofill_ui",
@@ -153,6 +152,7 @@ source_set("settings") {
     "//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",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
@@ -160,7 +160,6 @@ source_set("settings") {
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/public/provider/chrome/browser/voice",
-    "//ios/shared/chrome/browser/ui/commands",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
@@ -288,12 +287,12 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/collection_view:test_support",
     "//ios/chrome/browser/ui/collection_view/cells",
-    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/sync",
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web:features",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/common",
     "//ios/chrome/test:test_support",
@@ -350,6 +349,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//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/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
index fd54ec3d454..3dd4220201b 100644
--- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("app_icon_placeholder") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index 233f2ea7670..1ea03427b92 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -30,6 +30,7 @@ source_set("side_swipe") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/web",
     "//ios/chrome/common",
     "//ios/web",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/resources/BUILD.gn
index 7295312dcae..fed179f9820 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("side_swipe_navigation_back") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
index 0d12d0a3e87..b4e6c9ceec1 100644
--- a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn
@@ -42,9 +42,11 @@ source_set("stack_view") {
     "resources:card_frame_shadow",
     "resources:stack_view_background_noise",
     "//base",
+    "//components/feature_engagement",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
@@ -55,9 +57,8 @@ source_set("stack_view") {
     "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/tools_menu",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/common",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//net",
diff --git a/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn
index f324f55dfbd..2505017de12 100644
--- a/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("border_frame_bottom") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/sync/BUILD.gn
index 5490f891921..de187ce54e3 100644
--- a/chromium/ios/chrome/browser/ui/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/sync/BUILD.gn
@@ -24,6 +24,7 @@ source_set("sync") {
     "//google_apis",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
@@ -51,6 +52,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//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/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
index 026f8eef975..a074ded2e5c 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
@@ -68,13 +68,15 @@ source_set("tab_switcher") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/authentication:authentication_arc",
+    "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -84,9 +86,9 @@ source_set("tab_switcher") {
     "//ios/chrome/browser/ui/sync",
     "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:ios_app_bundle_id_prefix_header",
     "//ios/public/provider/chrome/browser",
-    "//ios/shared/chrome/browser/ui/commands",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/third_party/material_text_accessibility_ios",
@@ -160,7 +162,6 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/commands",
     "//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/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
index e15b039085e..911c6a9648e 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("tabswitcher_full_history") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index 5f90849ffe4..dab654aa9e6 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -13,6 +13,7 @@ source_set("tabs") {
     "tab_strip_view.mm",
     "tab_view.h",
     "tab_view.mm",
+    "tab_view_delegate.h",
     "target_frame_cache.h",
     "target_frame_cache.mm",
   ]
@@ -38,7 +39,9 @@ source_set("tabs") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
index 5dac694c24d..02ed68d6d9e 100644
--- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("tabstrip_background_tab") {
   sources = [
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index 456e57eda5a..e4c5d5622ce 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -5,11 +5,6 @@
 source_set("toolbar") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "keyboard_accessory_view_delegate.h",
-    "keyboard_assist/toolbar_assistive_keyboard_views.h",
-    "keyboard_assist/toolbar_assistive_keyboard_views.mm",
-    "new_keyboard_accessory_view.h",
-    "new_keyboard_accessory_view.mm",
     "new_tab_button.h",
     "new_tab_button.mm",
     "toolbar_button_tints.h",
@@ -17,7 +12,6 @@ source_set("toolbar") {
     "toolbar_controller+protected.h",
     "toolbar_controller.h",
     "toolbar_controller.mm",
-    "toolbar_controller_private.h",
     "toolbar_model_delegate_ios.h",
     "toolbar_model_delegate_ios.mm",
     "toolbar_model_impl_ios.h",
@@ -38,8 +32,6 @@ source_set("toolbar") {
     "resources:collapse_pressed",
     "resources:collapse_pressed_incognito",
     "resources:incognito_marker_typing",
-    "resources:keyboard_accessory_qr_scanner",
-    "resources:keyboard_accessory_voice_search",
     "resources:toolbar_dark_newtab",
     "resources:toolbar_dark_newtab_active",
     "resources:toolbar_dark_newtab_incognito",
@@ -61,19 +53,25 @@ source_set("toolbar") {
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/activity_services/requirements",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fancy_ui",
     "//ios/chrome/browser/ui/history",
+    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/popup_menu",
-    "//ios/chrome/browser/ui/qr_scanner",
+    "//ios/chrome/browser/ui/qr_scanner/requirements",
+    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
     "//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/web_state_list",
@@ -82,7 +80,6 @@ source_set("toolbar") {
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/shared/chrome/browser/ui/omnibox",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
@@ -130,6 +127,7 @@ source_set("test_support") {
     "//components/toolbar",
     "//components/toolbar:test_support",
     "//ios/chrome/browser/tabs",
+    "//ios/web/public/test/fakes",
   ]
 }
 
@@ -153,10 +151,10 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
-    "//ios/shared/chrome/browser/ui/toolbar:test_support",
     "//ios/testing:ocmock_support",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
@@ -179,6 +177,7 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn
new file mode 100644
index 00000000000..441ec51bbc9
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn
@@ -0,0 +1,33 @@
+# 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("keyboard_assist") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "toolbar_assistive_keyboard_delegate.h",
+    "toolbar_assistive_keyboard_views.h",
+    "toolbar_assistive_keyboard_views.mm",
+    "toolbar_assistive_keyboard_views_utils.h",
+    "toolbar_assistive_keyboard_views_utils.mm",
+    "toolbar_input_assistant_items.h",
+    "toolbar_input_assistant_items.mm",
+    "toolbar_keyboard_accessory_view.h",
+    "toolbar_keyboard_accessory_view.mm",
+    "toolbar_ui_bar_button_item.h",
+    "toolbar_ui_bar_button_item.mm",
+  ]
+  deps = [
+    "resources:keyboard_accessory_qr_scanner",
+    "resources:keyboard_accessory_voice_search",
+    "//base",
+    "//base:i18n",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ui/base",
+    "//ui/gfx",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/resources/BUILD.gn
new file mode 100644
index 00000000000..a74856fcf53
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/resources/BUILD.gn
@@ -0,0 +1,23 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("keyboard_accessory_voice_search") {
+  sources = [
+    "keyboard_accessory_voice_search.imageset/Contents.json",
+    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search.png",
+    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search@2x.png",
+    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search@3x.png",
+  ]
+}
+
+imageset("keyboard_accessory_qr_scanner") {
+  sources = [
+    "keyboard_accessory_qr_scanner.imageset/Contents.json",
+    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner.png",
+    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner@2x.png",
+    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn
index 33479f4de21..f2791fe33f5 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("collapse_incognito") {
   sources = [
@@ -22,15 +22,6 @@ imageset("collapse_pressed_incognito") {
   ]
 }
 
-imageset("keyboard_accessory_voice_search") {
-  sources = [
-    "keyboard_accessory_voice_search.imageset/Contents.json",
-    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search.png",
-    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search@2x.png",
-    "keyboard_accessory_voice_search.imageset/keyboard_accessory_voice_search@3x.png",
-  ]
-}
-
 imageset("toolbar_dark_newtab") {
   sources = [
     "toolbar_dark_newtab.imageset/Contents.json",
@@ -85,15 +76,6 @@ imageset("incognito_marker_typing") {
   ]
 }
 
-imageset("keyboard_accessory_qr_scanner") {
-  sources = [
-    "keyboard_accessory_qr_scanner.imageset/Contents.json",
-    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner.png",
-    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner@2x.png",
-    "keyboard_accessory_qr_scanner.imageset/keyboard_accessory_qr_scanner@3x.png",
-  ]
-}
-
 imageset("collapse") {
   sources = [
     "collapse.imageset/Contents.json",
diff --git a/chromium/ios/shared/chrome/browser/ui/tab/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn
index 857b808e826..27571e6a8b0 100644
--- a/chromium/ios/shared/chrome/browser/ui/tab/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn
@@ -2,14 +2,18 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("test_support") {
+source_set("test") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
+
   sources = [
-    "tab_test_util.h",
-    "tab_test_util.mm",
+    "toolbar_test_navigation_manager.h",
+    "toolbar_test_navigation_manager.mm",
+    "toolbar_test_web_state.h",
+    "toolbar_test_web_state.mm",
   ]
+
   deps = [
     "//ios/web/public/test/fakes",
   ]
-  configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
index d920bb2f7ab..260b2e9b8e2 100644
--- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
@@ -23,8 +23,10 @@ source_set("tools_menu") {
     "tools_popup_controller.mm",
   ]
   deps = [
+    ":configuration",
     "//base",
     "//base:i18n",
+    "//components/feature_engagement",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -38,7 +40,6 @@ source_set("tools_menu") {
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/user_feedback",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web:user_agent",
@@ -50,10 +51,23 @@ source_set("tools_menu") {
   ]
 }
 
+source_set("configuration") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "tools_menu_configuration.h",
+    "tools_menu_configuration.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/web:user_agent",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "reading_list_menu_view_item_unittest.mm",
     "tools_menu_view_controller_unittest.mm",
     "tools_menu_view_item_unittest.mm",
   ]
@@ -62,7 +76,9 @@ source_set("unit_tests") {
     "//base",
     "//ios/chrome/browser:browser",
     "//ios/chrome/browser/ui/commands:commands",
-    "//ios/shared/chrome/browser/ui/tools_menu",
+    "//ios/chrome/browser/ui/reading_list:reading_list_ui",
+    "//ios/chrome/browser/ui/tools_menu",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/web:user_agent",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index 61d4e85b6a6..07b0b749e43 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -48,6 +48,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "CRUILabel+AttributeUtils_unittest.mm",
+    "constraints_ui_util_unittest.mm",
     "core_text_util_unittest.mm",
     "label_link_controller_unittest.mm",
     "label_observer_unittest.mm",
@@ -55,6 +56,7 @@ source_set("unit_tests") {
     "text_region_mapper_unittest.mm",
   ]
   deps = [
+    ":constraints_ui",
     ":util",
     "//base",
     "//ios/third_party/material_components_ios",
@@ -63,3 +65,14 @@ source_set("unit_tests") {
     "//url",
   ]
 }
+
+source_set("constraints_ui") {
+  sources = [
+    "constraints_ui_util.h",
+    "constraints_ui_util.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/upgrade/resources/BUILD.gn b/chromium/ios/chrome/browser/upgrade/resources/BUILD.gn
index 8cf608a9eaf..03a73b31a20 100644
--- a/chromium/ios/chrome/browser/upgrade/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/upgrade/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("infobar_update") {
   sources = [
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index ed357f0fbcb..fe92e021b06 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -9,6 +9,8 @@ source_set("web") {
   sources = [
     "dom_altering_lock.h",
     "dom_altering_lock.mm",
+    "legacy_mailto_url_rewriter.h",
+    "legacy_mailto_url_rewriter.mm",
     "mailto_handler.h",
     "mailto_handler.mm",
     "mailto_handler_gmail.h",
@@ -21,6 +23,10 @@ source_set("web") {
     "navigation_manager_util.mm",
     "network_activity_indicator_tab_helper.h",
     "network_activity_indicator_tab_helper.mm",
+    "nullable_mailto_url_rewriter.h",
+    "nullable_mailto_url_rewriter.mm",
+    "page_placeholder_tab_helper.h",
+    "page_placeholder_tab_helper.mm",
     "repost_form_tab_helper.h",
     "repost_form_tab_helper.mm",
     "sad_tab_tab_helper.h",
@@ -29,7 +35,8 @@ source_set("web") {
     "tab_id_tab_helper.mm",
   ]
   deps = [
-    ":sad_tab_tab_helper_delegate",
+    ":features",
+    ":tab_helper_delegates",
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
@@ -37,18 +44,27 @@ source_set("web") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/alert_coordinator:alert_coordinator",
     "//ios/chrome/browser/ui/commands:commands",
-    "//ios/chrome/browser/ui/sad_tab:sad_tab",
     "//ios/chrome/browser/ui/util:util",
     "//ios/web",
-    "//ios/web:web_arc",
     "//ui/base",
     "//url",
   ]
 }
 
-source_set("sad_tab_tab_helper_delegate") {
+source_set("features") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "features.h",
+    "features.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+source_set("tab_helper_delegates") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "page_placeholder_tab_helper_delegate.h",
     "sad_tab_tab_helper_delegate.h",
   ]
 }
@@ -57,30 +73,32 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "legacy_mailto_url_rewriter_unittest.mm",
     "mailto_handler_gmail_unittest.mm",
     "mailto_handler_system_mail_unittest.mm",
     "mailto_handler_unittest.mm",
-    "mailto_url_rewriter_unittest.mm",
     "navigation_manager_util_unittest.mm",
     "network_activity_indicator_tab_helper_unittest.mm",
+    "nullable_mailto_url_rewriter_unittest.mm",
+    "page_placeholder_tab_helper_unittest.mm",
     "repost_form_tab_helper_unittest.mm",
     "sad_tab_tab_helper_unittest.mm",
     "tab_id_tab_helper_unittest.mm",
   ]
   deps = [
-    ":sad_tab_tab_helper_delegate",
+    ":tab_helper_delegates",
     ":test_support",
     ":web",
     "//base:base",
     "//base/test:test_support",
     "//components/strings:components_strings_grit",
     "//ios/chrome/browser/ui:ui",
-    "//ios/chrome/browser/ui/sad_tab",
     "//ios/chrome/test:test_support",
-    "//ios/web:web_arc",
+    "//ios/web:web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
+    "//third_party/ocmock",
     "//ui/base:base",
     "//url:url",
   ]
@@ -94,6 +112,7 @@ js_compile_bundle("chrome_bundle") {
   ]
 
   deps = [
+    ":credential_manager",
     ":payment_request",
   ]
 }
@@ -104,6 +123,12 @@ js_compile_unchecked("payment_request") {
   ]
 }
 
+js_compile_checked("credential_manager") {
+  sources = [
+    "resources/credential_manager.js",
+  ]
+}
+
 source_set("web_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -127,6 +152,7 @@ source_set("web_internal") {
   ]
   deps = [
     ":chrome_bundle",
+    ":features",
     "//base",
     "//components/content_settings/core/browser",
     "//components/dom_distiller/core",
@@ -144,9 +170,12 @@ source_set("web_internal") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/external_app",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",
@@ -205,6 +234,7 @@ source_set("unit_tests_internal") {
     "//ios/chrome/browser/content_settings:content_settings",
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui",
     "//ios/web",
     "//ios/web/public/test",
@@ -257,6 +287,7 @@ source_set("eg_tests") {
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
     "//net",
+    "//net:test_support",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
index 3b8eb0e81ed..c8836439863 100644
--- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn
@@ -26,7 +26,6 @@ source_set("web_state_list") {
     "//base",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/web",
-    "//ui/base",
   ]
   libs = [ "Foundation.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -63,7 +62,6 @@ source_set("unit_tests") {
     "//ios/web/public/test/fakes",
     "//net",
     "//testing/gtest",
-    "//ui/base",
     "//url",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/content_widget_extension/BUILD.gn b/chromium/ios/chrome/content_widget_extension/BUILD.gn
index acfad800bd0..ee094430af7 100644
--- a/chromium/ios/chrome/content_widget_extension/BUILD.gn
+++ b/chromium/ios/chrome/content_widget_extension/BUILD.gn
@@ -44,10 +44,15 @@ source_set("content_widget") {
     "content_widget_view.mm",
     "content_widget_view_controller.h",
     "content_widget_view_controller.mm",
+    "most_visited_tile_view.h",
+    "most_visited_tile_view.mm",
   ]
 
   deps = [
     "//base",
+    "//ios/chrome/browser/ui/favicon:favicon_ui",
+    "//ios/chrome/browser/ui/ntp:ntp_tile",
+    "//ios/chrome/browser/ui/util:constraints_ui",
     "//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 ee32aebceae..71f05916b38 100644
--- a/chromium/ios/chrome/search_widget_extension/BUILD.gn
+++ b/chromium/ios/chrome/search_widget_extension/BUILD.gn
@@ -26,8 +26,8 @@ ios_appex_bundle("search_widget_extension") {
   deps = [
     ":search_widget",
     ":system_strings",
-    "resources:quick_action_camera_search",
     "resources:quick_action_incognito_search",
+    "resources:quick_action_scan_qr_code",
     "resources:quick_action_search",
     "resources:quick_action_voice_search",
   ]
@@ -35,7 +35,7 @@ ios_appex_bundle("search_widget_extension") {
   extra_substitutions = [
     "CHROME_CHANNEL_SCHEME=$url_channel_scheme",
     "CHROMIUM_SHORT_NAME=$chromium_short_name",
-    "WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.SearchTodayExtension",
+    "WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.TodayExtension",
   ]
 
   entitlements_target = ":entitlements"
@@ -59,6 +59,7 @@ source_set("search_widget") {
   deps = [
     "//base",
     "//components/open_from_clipboard:open_from_clipboard_impl",
+    "//ios/chrome/browser/ui/util:constraints_ui",
     "//ios/chrome/common/app_group",
   ]
 
diff --git a/chromium/ios/chrome/search_widget_extension/resources/BUILD.gn b/chromium/ios/chrome/search_widget_extension/resources/BUILD.gn
index 124ab76fffa..15e71c2dffb 100644
--- a/chromium/ios/chrome/search_widget_extension/resources/BUILD.gn
+++ b/chromium/ios/chrome/search_widget_extension/resources/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 
 imageset("quick_action_search") {
   sources = [
@@ -31,11 +31,11 @@ imageset("quick_action_voice_search") {
   ]
 }
 
-imageset("quick_action_camera_search") {
+imageset("quick_action_scan_qr_code") {
   sources = [
-    "quick_action_camera_search.imageset/Contents.json",
-    "quick_action_camera_search.imageset/quick_action_camera_search.png",
-    "quick_action_camera_search.imageset/quick_action_camera_search@2x.png",
-    "quick_action_camera_search.imageset/quick_action_camera_search@3x.png",
+    "quick_action_scan_qr_code.imageset/Contents.json",
+    "quick_action_scan_qr_code.imageset/quick_action_scan_qr_code.png",
+    "quick_action_scan_qr_code.imageset/quick_action_scan_qr_code@2x.png",
+    "quick_action_scan_qr_code.imageset/quick_action_scan_qr_code@3x.png",
   ]
 }
diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 48a4bdbcc54..6131302d583 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -136,6 +136,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/content_suggestions:unit_tests",
     "//ios/chrome/browser/crash_report:unit_tests",
     "//ios/chrome/browser/device_sharing:unit_tests",
+    "//ios/chrome/browser/drag_and_drop:unit_tests",
     "//ios/chrome/browser/favicon:unit_tests",
     "//ios/chrome/browser/find_in_page:unit_tests",
     "//ios/chrome/browser/geolocation:unit_tests",
@@ -147,6 +148,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/omaha:unit_tests",
     "//ios/chrome/browser/passwords:unit_tests",
     "//ios/chrome/browser/payments:unit_tests",
+    "//ios/chrome/browser/prerender:unit_tests",
     "//ios/chrome/browser/reading_list:unit_tests",
     "//ios/chrome/browser/sessions:unit_tests",
     "//ios/chrome/browser/signin:unit_tests",
@@ -164,27 +166,35 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/autofill/cells:unit_tests",
     "//ios/chrome/browser/ui/bookmarks:unit_tests",
     "//ios/chrome/browser/ui/bookmarks/cells:unit_tests",
+    "//ios/chrome/browser/ui/broadcaster:unit_tests",
+    "//ios/chrome/browser/ui/browser_list:unit_tests",
     "//ios/chrome/browser/ui/bubble:unit_tests",
+    "//ios/chrome/browser/ui/captive_portal:unit_tests",
     "//ios/chrome/browser/ui/collection_view:unit_tests",
     "//ios/chrome/browser/ui/collection_view/cells:unit_tests",
+    "//ios/chrome/browser/ui/commands:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/cells:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/identifier:unit_tests",
     "//ios/chrome/browser/ui/context_menu:unit_tests",
     "//ios/chrome/browser/ui/contextual_search:unit_tests",
     "//ios/chrome/browser/ui/contextual_search/settings:unit_tests",
+    "//ios/chrome/browser/ui/coordinators:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests_internal",
     "//ios/chrome/browser/ui/downloads:unit_tests",
     "//ios/chrome/browser/ui/elements:unit_tests",
+    "//ios/chrome/browser/ui/external_app:unit_tests",
     "//ios/chrome/browser/ui/fancy_ui:unit_tests",
     "//ios/chrome/browser/ui/first_run:unit_tests",
     "//ios/chrome/browser/ui/history:unit_tests",
+    "//ios/chrome/browser/ui/history_popup:unit_tests",
     "//ios/chrome/browser/ui/icons:unit_tests",
     "//ios/chrome/browser/ui/infobars:unit_tests",
     "//ios/chrome/browser/ui/keyboard:unit_tests",
     "//ios/chrome/browser/ui/main:unit_tests",
     "//ios/chrome/browser/ui/ntp:unit_tests",
+    "//ios/chrome/browser/ui/ntp/recent_tabs:unit_tests",
     "//ios/chrome/browser/ui/omnibox:unit_tests",
     "//ios/chrome/browser/ui/payments:unit_tests",
     "//ios/chrome/browser/ui/payments/cells:unit_tests",
@@ -211,9 +221,7 @@ test("ios_chrome_unittests") {
     "//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/broadcaster:unit_tests",
-    "//ios/shared/chrome/browser/ui/browser_list:unit_tests",
-    "//ios/shared/chrome/browser/ui/coordinators: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 5abfdb91bf1..bdd90add225 100644
--- a/chromium/ios/chrome/test/app/BUILD.gn
+++ b/chromium/ios/chrome/test/app/BUILD.gn
@@ -60,12 +60,14 @@ source_set("test_support") {
     "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index ffb3f1cb5c3..19aabb06c7a 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -55,16 +55,17 @@ 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/content_suggestions:eg_tests",
     "//ios/chrome/browser/ui:eg_tests",
     "//ios/chrome/browser/ui/activity_services:eg_tests",
     "//ios/chrome/browser/ui/alert_coordinator:eg_tests",
     "//ios/chrome/browser/ui/authentication:eg_tests",
     "//ios/chrome/browser/ui/bookmarks:eg_tests",
+    "//ios/chrome/browser/ui/content_suggestions:eg_tests",
     "//ios/chrome/browser/ui/dialogs:eg_tests",
     "//ios/chrome/browser/ui/find_bar:eg_tests",
     "//ios/chrome/browser/ui/first_run:eg_tests",
     "//ios/chrome/browser/ui/history:eg_tests",
+    "//ios/chrome/browser/ui/history_popup:eg_tests",
     "//ios/chrome/browser/ui/infobars:eg_tests",
     "//ios/chrome/browser/ui/ntp:eg_tests",
     "//ios/chrome/browser/ui/ntp/recent_tabs:eg_tests",
@@ -178,12 +179,16 @@ source_set("test_support") {
   deps = [
     "//base",
     "//base/test:test_support",
+    "//components/signin/core/common",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication:authentication",
+    "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands:commands",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/payments:payments_ui",
     "//ios/chrome/browser/ui/settings:settings",
     "//ios/chrome/browser/ui/static_content",
     "//ios/chrome/browser/ui/toolbar",
@@ -205,6 +210,7 @@ source_set("test_support") {
     "//build/config/ios:xctest",
     "//ios/third_party/earl_grey",
     "//ios/web/public/test/fakes",
+    "//net:test_support",
   ]
 
   libs = [
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 7623cb51f52..ee51dfdf93c 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
@@ -125,7 +125,10 @@ template("chrome_ios_eg_test") {
     if (!defined(bundle_deps)) {
       bundle_deps = []
     }
-    bundle_deps += [ "//ios/chrome/app/resources" ]
+    bundle_deps += [
+      "//ios/chrome/app/resources",
+      ios_application_icons_target,
+    ]
 
     if (!defined(extra_substitutions)) {
       extra_substitutions = []
@@ -136,9 +139,10 @@ template("chrome_ios_eg_test") {
       "CHROMIUM_URL_SCHEME_1=$url_unsecure_scheme",
       "CHROMIUM_URL_SCHEME_2=$url_secure_scheme",
       "CHROMIUM_URL_SCHEME_3=$url_x_callback_scheme",
-      "CHROMIUM_URL_SCHEME_4=$url_channel_scheme",
+      "CHROMIUM_URL_CHANNEL_SCHEME=$url_channel_scheme",
       "EG_MAIN_APPLICATION_DELEGATE=$_eg_main_application_delegate",
       "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
+      "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
     ]
     if (ios_automatically_manage_certs) {
       # Use the same bundle identifier for EarlGrey tests as for unit tests
diff --git a/chromium/ios/chrome/today_extension/BUILD.gn b/chromium/ios/chrome/today_extension/BUILD.gn
deleted file mode 100644
index 886ed216562..00000000000
--- a/chromium/ios/chrome/today_extension/BUILD.gn
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ios/rules.gni")
-import("//build/config/locales.gni")
-import("//build/config/mac/base_rules.gni")
-import("//build/mac/tweak_info_plist.gni")
-import("//ios/build/chrome_build.gni")
-import("//ios/chrome/extension_repack.gni")
-import("//ios/public/provider/chrome/browser/build_config.gni")
-
-extension_repack_all_locales("packed_resources") {
-  extension = "today_extension"
-  input_locales = ios_packed_locales
-  output_locales = ios_packed_locales_as_mac_outputs
-  copy_data_to_bundle = true
-}
-
-tweak_info_plist("tweak_info_plist") {
-  info_plist = "Info.plist"
-}
-
-compile_plist("entitlements") {
-  format = "xml1"
-  substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
-  output_name = "$target_gen_dir/today_extension.appex.entitlements"
-  plist_templates =
-      [ "entitlements/external/today_extension.appex.entitlements" ]
-}
-
-ios_appex_bundle("today_extension") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "footer_label.h",
-    "footer_label.mm",
-    "interactive_label.h",
-    "interactive_label.mm",
-    "lock_screen_state.h",
-    "lock_screen_state.mm",
-    "notification_center_button.h",
-    "notification_center_button.mm",
-    "notification_center_url_button.h",
-    "notification_center_url_button.mm",
-    "physical_web_optin_footer.h",
-    "physical_web_optin_footer.mm",
-    "today_metrics_logger.h",
-    "today_metrics_logger.mm",
-    "today_view_controller.h",
-    "today_view_controller.mm",
-    "transparent_button.h",
-    "transparent_button.mm",
-    "ui_util.h",
-    "ui_util.mm",
-    "url_table_cell.h",
-    "url_table_cell.mm",
-  ]
-
-  deps = [
-    ":packed_resources",
-    "resources:todayview_clipboard",
-    "resources:todayview_new_tab",
-    "resources:todayview_physical_web",
-    "resources:todayview_voice_search",
-    "//base",
-    "//base:i18n",
-    "//components/metrics",
-    "//components/metrics:net",
-    "//components/open_from_clipboard",
-    "//components/prefs",
-    "//components/variations",
-    "//components/version_info",
-    "//ios/chrome/common",
-    "//ios/chrome/common/app_group",
-    "//ios/chrome/common/app_group:client",
-    "//ios/chrome/common/physical_web",
-    "//ios/chrome/today_extension/strings",
-    "//ios/third_party/material_components_ios",
-    "//net",
-    "//ui/base",
-    "//url",
-  ]
-  bundle_deps_filter = [ "//third_party/icu:icudata" ]
-
-  libs = [
-    "CoreGraphics.framework",
-    "QuartzCore.framework",
-    "Foundation.framework",
-    "NotificationCenter.framework",
-    "UIKit.framework",
-    "MobileCoreServices.framework",
-  ]
-
-  extra_substitutions = [
-    "CHROME_CHANNEL_SCHEME=$url_channel_scheme",
-    "TODAY_EXTENSION_BUNDLE_ID=$chromium_bundle_id.TodayExtension",
-  ]
-
-  entitlements_target = ":entitlements"
-  info_plist_target = ":tweak_info_plist"
-}
diff --git a/chromium/ios/chrome/today_extension/resources/BUILD.gn b/chromium/ios/chrome/today_extension/resources/BUILD.gn
deleted file mode 100644
index 43c0b52d213..00000000000
--- a/chromium/ios/chrome/today_extension/resources/BUILD.gn
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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/imageset.gni")
-
-imageset("todayview_new_tab") {
-  sources = [
-    "todayview_new_tab.imageset/Contents.json",
-    "todayview_new_tab.imageset/todayview_new_tab.png",
-    "todayview_new_tab.imageset/todayview_new_tab@2x.png",
-    "todayview_new_tab.imageset/todayview_new_tab@3x.png",
-  ]
-}
-
-imageset("todayview_clipboard") {
-  sources = [
-    "todayview_clipboard.imageset/Contents.json",
-    "todayview_clipboard.imageset/todayview_clipboard.png",
-    "todayview_clipboard.imageset/todayview_clipboard@2x.png",
-    "todayview_clipboard.imageset/todayview_clipboard@3x.png",
-  ]
-}
-
-imageset("todayview_physical_web") {
-  sources = [
-    "todayview_physical_web.imageset/Contents.json",
-    "todayview_physical_web.imageset/todayview_physical_web.png",
-    "todayview_physical_web.imageset/todayview_physical_web@2x.png",
-    "todayview_physical_web.imageset/todayview_physical_web@3x.png",
-  ]
-}
-
-imageset("todayview_voice_search") {
-  sources = [
-    "todayview_voice_search.imageset/Contents.json",
-    "todayview_voice_search.imageset/todayview_voice_search.png",
-    "todayview_voice_search.imageset/todayview_voice_search@2x.png",
-    "todayview_voice_search.imageset/todayview_voice_search@3x.png",
-  ]
-}
diff --git a/chromium/ios/chrome/today_extension/strings/BUILD.gn b/chromium/ios/chrome/today_extension/strings/BUILD.gn
deleted file mode 100644
index 4269cc6f730..00000000000
--- a/chromium/ios/chrome/today_extension/strings/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/locales.gni")
-import("//tools/grit/grit_rule.gni")
-
-grit("strings") {
-  source = "ios_today_extension_strings.grd"
-  output_dir = "$root_gen_dir/ios/today_extension"
-  outputs = [
-    "grit/ios_today_extension_strings.h",
-  ]
-  foreach(locale, locales_with_fake_bidi) {
-    outputs += [ "ios_today_extension_strings_$locale.pak" ]
-  }
-}
diff --git a/chromium/ios/clean/chrome/app/BUILD.gn b/chromium/ios/clean/chrome/app/BUILD.gn
index e5d414ba038..ea8f853ec7f 100644
--- a/chromium/ios/clean/chrome/app/BUILD.gn
+++ b/chromium/ios/clean/chrome/app/BUILD.gn
@@ -22,7 +22,8 @@ tweak_info_plist("info_plist") {
   }
   args = [
     "--breakpad=$breakpad_enabled_as_int",
-    "--branding=$chromium_short_name",
+    "--breakpad_staging",
+    "--branding=CS$chromium_short_name",
   ]
 }
 
@@ -49,16 +50,20 @@ ios_app_bundle("chrome_clean_skeleton") {
     "//ios/chrome/app:tests_fake_hook",
   ]
 
-  bundle_deps = [ "//ios/chrome/app/resources" ]
+  bundle_deps = [
+    "//ios/chrome/app/resources",
+    ios_application_icons_target,
+  ]
 
   extra_substitutions = [
+    "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
     "CHROMIUM_BUNDLE_ID=$output_name",
     "CHROMIUM_HANDOFF_ID=$chromium_handoff_id",
     "CHROMIUM_SHORT_NAME=$output_name",
     "CHROMIUM_URL_SCHEME_1=$url_unsecure_scheme",
     "CHROMIUM_URL_SCHEME_2=$url_secure_scheme",
     "CHROMIUM_URL_SCHEME_3=$url_x_callback_scheme",
-    "CHROMIUM_URL_SCHEME_4=$url_channel_scheme",
+    "CHROMIUM_URL_CHANNEL_SCHEME=$url_channel_scheme",
     "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix",
     "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
   ]
@@ -97,14 +102,15 @@ source_set("application_state") {
     "application_phase.h",
     "application_state.h",
     "application_state.mm",
-    "application_step.h",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
     "//base",
-    "//ios/shared/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/clean/chrome/app/steps:step_runner",
+    "//ios/clean/chrome/app/steps:steps",
     "//ios/testing/perf:startup",
   ]
 }
@@ -119,7 +125,10 @@ source_set("app") {
 
   deps = [
     ":application_state",
-    "//ios/clean/chrome/app/steps",
+    "//base",
+    "//ios/clean/chrome/app/steps:step_runner",
+    "//ios/clean/chrome/app/steps:steps",
+    "//ios/clean/chrome/browser",
     "//ios/testing/perf:startup",
   ]
 }
diff --git a/chromium/ios/clean/chrome/app/steps/BUILD.gn b/chromium/ios/clean/chrome/app/steps/BUILD.gn
index f78ecdcc4bf..b056e816f7b 100644
--- a/chromium/ios/clean/chrome/app/steps/BUILD.gn
+++ b/chromium/ios/clean/chrome/app/steps/BUILD.gn
@@ -2,22 +2,53 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+source_set("step_runner") {
+  sources = [
+    "application_step.h",
+    "phased_step_runner.h",
+    "phased_step_runner.mm",
+    "step_context.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("steps") {
   sources = [
-    "launch_to_background.h",
-    "launch_to_background.mm",
-    "launch_to_basic.h",
-    "launch_to_basic.mm",
-    "launch_to_foreground.h",
-    "launch_to_foreground.mm",
-    "root_coordinator+application_step.h",
-    "root_coordinator+application_step.mm",
+    "breakpad_initializer.h",
+    "breakpad_initializer.mm",
+    "browser_state_setter.h",
+    "browser_state_setter.mm",
+    "bundle_and_defaults_configurator.h",
+    "bundle_and_defaults_configurator.mm",
+    "chrome_main.h",
+    "chrome_main.mm",
+    "foregrounder.h",
+    "foregrounder.mm",
+    "provider_initializer.h",
+    "provider_initializer.mm",
+    "root_coordinator_initializer.h",
+    "root_coordinator_initializer.mm",
+    "simple_application_step.h",
+    "simple_application_step.mm",
+    "step_collections.h",
+    "step_collections.mm",
+    "step_features.h",
+    "step_features.mm",
+    "ui_initializer.h",
+    "ui_initializer.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":step_runner",
     "//base",
+    "//breakpad:client",
     "//components/content_settings/core/browser",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/startup",
@@ -27,14 +58,13 @@ source_set("steps") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/content_settings",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
-    "//ios/clean/chrome/app:application_state",
     "//ios/clean/chrome/browser/ui/root",
     "//ios/net",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/web:web_arc",
+    "//ios/web:web",
   ]
 }
 
@@ -42,14 +72,16 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
-    "root_coordinator+application_step_unittest.mm",
+    "phased_step_runner_unittest.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":step_runner",
     ":steps",
     "//base",
+    "//ios/chrome/test/base",
     "//ios/clean/chrome/app:application_state",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
index dec4e7694b9..6fa9e645c65 100644
--- a/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/bookmarks/BUILD.gn
@@ -13,8 +13,8 @@ source_set("bookmarks") {
   deps = [
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/bookmarks",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
   ]
 }
 
diff --git a/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
index eda1a9b122b..dbca23bff36 100644
--- a/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/commands/BUILD.gn
@@ -5,8 +5,10 @@
 source_set("commands") {
   sources = [
     "context_menu_commands.h",
+    "dialog_commands.h",
     "find_in_page_search_commands.h",
     "find_in_page_visibility_commands.h",
+    "java_script_dialog_commands.h",
     "navigation_commands.h",
     "ntp_commands.h",
     "settings_commands.h",
@@ -17,7 +19,7 @@ source_set("commands") {
   ]
   deps = [
     "//base",
-    "//ios/web:web_arc",
+    "//ios/web:web",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/clean/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/context_menu/BUILD.gn
deleted file mode 100644
index 75ed85b0965..00000000000
--- a/chromium/ios/clean/chrome/browser/ui/context_menu/BUILD.gn
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("context_menu") {
-  sources = [
-    "context_menu_context_impl.h",
-    "context_menu_context_impl.mm",
-    "context_menu_mediator.h",
-    "context_menu_mediator.mm",
-    "web_context_menu_coordinator.h",
-    "web_context_menu_coordinator.mm",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-
-  deps = [
-    ":context_menu_ui",
-    "//ios/chrome/browser/web_state_list:web_state_list",
-    "//ios/clean/chrome/browser/ui/commands:commands",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/web",
-    "//ui/base",
-    "//url",
-  ]
-}
-
-source_set("context_menu_ui") {
-  sources = [
-    "context_menu_consumer.h",
-    "context_menu_context.h",
-    "context_menu_context.mm",
-    "context_menu_item.h",
-    "context_menu_item.mm",
-    "context_menu_view_controller.h",
-    "context_menu_view_controller.mm",
-  ]
-
-  deps = [
-    "//base:base",
-    "//ios/clean/chrome/browser/ui/commands:commands",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "context_menu_mediator_unittest.mm",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-
-  deps = [
-    ":context_menu",
-    ":context_menu_ui",
-    "//base",
-    "//base/test:test_support",
-    "//ios/chrome/test/base",
-    "//ios/web",
-    "//ios/web/public/test",
-    "//testing/gtest",
-  ]
-}
diff --git a/chromium/ios/clean/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/BUILD.gn
new file mode 100644
index 00000000000..f5f87d2cb8f
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/BUILD.gn
@@ -0,0 +1,83 @@
+# 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("dialog_coordinator_support") {
+  sources = [
+    "dialog_coordinator+subclassing.h",
+    "dialog_coordinator.h",
+    "dialog_coordinator.mm",
+    "dialog_mediator+subclassing.h",
+    "dialog_mediator.h",
+    "dialog_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":dialogs_ui",
+    "//base",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/overlays",
+  ]
+}
+
+source_set("dialogs_ui") {
+  sources = [
+    "dialog_button_configuration.h",
+    "dialog_button_configuration.mm",
+    "dialog_button_style.h",
+    "dialog_configuration_identifier.h",
+    "dialog_configuration_identifier.mm",
+    "dialog_consumer.h",
+    "dialog_text_field_configuration.h",
+    "dialog_text_field_configuration.mm",
+    "dialog_view_controller.h",
+    "dialog_view_controller.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "dialog_button_configuration_unittest.mm",
+    "dialog_configuration_identifier_unittest.mm",
+    "dialog_coordinator_unittest.mm",
+    "dialog_mediator_unittest.mm",
+    "dialog_text_field_configuration_unittest.mm",
+    "dialog_view_controller_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":dialog_coordinator_support",
+    ":dialogs_ui",
+    "//base",
+    "//base/test:test_support",
+    "//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/dialogs/test_helpers",
+    "//ios/clean/chrome/browser/ui/overlays/test_helpers",
+    "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
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
new file mode 100644
index 00000000000..1352061b091
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/context_menu/BUILD.gn
@@ -0,0 +1,63 @@
+# 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("context_menu") {
+  sources = [
+    "context_menu_dialog_coordinator.h",
+    "context_menu_dialog_coordinator.mm",
+    "context_menu_dialog_mediator.h",
+    "context_menu_dialog_mediator.mm",
+    "context_menu_dialog_request.h",
+    "context_menu_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/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 = [
+    "context_menu_dialog_mediator_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":context_menu",
+    "//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/dialogs/java_script_dialogs/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn
new file mode 100644
index 00000000000..9db8fa1a35c
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/java_script_dialogs/BUILD.gn
@@ -0,0 +1,65 @@
+# 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("java_script_dialogs") {
+  sources = [
+    "java_script_dialog_coordinator.h",
+    "java_script_dialog_coordinator.mm",
+    "java_script_dialog_mediator.h",
+    "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" ]
+
+  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 = [
+    "java_script_dialog_mediator_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":java_script_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/dialogs/test_helpers/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/dialogs/test_helpers/BUILD.gn
new file mode 100644
index 00000000000..54b992169bc
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/dialogs/test_helpers/BUILD.gn
@@ -0,0 +1,32 @@
+# 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("test_helpers") {
+  testonly = true
+  sources = [
+    "dialog_test_util.h",
+    "dialog_test_util.mm",
+    "test_dialog_mediator.h",
+    "test_dialog_mediator.mm",
+    "test_dialog_view_controller.h",
+    "test_dialog_view_controller.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/browser_state",
+    "//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:dialog_coordinator_support",
+    "//ios/clean/chrome/browser/ui/dialogs:dialogs_ui",
+    "//ios/web",
+    "//testing/gtest",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/find_in_page/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/find_in_page/BUILD.gn
index dccbfe0a097..8254a184781 100644
--- a/chromium/ios/clean/chrome/browser/ui/find_in_page/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/find_in_page/BUILD.gn
@@ -16,13 +16,13 @@ source_set("find_in_page") {
     ":find_in_page_ui",
     "//base",
     "//ios/chrome/browser/find_in_page",
+    "//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",
     "//ios/clean/chrome/browser/ui/actions",
     "//ios/clean/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
     "//ios/web",
   ]
 }
diff --git a/chromium/ios/clean/chrome/browser/ui/history_popup/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/history_popup/BUILD.gn
new file mode 100644
index 00000000000..376798346b6
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/history_popup/BUILD.gn
@@ -0,0 +1,40 @@
+# 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("history_popup") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "history_popup_coordinator.h",
+    "history_popup_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/history_popup",
+    "//ios/chrome/browser/ui/history_popup/requirements",
+    "//ios/web",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "history_popup_coordinator_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":history_popup",
+    "//ios/chrome/browser/ui/coordinators:test_support",
+    "//ios/chrome/browser/ui/history_popup",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
index 1f11d555d0d..ede76aab87b 100644
--- a/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/ntp/BUILD.gn
@@ -8,8 +8,10 @@ source_set("ntp") {
     "ntp_coordinator.mm",
     "ntp_home_coordinator.h",
     "ntp_home_coordinator.mm",
-    "ntp_home_mediator.h",
-    "ntp_home_mediator.mm",
+    "ntp_home_header_coordinator.h",
+    "ntp_home_header_coordinator.mm",
+    "ntp_home_header_mediator.h",
+    "ntp_home_header_mediator.mm",
     "ntp_mediator.h",
     "ntp_mediator.mm",
   ]
@@ -18,18 +20,36 @@ source_set("ntp") {
 
   deps = [
     ":ntp_ui",
+    "//components/ntp_snippets",
+    "//components/ntp_tiles",
+    "//components/reading_list/core",
+    "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_suggestions",
+    "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/ntp_snippets",
+    "//ios/chrome/browser/ntp_tiles",
+    "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/broadcaster",
+    "//ios/chrome/browser/ui/browser_list",
+    "//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/coordinators",
+    "//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/clean/chrome/browser/ui/bookmarks",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/recent_tabs",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/web:web_arc",
+    "//ios/web:web",
     "//ui/base:base",
     "//url:url",
   ]
@@ -38,6 +58,10 @@ 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",
     "ntp_view_controller.mm",
   ]
@@ -48,11 +72,19 @@ source_set("ntp_ui") {
     "//base",
     "//components/strings:components_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui:ui",
+    "//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/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
+    "//ios/chrome/browser/ui/ntp/resources:ntp_google_search_box",
+    "//ios/chrome/common",
     "//ios/clean/chrome/browser/ui",
     "//ios/clean/chrome/browser/ui/commands:commands",
+    "//ios/public/provider/chrome/browser/ui",
     "//ui/base:base",
   ]
 }
@@ -62,7 +94,9 @@ source_set("unit_tests") {
   sources = [
     "ntp_coordinator_unittest.mm",
     "ntp_home_coordinator_unittest.mm",
-    "ntp_home_mediator_unittest.mm",
+    "ntp_home_header_coordinator_unittest.mm",
+    "ntp_home_header_mediator_unittest.mm",
+    "ntp_home_header_view_controller_unittest.mm",
     "ntp_mediator_unittest.mm",
     "ntp_view_controller_unittest.mm",
   ]
diff --git a/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
index 44ddf1a9659..7b8474be6f8 100644
--- a/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/omnibox/BUILD.gn
@@ -14,12 +14,12 @@ source_set("omnibox") {
     "//base",
     "//components/toolbar",
     "//ios/chrome/browser/ssl",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
     "//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/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
     "//ios/shared/chrome/browser/ui/omnibox",
     "//ios/web",
   ]
diff --git a/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn
new file mode 100644
index 00000000000..972772fef9e
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/overlays/BUILD.gn
@@ -0,0 +1,93 @@
+# 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("overlays") {
+  sources = [
+    "overlay_coordinator.h",
+    "overlay_service.h",
+    "overlay_service_factory.h",
+    "overlay_service_observer.h",
+    "overlay_service_observer_bridge.h",
+    "overlay_service_observer_bridge.mm",
+  ]
+
+  deps = [
+    ":overlays_internal",
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser/ui/coordinators",
+  ]
+
+  allow_circular_includes_from = [ ":overlays_internal" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("overlays_internal") {
+  sources = [
+    "browser_overlay_queue.h",
+    "browser_overlay_queue.mm",
+    "overlay_coordinator+internal.h",
+    "overlay_coordinator.mm",
+    "overlay_queue.h",
+    "overlay_queue.mm",
+    "overlay_queue_manager.h",
+    "overlay_queue_manager.mm",
+    "overlay_queue_manager_observer.h",
+    "overlay_queue_observer.h",
+    "overlay_scheduler.h",
+    "overlay_scheduler.mm",
+    "overlay_scheduler_observer.h",
+    "overlay_service_factory.mm",
+    "overlay_service_impl.h",
+    "overlay_service_impl.mm",
+    "web_state_overlay_queue.h",
+    "web_state_overlay_queue.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser/browser_state",
+    "//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/web",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "overlay_queue_manager_unittest.mm",
+    "overlay_queue_unittest.mm",
+    "overlay_scheduler_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":overlays",
+    ":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/web_state_list",
+    "//ios/chrome/test/base",
+    "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/overlays/test_helpers",
+    "//ios/web",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
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
new file mode 100644
index 00000000000..a7bf81a3d9b
--- /dev/null
+++ b/chromium/ios/clean/chrome/browser/ui/overlays/test_helpers/BUILD.gn
@@ -0,0 +1,35 @@
+# 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("test_helpers") {
+  testonly = true
+  sources = [
+    "test_overlay_coordinator.h",
+    "test_overlay_coordinator.mm",
+    "test_overlay_parent_coordinator.h",
+    "test_overlay_parent_coordinator.mm",
+    "test_overlay_queue.h",
+    "test_overlay_queue.mm",
+    "test_overlay_queue_manager_observer.h",
+    "test_overlay_queue_manager_observer.mm",
+    "test_overlay_queue_observer.h",
+    "test_overlay_queue_observer.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/browser_state",
+    "//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/overlays",
+    "//ios/clean/chrome/browser/ui/overlays:overlays_internal",
+    "//ios/web",
+    "//testing/gtest",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
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 0ebc0e4f6e3..9b2148f7ed0 100644
--- a/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -12,9 +12,9 @@ source_set("recent_tabs") {
 
   deps = [
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
   ]
 }
 
diff --git a/chromium/ios/clean/chrome/browser/ui/root/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/root/BUILD.gn
index d499ecdf6a7..bcee8ea0afe 100644
--- a/chromium/ios/clean/chrome/browser/ui/root/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/root/BUILD.gn
@@ -9,12 +9,12 @@ source_set("root") {
   ]
   deps = [
     ":root_ui",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/clean/chrome/browser",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/tab_grid",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/clean/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/settings/BUILD.gn
index fae4fa04c98..c48862d7ce7 100644
--- a/chromium/ios/clean/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/settings/BUILD.gn
@@ -17,12 +17,12 @@ source_set("settings") {
   deps = [
     "//base:base",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/browser/ui/settings",
     "//ios/clean/chrome/browser/ui/actions",
     "//ios/clean/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
   ]
 }
 
@@ -37,9 +37,9 @@ source_set("unit_tests") {
   deps = [
     ":settings",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators:test_support",
     "//ios/chrome/browser/ui/settings",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
index 3e44ed17162..1a53096b54f 100644
--- a/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tab/BUILD.gn
@@ -16,6 +16,10 @@ source_set("tab") {
     ":tab_ui",
     "//base",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui/broadcaster",
+    "//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/actions",
     "//ios/clean/chrome/browser/ui/commands",
@@ -25,10 +29,6 @@ source_set("tab") {
     "//ios/clean/chrome/browser/ui/toolbar",
     "//ios/clean/chrome/browser/ui/transitions",
     "//ios/clean/chrome/browser/ui/web_contents",
-    "//ios/shared/chrome/browser/ui/broadcaster",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
     "//ios/web",
   ]
 }
@@ -39,7 +39,10 @@ source_set("tab_ui") {
     "tab_container_view_controller.mm",
   ]
   deps = [
+    "//base",
+    "//ios/chrome/browser/ui",
     "//ios/clean/chrome/browser/ui",
+    "//ios/clean/chrome/browser/ui/toolbar:toolbar_components_ui",
     "//ios/clean/chrome/browser/ui/transitions",
     "//ios/clean/chrome/browser/ui/transitions/animators",
     "//ios/clean/chrome/browser/ui/transitions/presenters",
@@ -61,12 +64,12 @@ source_set("unit_tests") {
     ":tab",
     ":tab_ui",
     "//base",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/shared/chrome/browser/ui/coordinators:test_support",
-    "//ios/shared/chrome/browser/ui/tab:test_support",
-    "//ios/shared/chrome/browser/ui/toolbar: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/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 6dce052de4b..84d895348cc 100644
--- a/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tab_grid/BUILD.gn
@@ -17,19 +17,20 @@ source_set("tab_grid") {
     "//base",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser",
     "//ios/clean/chrome/browser/ui/commands",
-    "//ios/clean/chrome/browser/ui/context_menu",
+    "//ios/clean/chrome/browser/ui/dialogs/context_menu",
+    "//ios/clean/chrome/browser/ui/overlays",
     "//ios/clean/chrome/browser/ui/settings",
     "//ios/clean/chrome/browser/ui/tab",
     "//ios/clean/chrome/browser/ui/tab_collection",
     "//ios/clean/chrome/browser/ui/tab_collection:tab_collection_ui",
     "//ios/clean/chrome/browser/ui/tools",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/web",
     "//net",
     "//ui/base",
diff --git a/chromium/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn
index e75f5f66eea..fd83b181402 100644
--- a/chromium/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn
@@ -10,12 +10,12 @@ source_set("tab_strip") {
   deps = [
     ":tab_strip_ui",
     "//ios/chrome/browser/browser_state",
+    "//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/tab_collection",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
     "//ios/web",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -29,11 +29,11 @@ source_set("tab_strip_ui") {
     "tab_strip_view_controller.mm",
   ]
   deps = [
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/clean/chrome/browser/ui/actions",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/tab_collection:tab_collection_ui",
-    "//ios/shared/chrome/browser/ui/commands",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
index 0addb86f2c2..fbb5a815a6a 100644
--- a/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/toolbar/BUILD.gn
@@ -16,15 +16,18 @@ source_set("toolbar") {
     ":toolbar_ui",
     "//base",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui/broadcaster",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/history_popup/requirements",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/browser/web_state_list",
     "//ios/clean/chrome/browser/ui/commands",
+    "//ios/clean/chrome/browser/ui/history_popup",
     "//ios/clean/chrome/browser/ui/omnibox",
     "//ios/clean/chrome/browser/ui/tools",
-    "//ios/shared/chrome/browser/ui/broadcaster",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/web",
   ]
 }
@@ -39,6 +42,8 @@ source_set("toolbar_ui") {
     ":toolbar_components_ui",
     "//base",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/tools",
     "//ios/clean/chrome/browser/ui/transitions/animators",
@@ -81,9 +86,9 @@ source_set("unit_tests") {
     ":toolbar_ui",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/shared/chrome/browser/ui/toolbar:test_support",
     "//ios/web",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
diff --git a/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn b/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
index 07e10439e0b..0394e3b71f4 100644
--- a/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/tools/BUILD.gn
@@ -16,11 +16,11 @@ source_set("tools") {
   deps = [
     ":tools_ui",
     "//base",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/coordinators",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/transitions",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/coordinators",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/web",
     "//ui/base",
   ]
@@ -49,6 +49,7 @@ source_set("tools_ui") {
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/tools_menu",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/clean/chrome/browser/ui/commands",
     "//ios/clean/chrome/browser/ui/toolbar:toolbar_components_ui",
     "//ios/clean/chrome/browser/ui/transitions",
@@ -71,9 +72,9 @@ source_set("unit_tests") {
     ":tools_ui",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/toolbar/test",
+    "//ios/chrome/browser/ui/tools_menu:configuration",
     "//ios/chrome/test/base",
-    "//ios/shared/chrome/browser/ui/toolbar:test_support",
-    "//ios/shared/chrome/browser/ui/tools_menu",
     "//ios/web",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
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 7cc6f98200d..4f8954f45cb 100644
--- a/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn
+++ b/chromium/ios/clean/chrome/browser/ui/web_contents/BUILD.gn
@@ -15,11 +15,13 @@ source_set("web_contents") {
   deps = [
     ":web_contents_ui",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/clean/chrome/browser/ui/commands",
-    "//ios/clean/chrome/browser/ui/context_menu",
-    "//ios/shared/chrome/browser/ui/browser_list",
-    "//ios/shared/chrome/browser/ui/commands",
-    "//ios/shared/chrome/browser/ui/coordinators",
+    "//ios/clean/chrome/browser/ui/dialogs/context_menu",
+    "//ios/clean/chrome/browser/ui/dialogs/java_script_dialogs",
+    "//ios/clean/chrome/browser/ui/overlays",
     "//ios/web",
     "//ui/base",
     "//url",
@@ -40,6 +42,7 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "web_contents_mediator_unittest.mm",
+    "web_coordinator_unittest.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -49,8 +52,8 @@ source_set("unit_tests") {
     ":web_contents_ui",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/browser/ui/coordinators",
     "//ios/chrome/test/base",
-    "//ios/shared/chrome/browser/ui/tab:test_support",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/clean/chrome/test/BUILD.gn b/chromium/ios/clean/chrome/test/BUILD.gn
index d48ff38e0e7..f188af66d79 100644
--- a/chromium/ios/clean/chrome/test/BUILD.gn
+++ b/chromium/ios/clean/chrome/test/BUILD.gn
@@ -16,16 +16,21 @@ group("all_tests") {
 test("ios_clean_chrome_unittests") {
   deps = [
     # Ensure that all unit tests are run, use fake hooks and pack resources.
+    "//ios/chrome/app:tests_fake_hook",
     "//ios/chrome/test:run_all_unittests",
     ios_packed_resources_target,
 
     # Add unit_tests target here.
     "//ios/clean/chrome/app/steps:unit_tests",
     "//ios/clean/chrome/browser/ui/bookmarks:unit_tests",
-    "//ios/clean/chrome/browser/ui/context_menu: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/java_script_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",
     "//ios/clean/chrome/browser/ui/omnibox:unit_tests",
+    "//ios/clean/chrome/browser/ui/overlays:unit_tests",
     "//ios/clean/chrome/browser/ui/recent_tabs:unit_tests",
     "//ios/clean/chrome/browser/ui/root:unit_tests",
     "//ios/clean/chrome/browser/ui/settings:unit_tests",
diff --git a/chromium/ios/clean/chrome/test/perf/BUILD.gn b/chromium/ios/clean/chrome/test/perf/BUILD.gn
index d984a55a397..ff5f81cebbe 100644
--- a/chromium/ios/clean/chrome/test/perf/BUILD.gn
+++ b/chromium/ios/clean/chrome/test/perf/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/ios/rules.gni")
 import("//build/config/mac/base_rules.gni")
 import("//build/mac/tweak_info_plist.gni")
 import("//ios/build/chrome_build.gni")
+import("//ios/public/provider/chrome/browser/build_config.gni")
 import("//ios/third_party/earl_grey/ios_eg_test.gni")
 
 tweak_info_plist("info_plist") {
@@ -47,23 +48,28 @@ ios_eg_test("ios_clean_skeleton_perf_egtests") {
   ]
 
   deps = [
+    "//ios/chrome/app:tests_fake_hook",
     "//ios/clean/chrome/app:main",
     "//ios/testing/perf:startup",
   ]
 
-  bundle_deps = [ "//ios/chrome/app/resources" ]
+  bundle_deps = [
+    "//ios/chrome/app/resources",
+    ios_application_icons_target,
+  ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   _eg_main_application_delegate = "MainApplicationDelegate"
 
   extra_substitutions = [
+    "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
     "CHROMIUM_HANDOFF_ID=$chromium_handoff_id",
     "CHROMIUM_SHORT_NAME=$target_name",
     "CHROMIUM_URL_SCHEME_1=$url_unsecure_scheme",
     "CHROMIUM_URL_SCHEME_2=$url_secure_scheme",
     "CHROMIUM_URL_SCHEME_3=$url_x_callback_scheme",
-    "CHROMIUM_URL_SCHEME_4=$url_channel_scheme",
+    "CHROMIUM_URL_CHANNEL_SCHEME=$url_channel_scheme",
     "EG_MAIN_APPLICATION_DELEGATE=$_eg_main_application_delegate",
     "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
   ]
diff --git a/chromium/ios/public/provider/chrome/browser/build_config.gni b/chromium/ios/public/provider/chrome/browser/build_config.gni
index aaf2ee99a28..321634db84b 100644
--- a/chromium/ios/public/provider/chrome/browser/build_config.gni
+++ b/chromium/ios/public/provider/chrome/browser/build_config.gni
@@ -3,6 +3,11 @@
 # found in the LICENSE file.
 
 declare_args() {
+  # List of variants of "//ios/chrome/app:chrome" to build. Each variant will
+  # have the same binary but can add deps to customizes their resources. The
+  # application bundles will be found in $root_out_dir/variants/$variant.name.
+  ios_chrome_app_variants = []
+
   # Label of the target providing application icons.  This target must be a
   # bundle_data target that copy Icon-*.png files in the application bundle.
   ios_application_icons_target = "//ios/chrome/app/resources:chromium_icons"
diff --git a/chromium/ios/shared/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/shared/chrome/browser/ui/commands/BUILD.gn
deleted file mode 100644
index d9124aee09d..00000000000
--- a/chromium/ios/shared/chrome/browser/ui/commands/BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("commands") {
-  sources = [
-    "command_dispatcher.h",
-    "command_dispatcher.mm",
-  ]
-  deps = [
-    "//base",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "command_dispatcher_unittest.mm",
-  ]
-  deps = [
-    ":commands",
-    "//base",
-    "//testing/gtest",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
diff --git a/chromium/ios/shared/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/shared/chrome/browser/ui/settings/BUILD.gn
index ac535bc7e1c..4d5db7a0016 100644
--- a/chromium/ios/shared/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/shared/chrome/browser/ui/settings/BUILD.gn
@@ -8,13 +8,4 @@ source_set("settings") {
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
-
-  deps = [
-    # "//base",
-    # "//ios/chrome/app:tests_fake_hook",
-    # "//ios/chrome/browser",
-    # "//ios/chrome/browser/browser_state",
-    # "//ios/chrome/browser/tabs:tabs_internal",
-    # "//ios/shared/chrome/browser/ui/browser_list",
-  ]
 }
diff --git a/chromium/ios/showcase/BUILD.gn b/chromium/ios/showcase/BUILD.gn
index e5d5bfe82a8..9497853fe48 100644
--- a/chromium/ios/showcase/BUILD.gn
+++ b/chromium/ios/showcase/BUILD.gn
@@ -26,6 +26,7 @@ ios_app_bundle("showcase") {
 group("features") {
   deps = [
     "//ios/clean/chrome/browser/ui/tools:tools_ui",
+    "//ios/showcase/bubble",
     "//ios/showcase/content_suggestions",
     "//ios/showcase/ntp",
     "//ios/showcase/payments",
@@ -56,6 +57,7 @@ ios_eg_test("ios_showcase_egtests") {
     "//ios/showcase/core:main",
 
     # Add all eg_tests targets below.
+    "//ios/showcase/bubble:eg_tests",
     "//ios/showcase/content_suggestions:eg_tests",
     "//ios/showcase/core:eg_tests",
     "//ios/showcase/payments:eg_tests",
diff --git a/chromium/ios/showcase/bubble/BUILD.gn b/chromium/ios/showcase/bubble/BUILD.gn
new file mode 100644
index 00000000000..26cde54f4ef
--- /dev/null
+++ b/chromium/ios/showcase/bubble/BUILD.gn
@@ -0,0 +1,31 @@
+# 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("bubble") {
+  sources = [
+    "sc_bubble_coordinator.h",
+    "sc_bubble_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/bubble",
+    "//ios/showcase/common",
+  ]
+  libs = [ "UIKit.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("eg_tests") {
+  testonly = true
+  sources = [
+    "sc_bubble_egtest.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/bubble",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/showcase/test",
+    "//ios/third_party/earl_grey",
+    "//ui/base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/showcase/content_suggestions/BUILD.gn b/chromium/ios/showcase/content_suggestions/BUILD.gn
index 1ff89d07212..ad5343247a6 100644
--- a/chromium/ios/showcase/content_suggestions/BUILD.gn
+++ b/chromium/ios/showcase/content_suggestions/BUILD.gn
@@ -38,6 +38,8 @@ source_set("eg_tests") {
     ":content_suggestions",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/content_suggestions",
+    "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/showcase/test",
     "//ios/third_party/earl_grey",
diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn
index bd211b6afad..ede85295cfd 100644
--- a/chromium/ios/third_party/earl_grey/BUILD.gn
+++ b/chromium/ios/third_party/earl_grey/BUILD.gn
@@ -221,6 +221,12 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Synchronization/GREYUIThreadExecutor.m",
     "src/EarlGrey/Synchronization/GREYUIWebViewIdlingResource.h",
     "src/EarlGrey/Synchronization/GREYUIWebViewIdlingResource.m",
+    "src/EarlGrey/Traversal/GREYTraversal.h",
+    "src/EarlGrey/Traversal/GREYTraversal.m",
+    "src/EarlGrey/Traversal/GREYTraversalBFS.h",
+    "src/EarlGrey/Traversal/GREYTraversalBFS.m",
+    "src/EarlGrey/Traversal/GREYTraversalDFS.h",
+    "src/EarlGrey/Traversal/GREYTraversalDFS.m",
   ]
   public_headers = [
     "src/EarlGrey/EarlGrey.h",
@@ -265,6 +271,7 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Synchronization/GREYSyncAPI.h",
     "src/EarlGrey/Synchronization/GREYCondition.h",
     "src/EarlGrey/Synchronization/GREYUIThreadExecutor.h",
+    "src/EarlGrey/Traversal/GREYTraversal.h",
   ]
   deps = [
     "//build/config/ios:xctest",
diff --git a/chromium/ios/third_party/gcdwebserver/BUILD.gn b/chromium/ios/third_party/gcdwebserver/BUILD.gn
deleted file mode 100644
index 9f2441c262d..00000000000
--- a/chromium/ios/third_party/gcdwebserver/BUILD.gn
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2015 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.
-
-config("config") {
-  visibility = [ ":gcdwebserver" ]
-  libs = [
-    "CFNetwork.framework",
-    "MobileCoreServices.framework",
-    "z",
-  ]
-
-  include_dirs = [
-    "src/GCDWebServer/Core",
-    "src/GCDWebServer/Requests",
-    "src/GCDWebServer/Responses",
-  ]
-}
-
-source_set("gcdwebserver") {
-  testonly = true
-
-  sources = [
-    "src/GCDWebServer/Core/GCDWebServer.h",
-    "src/GCDWebServer/Core/GCDWebServer.m",
-    "src/GCDWebServer/Core/GCDWebServerConnection.h",
-    "src/GCDWebServer/Core/GCDWebServerConnection.m",
-    "src/GCDWebServer/Core/GCDWebServerFunctions.h",
-    "src/GCDWebServer/Core/GCDWebServerFunctions.m",
-    "src/GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h",
-    "src/GCDWebServer/Core/GCDWebServerPrivate.h",
-    "src/GCDWebServer/Core/GCDWebServerRequest.h",
-    "src/GCDWebServer/Core/GCDWebServerRequest.m",
-    "src/GCDWebServer/Core/GCDWebServerResponse.h",
-    "src/GCDWebServer/Core/GCDWebServerResponse.m",
-    "src/GCDWebServer/Requests/GCDWebServerDataRequest.h",
-    "src/GCDWebServer/Requests/GCDWebServerDataRequest.m",
-    "src/GCDWebServer/Requests/GCDWebServerFileRequest.h",
-    "src/GCDWebServer/Requests/GCDWebServerFileRequest.m",
-    "src/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.h",
-    "src/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m",
-    "src/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h",
-    "src/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m",
-    "src/GCDWebServer/Responses/GCDWebServerDataResponse.h",
-    "src/GCDWebServer/Responses/GCDWebServerDataResponse.m",
-    "src/GCDWebServer/Responses/GCDWebServerErrorResponse.h",
-    "src/GCDWebServer/Responses/GCDWebServerErrorResponse.m",
-    "src/GCDWebServer/Responses/GCDWebServerFileResponse.h",
-    "src/GCDWebServer/Responses/GCDWebServerFileResponse.m",
-    "src/GCDWebServer/Responses/GCDWebServerStreamedResponse.h",
-    "src/GCDWebServer/Responses/GCDWebServerStreamedResponse.m",
-  ]
-
-  public_configs = [ ":config" ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn
index 410c0e5cb39..37035edc00f 100644
--- a/chromium/ios/third_party/material_components_ios/BUILD.gn
+++ b/chromium/ios/third_party/material_components_ios/BUILD.gn
@@ -25,6 +25,7 @@ config("config") {
     "src/components/ShadowElevations/src",
     "src/components/ShadowLayer/src",
     "src/components/Snackbar/src",
+    "src/components/Themes/src",
     "src/components/Typography/src",
   ]
 }
@@ -53,6 +54,20 @@ source_set("material_components_ios") {
     "src/components/AppBar/src/MDCAppBarContainerViewController.h",
     "src/components/AppBar/src/MDCAppBarContainerViewController.m",
     "src/components/AppBar/src/MaterialAppBar.h",
+    "src/components/BottomSheet/src/MDCBottomSheetController.h",
+    "src/components/BottomSheet/src/MDCBottomSheetController.m",
+    "src/components/BottomSheet/src/MDCBottomSheetPresentationController.h",
+    "src/components/BottomSheet/src/MDCBottomSheetPresentationController.m",
+    "src/components/BottomSheet/src/MDCBottomSheetTransitionController.h",
+    "src/components/BottomSheet/src/MDCBottomSheetTransitionController.m",
+    "src/components/BottomSheet/src/UIViewController+MaterialBottomSheet.h",
+    "src/components/BottomSheet/src/UIViewController+MaterialBottomSheet.m",
+    "src/components/BottomSheet/src/private/MDCDraggableView.h",
+    "src/components/BottomSheet/src/private/MDCDraggableView.m",
+    "src/components/BottomSheet/src/private/MDCSheetBehavior.h",
+    "src/components/BottomSheet/src/private/MDCSheetBehavior.m",
+    "src/components/BottomSheet/src/private/MDCSheetContainerView.h",
+    "src/components/BottomSheet/src/private/MDCSheetContainerView.m",
     "src/components/ButtonBar/src/MDCButtonBar.h",
     "src/components/ButtonBar/src/MDCButtonBar.m",
     "src/components/ButtonBar/src/MaterialButtonBar.h",
@@ -97,6 +112,8 @@ source_set("material_components_ios") {
     "src/components/Collections/src/private/MDCCollectionViewStyler.m",
     "src/components/Collections/src/private/MaterialCollectionsStrings.h",
     "src/components/Collections/src/private/MaterialCollectionsStrings_table.h",
+    "src/components/Dialogs/src/ColorThemer/MDCAlertColorThemer.h",
+    "src/components/Dialogs/src/ColorThemer/MDCAlertColorThemer.m",
     "src/components/Dialogs/src/MDCAlertController.h",
     "src/components/Dialogs/src/MDCAlertController.m",
     "src/components/Dialogs/src/MDCDialogPresentationController.h",
@@ -160,6 +177,8 @@ source_set("material_components_ios") {
     "src/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h",
     "src/components/Snackbar/src/private/MDCSnackbarOverlayView.h",
     "src/components/Snackbar/src/private/MDCSnackbarOverlayView.m",
+    "src/components/Themes/src/MDCColorScheme.h",
+    "src/components/Themes/src/MDCColorScheme.m",
     "src/components/Typography/src/MDCTypography.h",
     "src/components/Typography/src/MDCTypography.m",
     "src/components/Typography/src/MaterialTypography.h",
@@ -279,7 +298,7 @@ foreach(locale, _locales) {
       "src/components/Collections/src/MaterialCollections.bundle/Resources/$locale.lproj/MaterialCollections.strings",
     ]
     outputs = [
-      "{{bundle_root_dir}}/MaterialCollections.bundle/Resources/$locale.lproj/{{source_file_part}}",
+      "{{bundle_resources_dir}}/MaterialCollections.bundle/Resources/$locale.lproj/{{source_file_part}}",
     ]
   }
 
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index d84a0cebff4..d0e8f907913 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -16,7 +16,7 @@ group("all_tests") {
   ]
 }
 
-source_set("web_arc") {
+source_set("web") {
   public_deps = [
     ":service_names",
     "//net",
@@ -61,6 +61,10 @@ source_set("web_arc") {
     "interstitials/web_interstitial_impl.h",
     "interstitials/web_interstitial_impl.mm",
     "load_committed_details.cc",
+    "navigation/crw_navigation_item_holder.h",
+    "navigation/crw_navigation_item_holder.mm",
+    "navigation/crw_placeholder_navigation_info.h",
+    "navigation/crw_placeholder_navigation_info.mm",
     "navigation/crw_session_controller+private_constructors.h",
     "navigation/crw_session_controller.h",
     "navigation/crw_session_controller.mm",
@@ -79,6 +83,8 @@ source_set("web_arc") {
     "navigation/navigation_manager_util.mm",
     "navigation/nscoder_util.h",
     "navigation/nscoder_util.mm",
+    "navigation/placeholder_navigation_util.h",
+    "navigation/placeholder_navigation_util.mm",
     "navigation/serializable_user_data_manager_impl.h",
     "navigation/serializable_user_data_manager_impl.mm",
     "navigation/session_storage_builder.h",
@@ -237,6 +243,10 @@ source_set("web_arc") {
     "web_state/ui/crw_swipe_recognizer_provider.h",
     "web_state/ui/crw_touch_tracking_recognizer.h",
     "web_state/ui/crw_touch_tracking_recognizer.mm",
+    "web_state/ui/crw_web_controller.h",
+    "web_state/ui/crw_web_controller.mm",
+    "web_state/ui/crw_web_controller_container_view.h",
+    "web_state/ui/crw_web_controller_container_view.mm",
     "web_state/ui/crw_web_view_content_view.mm",
     "web_state/ui/crw_web_view_navigation_proxy.h",
     "web_state/ui/crw_web_view_proxy_impl.h",
@@ -254,6 +264,16 @@ source_set("web_arc") {
     "web_state/ui/wk_web_view_configuration_provider.mm",
     "web_state/web_controller_observer_bridge.h",
     "web_state/web_controller_observer_bridge.mm",
+    "web_state/web_state.mm",
+    "web_state/web_state_delegate.mm",
+    "web_state/web_state_delegate_bridge.mm",
+    "web_state/web_state_impl.h",
+    "web_state/web_state_impl.mm",
+    "web_state/web_state_observer.mm",
+    "web_state/web_state_observer_bridge.mm",
+    "web_state/web_state_policy_decider.mm",
+    "web_state/web_state_weak_ptr_factory.h",
+    "web_state/web_state_weak_ptr_factory.mm",
     "web_state/web_view_internal_creation_util.h",
     "web_state/web_view_internal_creation_util.mm",
     "web_state/wk_web_view_security_util.h",
@@ -297,57 +317,6 @@ mojom("service_names") {
   ]
 }
 
-source_set("web") {
-  deps = [
-    ":core",
-    ":js_resources",
-    ":reload_type",
-    ":resources",
-    ":user_agent",
-    "//base",
-    "//components/url_formatter",
-    "//ios/net",
-    "//ios/third_party/blink:html_tokenizer",
-    "//mojo/public/cpp/system",
-    "//mojo/public/js",
-    "//net",
-    "//services/service_manager/public/cpp",
-    "//ui/base",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/resources",
-    "//url",
-  ]
-
-  public_deps = [
-    ":web_arc",
-  ]
-
-  sources = [
-    "web_state/ui/crw_web_controller.h",
-    "web_state/ui/crw_web_controller.mm",
-    "web_state/ui/crw_web_controller_container_view.h",
-    "web_state/ui/crw_web_controller_container_view.mm",
-    "web_state/web_state.mm",
-    "web_state/web_state_delegate.mm",
-    "web_state/web_state_delegate_bridge.mm",
-    "web_state/web_state_impl.h",
-    "web_state/web_state_impl.mm",
-    "web_state/web_state_observer.mm",
-    "web_state/web_state_observer_bridge.mm",
-    "web_state/web_state_policy_decider.mm",
-    "web_state/web_state_weak_ptr_factory.h",
-    "web_state/web_state_weak_ptr_factory.mm",
-  ]
-
-  libs = [
-    "CoreGraphics.framework",
-    "WebKit.framework",
-  ]
-
-  allow_circular_includes_from = [ ":web_arc" ]
-}
-
 source_set("core") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
@@ -449,6 +418,7 @@ test("ios_web_unittests") {
     ":ios_web_web_state_ui_unittests",
     ":ios_web_web_state_unittests",
     ":ios_web_webui_unittests",
+    "//ios/testing:http_server_bundle_data",
   ]
 
   assert_no_deps = ios_assert_no_deps
@@ -523,7 +493,9 @@ source_set("ios_web_navigation_unittests") {
   ]
 
   sources = [
+    "navigation/crw_navigation_item_holder_unittest.mm",
     "navigation/crw_navigation_item_storage_unittest.mm",
+    "navigation/crw_placeholder_navigation_info_unittest.mm",
     "navigation/crw_session_controller_unittest.mm",
     "navigation/crw_session_storage_unittest.mm",
     "navigation/navigation_item_impl_unittest.mm",
@@ -532,7 +504,9 @@ source_set("ios_web_navigation_unittests") {
     "navigation/navigation_manager_impl_unittest.mm",
     "navigation/navigation_manager_util_unittest.mm",
     "navigation/nscoder_util_unittest.mm",
+    "navigation/placeholder_navigation_util_unittest.mm",
     "navigation/serializable_user_data_manager_impl_unittest.mm",
+    "navigation/wk_based_navigation_manager_impl_unittest.mm",
   ]
 }
 
@@ -555,6 +529,7 @@ source_set("ios_web_net_unittests") {
     "//ios/web/test:mojo_bindings",
     "//ios/web/test:test_constants",
     "//ios/web/test:test_support",
+    "//ios/web/test/fakes",
     "//net:test_support",
     "//services/service_manager/public/cpp",
     "//testing/gmock",
@@ -630,7 +605,6 @@ source_set("ios_web_web_state_unittests") {
   testonly = true
   deps = [
     ":core",
-    ":ios_web_web_state_unittests_arc",
     ":test_support",
     ":user_agent",
     ":web",
@@ -641,6 +615,7 @@ source_set("ios_web_web_state_unittests") {
     "//ios/net",
     "//ios/testing:ios_test_support",
     "//ios/testing:ocmock_support",
+    "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/test:mojo_bindings",
@@ -661,6 +636,8 @@ source_set("ios_web_web_state_unittests") {
     "web_state/error_translation_util_unittest.mm",
     "web_state/navigation_context_impl_unittest.mm",
     "web_state/page_display_state_unittest.mm",
+    "web_state/session_certificate_policy_cache_impl_unittest.mm",
+    "web_state/session_certificate_policy_cache_storage_builder_unittest.mm",
     "web_state/web_state_delegate_bridge_unittest.mm",
     "web_state/web_state_impl_unittest.mm",
     "web_state/web_state_observer_bridge_unittest.mm",
@@ -670,23 +647,6 @@ source_set("ios_web_web_state_unittests") {
   ]
 }
 
-source_set("ios_web_web_state_unittests_arc") {
-  testonly = true
-  sources = [
-    "web_state/session_certificate_policy_cache_impl_unittest.mm",
-    "web_state/session_certificate_policy_cache_storage_builder_unittest.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/testing:ios_test_support",
-    "//ios/web",
-    "//ios/web/public/test",
-    "//ios/web/public/test/fakes",
-    "//net:test_support",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("ios_web_web_state_js_unittests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/web/public/app/BUILD.gn b/chromium/ios/web/public/app/BUILD.gn
index 45fcc363a35..ea97a5051d7 100644
--- a/chromium/ios/web/public/app/BUILD.gn
+++ b/chromium/ios/web/public/app/BUILD.gn
@@ -20,13 +20,13 @@ source_set("app") {
     # TODO(crbug.com/728161): remove this dependency as it is not needed but
     # is there just to allow adding the target to allow_circular_includes_from
     # in order to fix a circular include issue.
-    "//ios/web:web_arc",
+    "//ios/web:web",
   ]
   allow_circular_includes_from = [
     "//ios/web/app",
 
     # TODO(crbug.com/728161): remove this exception.
-    "//ios/web:web_arc",
+    "//ios/web:web",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/web/public/global_state/BUILD.gn b/chromium/ios/web/public/global_state/BUILD.gn
index a81c95150aa..070a762abea 100644
--- a/chromium/ios/web/public/global_state/BUILD.gn
+++ b/chromium/ios/web/public/global_state/BUILD.gn
@@ -13,5 +13,6 @@ source_set("global_state") {
   sources = [
     "ios_global_state.h",
     "ios_global_state.mm",
+    "ios_global_state_configuration.h",
   ]
 }
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index f6e802e426f..5512303de47 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -10,9 +10,7 @@ source_set("test") {
     "//base",
     "//base/test:test_support",
     "//ios/testing:ios_test_support",
-    "//ios/third_party/gcdwebserver",
     "//ios/web:web",
-    "//ios/web:web_arc",
     "//ios/web/public/test/fakes",
     "//ios/web/public/test/http_server",
     "//ios/web/test:test_support",
diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn
index 642b01c016e..58ba28de083 100644
--- a/chromium/ios/web/public/test/fakes/BUILD.gn
+++ b/chromium/ios/web/public/test/fakes/BUILD.gn
@@ -21,6 +21,8 @@ source_set("fakes") {
     "crw_test_js_injection_receiver.mm",
     "crw_test_web_state_observer.h",
     "crw_test_web_state_observer.mm",
+    "fake_navigation_context.h",
+    "fake_navigation_context.mm",
     "test_browser_state.cc",
     "test_browser_state.h",
     "test_java_script_dialog_presenter.h",
diff --git a/chromium/ios/web/public/test/http_server/BUILD.gn b/chromium/ios/web/public/test/http_server/BUILD.gn
index ad681fcca95..6effcdc3f31 100644
--- a/chromium/ios/web/public/test/http_server/BUILD.gn
+++ b/chromium/ios/web/public/test/http_server/BUILD.gn
@@ -9,7 +9,6 @@ source_set("http_server") {
   deps = [
     "//base",
     "//base/test:test_support",
-    "//ios/third_party/gcdwebserver",
     "//net",
     "//net:test_support",
     "//url",
diff --git a/chromium/ios/web/shell/BUILD.gn b/chromium/ios/web/shell/BUILD.gn
index 0b1a99cb817..325d40894a3 100644
--- a/chromium/ios/web/shell/BUILD.gn
+++ b/chromium/ios/web/shell/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/ios/rules.gni")
 import("//ios/build/config.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
@@ -84,6 +85,12 @@ repack("packed_resources") {
   copy_data_to_bundle = true
 }
 
+mojom("shell_interfaces") {
+  sources = [
+    "web_usage_controller.mojom",
+  ]
+}
+
 source_set("shell") {
   sources = [
     "app_delegate.h",
@@ -108,6 +115,7 @@ source_set("shell") {
   deps = [
     ":packed_resources",
     ":shell_bundle_data",
+    ":shell_interfaces",
     "//base",
     "//ios/net",
     "//ios/web",
@@ -115,6 +123,7 @@ source_set("shell") {
     "//ios/web/public/app",
     "//net",
     "//net:extras",
+    "//services/service_manager/public/cpp",
     "//services/test/echo:lib",
     "//services/test/echo/public/interfaces",
     "//services/test/user_id:lib",
diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn
index 3a82cd917b7..e79ba5d1586 100644
--- a/chromium/ios/web/shell/test/BUILD.gn
+++ b/chromium/ios/web/shell/test/BUILD.gn
@@ -37,6 +37,7 @@ ios_eg_test("ios_web_shell_egtests") {
     "//ios/web/public/test/fakes",
     "//ios/web/public/test/http_server",
     "//ios/web/shell",
+    "//ios/web/shell:shell_interfaces",
     "//net",
     "//services/service_manager/public/cpp",
     "//services/test/echo/public/interfaces",
@@ -69,6 +70,7 @@ source_set("earl_grey_test_support") {
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
     "//ios/web/shell",
+    "//testing/gtest:gtest",
     "//url",
   ]
 
diff --git a/chromium/ios/web/shell/web_usage_controller.mojom b/chromium/ios/web/shell/web_usage_controller.mojom
new file mode 100644
index 00000000000..f1d3921a930
--- /dev/null
+++ b/chromium/ios/web/shell/web_usage_controller.mojom
@@ -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.
+
+module web.mojom;
+
+// Interface that is bound to a WebState instance. Used for testing purposes
+// only.
+interface WebUsageController {
+  // Enables/disables web usage in the WebState to which this instance is bound.
+  // Passes an empty results so that tests can wait on the function being
+  // executed.
+  SetWebUsageEnabled(bool enabled) => ();
+};
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index ae7e4677cde..536123ff36e 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -27,6 +27,7 @@ ios_web_view_public_headers = [
   "public/cwv_html_element.h",
   "public/cwv_navigation_action.h",
   "public/cwv_navigation_delegate.h",
+  "public/cwv_navigation_type.h",
   "public/cwv_preferences.h",
   "public/cwv_scroll_view.h",
   "public/cwv_scroll_view_delegate.h",
@@ -50,6 +51,8 @@ ios_web_view_sources = [
   "internal/cwv_html_element_internal.h",
   "internal/cwv_navigation_action.mm",
   "internal/cwv_navigation_action_internal.h",
+  "internal/cwv_navigation_type.mm",
+  "internal/cwv_navigation_type_internal.h",
   "internal/cwv_preferences.mm",
   "internal/cwv_preferences_internal.h",
   "internal/cwv_scroll_view.mm",
@@ -60,6 +63,7 @@ ios_web_view_sources = [
   "internal/cwv_web_view.mm",
   "internal/cwv_web_view_configuration.mm",
   "internal/cwv_web_view_configuration_internal.h",
+  "internal/ios_global_state_web_view_configuration.cc",
   "internal/pref_names.cc",
   "internal/pref_names.h",
   "internal/translate/cwv_translation_controller.mm",
@@ -121,6 +125,7 @@ ios_web_view_deps = [
   "//ios/web:reload_type",
   "//ios/web:user_agent",
   "//ios/web/public/app",
+  "//ios/web/public/global_state",
   "//net",
   "//net:extras",
   "//ui/base",
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2017-11-20 10:33:36 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2017-11-22 11:45:12 +0000
commit	be59a35641616a4cf23c4a13fa0632624b021c1b (patch)
tree	9da183258bdf9cc413f7562079d25ace6955467f /chromium/ios
parent	d702e4b6a64574e97fc7df8fe3238cde70242080 (diff)
download	qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz