BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2018-08-24 12:15:48 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2018-08-28 13:30:04 +0000
commit: b014812705fc80bff0a5c120dfcef88f349816dc (patch)
tree: 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/ios
parent: 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff)
download: qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz
91 files changed, 908 insertions, 192 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index cbd25062136..7b1fd78876d 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -143,6 +143,7 @@ source_set("app_internal") {
     "//components/password_manager/core/common",
     "//components/payments/core",
     "//components/prefs",
+    "//components/prefs/ios",
     "//components/proxy_config",
     "//components/signin/core/browser",
     "//components/suggestions",
@@ -180,7 +181,6 @@ source_set("app_internal") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/payments",
     "//ios/chrome/browser/payments:constants",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/share_extension",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index 60429dbd409..d7c7e3b1337 100644
--- a/chromium/ios/chrome/app/startup/BUILD.gn
+++ b/chromium/ios/chrome/app/startup/BUILD.gn
@@ -24,7 +24,7 @@ source_set("startup_basic") {
   deps = [
     "//base",
     "//components/crash/core/common",
-    "//components/task_scheduler_util/common",
+    "//components/task_scheduler_util",
     "//ios/chrome/browser:chrome_paths",
     "//ios/web/public/app",
     "//skia",
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index a7174a58007..564985e4bca 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -102,7 +102,6 @@ source_set("browser") {
     "//components/search_provider_logos",
     "//components/security_state/core",
     "//components/signin/core/browser",
-    "//components/ssl_config",
     "//components/strings",
     "//components/sync",
     "//components/translate/core/browser",
@@ -117,7 +116,7 @@ source_set("browser") {
     "//ios/chrome/browser/browsing_data:features",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/drag_and_drop",
-    "//ios/chrome/browser/itunes_links",
+    "//ios/chrome/browser/itunes_urls",
     "//ios/chrome/browser/mailto:features",
     "//ios/chrome/browser/payments:constants",
     "//ios/chrome/browser/ssl:features",
@@ -176,7 +175,6 @@ source_set("browser_impl") {
     "//components/net_log",
     "//components/network_time",
     "//components/open_from_clipboard",
-    "//components/physical_web/data_source",
     "//components/prefs",
     "//components/rappor",
     "//components/translate/core/browser",
@@ -189,13 +187,14 @@ source_set("browser_impl") {
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/component_updater",
     "//ios/chrome/browser/first_run",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/metrics",
+    "//ios/chrome/browser/metrics:expired_histograms_array",
     "//ios/chrome/browser/net",
     "//ios/chrome/browser/open_from_clipboard",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/prefs:browser_prefs",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/update_client",
     "//ios/chrome/browser/web_resource",
@@ -243,7 +242,6 @@ source_set("unit_tests") {
     "//components/prefs",
     "//components/prefs:test_support",
     "//components/proxy_config",
-    "//components/ssl_config",
     "//components/variations",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index de91492cd8c..91902a52784 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -92,6 +92,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/google",
     "//ios/chrome/browser/google:google_logo",
     "//ios/chrome/browser/history",
@@ -104,7 +105,6 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",
diff --git a/chromium/ios/chrome/browser/device_sharing/BUILD.gn b/chromium/ios/chrome/browser/device_sharing/BUILD.gn
index 3caa42834f0..0e6c6251b69 100644
--- a/chromium/ios/chrome/browser/device_sharing/BUILD.gn
+++ b/chromium/ios/chrome/browser/device_sharing/BUILD.gn
@@ -12,8 +12,8 @@ source_set("device_sharing") {
     "//base",
     "//components/handoff",
     "//components/prefs",
+    "//components/prefs/ios",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/prefs",
     "//net",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
index 0c65df909b0..a9a0f27cf85 100644
--- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
+++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
@@ -41,7 +41,11 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/tab_grid:egtest_support",
     "//ios/chrome/browser/ui/tab_switcher:egtest_support",
+    "//ios/chrome/browser/ui/tab_switcher:modes",
+    "//ios/chrome/browser/ui/tools_menu/public",
     "//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/services/gcm/BUILD.gn b/chromium/ios/chrome/browser/gcm/BUILD.gn
index bf3fab90326..bf3fab90326 100644
--- a/chromium/ios/chrome/browser/services/gcm/BUILD.gn
+++ b/chromium/ios/chrome/browser/gcm/BUILD.gn
diff --git a/chromium/ios/chrome/browser/gcm/instance_id/BUILD.gn b/chromium/ios/chrome/browser/gcm/instance_id/BUILD.gn
new file mode 100644
index 00000000000..218ad147967
--- /dev/null
+++ b/chromium/ios/chrome/browser/gcm/instance_id/BUILD.gn
@@ -0,0 +1,18 @@
+# Copyright 2018 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("instance_id") {
+  sources = [
+    "ios_chrome_instance_id_profile_service_factory.cc",
+    "ios_chrome_instance_id_profile_service_factory.h",
+  ]
+  deps = [
+    "//base",
+    "//components/gcm_driver",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser/browser_state:browser_state",
+    "//ios/chrome/browser/gcm",
+    "//ios/web",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn
index dccece93ab3..8a5e24003fa 100644
--- a/chromium/ios/chrome/browser/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/BUILD.gn
@@ -17,8 +17,10 @@ source_set("infobars") {
     "infobar_container_state_delegate.h",
     "infobar_container_view.h",
     "infobar_container_view.mm",
+    "infobar_controller+protected.h",
     "infobar_controller.h",
     "infobar_controller.mm",
+    "infobar_controller_delegate.h",
     "infobar_manager_impl.h",
     "infobar_manager_impl.mm",
     "infobar_utils.h",
diff --git a/chromium/ios/chrome/browser/invalidation/BUILD.gn b/chromium/ios/chrome/browser/invalidation/BUILD.gn
index 7b6b606ba36..34fb66975ec 100644
--- a/chromium/ios/chrome/browser/invalidation/BUILD.gn
+++ b/chromium/ios/chrome/browser/invalidation/BUILD.gn
@@ -17,7 +17,7 @@ source_set("invalidation") {
     "//components/prefs",
     "//components/signin/core/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/signin",
     "//ios/web",
     "//net",
diff --git a/chromium/ios/chrome/browser/itunes_links/BUILD.gn b/chromium/ios/chrome/browser/itunes_urls/BUILD.gn
index ad2ccf12775..1a7608b5248 100644
--- a/chromium/ios/chrome/browser/itunes_links/BUILD.gn
+++ b/chromium/ios/chrome/browser/itunes_urls/BUILD.gn
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("itunes_links") {
+source_set("itunes_urls") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "itunes_links_flag.h",
-    "itunes_links_flag.mm",
-    "itunes_links_handler_tab_helper.h",
-    "itunes_links_handler_tab_helper.mm",
+    "itunes_urls_flag.h",
+    "itunes_urls_flag.mm",
+    "itunes_urls_handler_tab_helper.h",
+    "itunes_urls_handler_tab_helper.mm",
   ]
   deps = [
     "//base",
@@ -22,10 +22,10 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "itunes_links_handler_tab_helper_unittest.mm",
+    "itunes_urls_handler_tab_helper_unittest.mm",
   ]
   deps = [
-    ":itunes_links",
+    ":itunes_urls",
     "//base",
     "//base/test:test_support",
     "//ios/chrome/browser/browser_state:test_support",
diff --git a/chromium/ios/chrome/browser/language/BUILD.gn b/chromium/ios/chrome/browser/language/BUILD.gn
index 5646c72ae0d..6233bf9731b 100644
--- a/chromium/ios/chrome/browser/language/BUILD.gn
+++ b/chromium/ios/chrome/browser/language/BUILD.gn
@@ -15,6 +15,7 @@ source_set("language") {
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/language/core/browser",
+    "//components/language/core/common",
     "//components/pref_registry",
     "//components/prefs",
     "//ios/chrome/browser",
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index bf6f7f24206..84be2dda7a4 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -176,6 +176,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/tab_switcher:egtest_support",
+    "//ios/chrome/browser/ui/tab_switcher:modes",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/legacy",
     "//ios/chrome/browser/ui/toolbar/public",
@@ -220,9 +221,16 @@ source_set("test_support") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/tab_grid:egtest_support",
+    "//ios/chrome/browser/ui/tab_switcher:egtest_support",
+    "//ios/chrome/browser/ui/tab_switcher:modes",
     "//ios/chrome/browser/ui/tools_menu/public",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing:ios_test_support",
@@ -230,3 +238,16 @@ source_set("test_support") {
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+import("//components/metrics/generate_expired_histograms_array.gni")
+
+generate_expired_histograms_array("expired_histograms_array") {
+  inputs = [
+    "//tools/metrics/histograms/histograms.xml",
+    "//tools/metrics/histograms/enums.xml",
+  ]
+  namespace = ""
+  header_filename = "ios_expired_histograms_array.h"
+  major_branch_date_filepath = "//chrome/MAJOR_BRANCH_DATE"
+  milestone_filepath = "//chrome/VERSION"
+}
diff --git a/chromium/ios/chrome/browser/net/BUILD.gn b/chromium/ios/chrome/browser/net/BUILD.gn
index f979ff73994..4049fc0cefa 100644
--- a/chromium/ios/chrome/browser/net/BUILD.gn
+++ b/chromium/ios/chrome/browser/net/BUILD.gn
@@ -66,6 +66,9 @@ source_set("unit_tests") {
     ":net",
     "//base",
     "//base/test:test_support",
+    "//ios/net",
+    "//ios/net:test_support",
+    "//ios/testing:ios_test_support",
     "//ios/web/public/test",
     "//net",
     "//net:test_support",
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index 1099b9040db..7aaac650b77 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -40,8 +40,6 @@ source_set("passwords") {
     "password_manager_internals_service_factory.h",
     "password_tab_helper.h",
     "password_tab_helper.mm",
-    "passwords_directory_util.h",
-    "passwords_directory_util.mm",
     "update_password_infobar_controller.h",
     "update_password_infobar_controller.mm",
   ]
@@ -122,7 +120,6 @@ source_set("unit_tests") {
     "js_credential_manager_unittest.mm",
     "password_controller_js_unittest.mm",
     "password_controller_unittest.mm",
-    "passwords_directory_util_unittest.mm",
     "test_helpers.cc",
     "test_helpers.h",
   ]
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index 9ad04fe23f7..a487c49cf17 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -9,13 +9,12 @@ source_set("prefs") {
     "ios_chrome_pref_model_associator_client.h",
     "ios_chrome_pref_service_factory.cc",
     "ios_chrome_pref_service_factory.h",
-    "pref_observer_bridge.h",
-    "pref_observer_bridge.mm",
   ]
   deps = [
     "//base",
     "//components/content_settings/core/browser",
     "//components/prefs",
+    "//components/prefs/ios",
     "//components/proxy_config",
     "//components/search_engines",
     "//components/sync_preferences",
@@ -50,7 +49,6 @@ source_set("browser_prefs") {
     "//components/rappor",
     "//components/search_engines",
     "//components/signin/core/browser",
-    "//components/ssl_config",
     "//components/strings",
     "//components/sync",
     "//components/translate/core/browser",
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index ddd67ea8951..4d7c66defde 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -19,13 +19,13 @@ source_set("prerender") {
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/prefs",
+    "//components/prefs/ios",
     "//components/signin/ios/browser",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/net",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn
index 845122d0e6c..30263114eb7 100644
--- a/chromium/ios/chrome/browser/snapshots/BUILD.gn
+++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn
@@ -37,6 +37,7 @@ source_set("snapshots") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/web/public",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index 71c46c0e0bd..4ed2cdf1873 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -49,12 +49,12 @@ source_set("sync") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/dom_distiller",
     "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/gcm",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/invalidation",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/services/gcm",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync/glue",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index ea6ce63a7d6..cca1c88f22d 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -7,7 +7,6 @@ source_set("tabs") {
     "legacy_tab_helper.h",
     "tab.h",
     "tab_dialog_delegate.h",
-    "tab_headers_delegate.h",
     "tab_helper_util.h",
     "tab_model.h",
     "tab_model_list.h",
@@ -98,7 +97,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/infobars",
-    "//ios/chrome/browser/itunes_links",
+    "//ios/chrome/browser/itunes_urls",
     "//ios/chrome/browser/language",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn
index 49ec6232695..5a2e59c8486 100644
--- a/chromium/ios/chrome/browser/ui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/BUILD.gn
@@ -99,7 +99,6 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "browser_container_view_unittest.mm",
     "browser_view_controller_helper_unittest.mm",
     "browser_view_controller_unittest.mm",
     "chrome_web_view_factory_unittest.mm",
@@ -150,6 +149,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
+    "//ios/net",
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test",
@@ -263,8 +263,6 @@ source_set("external_files") {
 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",
@@ -277,8 +275,6 @@ source_set("ui_internal") {
     "fade_truncated_label.mm",
     "key_commands_provider.h",
     "key_commands_provider.mm",
-    "new_foreground_tab_fullscreen_disabler.h",
-    "new_foreground_tab_fullscreen_disabler.mm",
     "open_in_controller.h",
     "open_in_controller.mm",
     "open_in_controller_testing.h",
@@ -346,12 +342,15 @@ source_set("ui_internal") {
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/translate",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services:coordinator",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/app_launcher",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/browser_container",
+    "//ios/chrome/browser/ui/browser_container:ui",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -488,26 +487,6 @@ bundle_data("resources_unit_tests") {
   ]
 }
 
-# These tests use external URLs and hit network.  They will fail if the network
-# is unavailable. Reference to crbug.com/694662.
-source_set("external_url_eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "external_url_error_page_egtest.mm",
-  ]
-  deps = [
-    "//components/strings",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/web:earl_grey_test_support",
-    "//ios/web/public/test",
-    "//ios/web/public/test/http_server",
-    "//ui/base",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -523,7 +502,9 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/tools_menu/public",
     "//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/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index 2ba9b4407b9..8c9528b2809 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -11,6 +11,8 @@ source_set("activity_services") {
     "activity_type_util.mm",
     "appex_constants.h",
     "appex_constants.mm",
+    "bookmark_activity.h",
+    "bookmark_activity.mm",
     "canonical_url_retriever.h",
     "canonical_url_retriever.mm",
     "chrome_activity_item_source.h",
@@ -28,12 +30,16 @@ source_set("activity_services") {
     "share_to_data_builder.mm",
   ]
   deps = [
+    "resources:activity_services_add_bookmark",
+    "resources:activity_services_edit_bookmark",
     "resources:activity_services_print",
-    "resources:activity_services_reading_list",
+    "resources:activity_services_read_later",
     "//base",
+    "//components/bookmarks/browser",
     "//components/ui_metrics",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/snapshots",
@@ -89,12 +95,17 @@ source_set("unit_tests") {
     ":activity_services",
     "//base",
     "//base/test:test_support",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/test",
     "//components/ui_metrics",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
     "//ios/testing:ios_test_support",
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 1475c664935..ef9b775e724 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
@@ -4,6 +4,24 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
+imageset("activity_services_add_bookmark") {
+  sources = [
+    "activity_services_add_bookmark.imageset/Contents.json",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-60@2x.png",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-60@3x.png",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-76@2x.png",
+  ]
+}
+
+imageset("activity_services_edit_bookmark") {
+  sources = [
+    "activity_services_edit_bookmark.imageset/Contents.json",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-60@2x.png",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-60@3x.png",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-76@2x.png",
+  ]
+}
+
 imageset("activity_services_print") {
   sources = [
     "activity_services_print.imageset/Contents.json",
@@ -14,11 +32,11 @@ imageset("activity_services_print") {
   ]
 }
 
-imageset("activity_services_reading_list") {
+imageset("activity_services_read_later") {
   sources = [
-    "activity_services_reading_list.imageset/Contents.json",
-    "activity_services_reading_list.imageset/activity_services_reading_list.png",
-    "activity_services_reading_list.imageset/activity_services_reading_list@2x.png",
-    "activity_services_reading_list.imageset/activity_services_reading_list@3x.png",
+    "activity_services_read_later.imageset/Contents.json",
+    "activity_services_read_later.imageset/activity_services_read_later-60@2x.png",
+    "activity_services_read_later.imageset/activity_services_read_later-60@3x.png",
+    "activity_services_read_later.imageset/activity_services_read_later-76@2x.png",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index f1d89bed5ee..f14f7c1172e 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -31,9 +31,9 @@ source_set("authentication") {
   ]
   deps = [
     ":authentication_ui",
-    "resources:identity_picker_view_arrow_down",
     "resources:signin_confirmation_more",
     "resources:signin_promo_close_gray",
+    "unified_consent",
     "//base",
     "//components/consent_auditor",
     "//components/google/core/browser",
@@ -44,10 +44,8 @@ source_set("authentication") {
     "//components/strings",
     "//google_apis",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/consent_auditor",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/signin",
@@ -65,7 +63,6 @@ source_set("authentication") {
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/third_party/material_components_ios",
-    "//ios/third_party/material_roboto_font_loader_ios",
     "//ui/base",
     "//ui/gfx",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
index b5c7d333a87..02a9899ea9b 100644
--- a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
@@ -4,14 +4,6 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
-imageset("identity_picker_view_arrow_down") {
-  sources = [
-    "identity_picker_view_arrow_down.imageset/Contents.json",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down.png",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@2x.png",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@3x.png",
-  ]
-}
 imageset("signin_confirmation_more") {
   sources = [
     "signin_confirmation_more.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
new file mode 100644
index 00000000000..a7ddafbd05c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+source_set("unified_consent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "unified_consent_coordinator.h",
+    "unified_consent_coordinator.mm",
+    "unified_consent_mediator.h",
+    "unified_consent_mediator.mm",
+  ]
+  deps = [
+    ":unified_consent_ui",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
+    "//ios/public/provider/chrome/browser/signin",
+  ]
+}
+
+source_set("unified_consent_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_picker_view.h",
+    "identity_picker_view.mm",
+    "unified_consent_view_controller.h",
+    "unified_consent_view_controller.mm",
+  ]
+  deps = [
+    "resources:identity_picker_view_arrow_down",
+    "//base",
+    "//components/google/core/browser",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
new file mode 100644
index 00000000000..1d314d84bea
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+source_set("identity_chooser") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_chooser_coordinator.h",
+    "identity_chooser_coordinator.mm",
+    "identity_chooser_mediator.h",
+    "identity_chooser_mediator.mm",
+  ]
+  deps = [
+    ":identity_chooser_ui",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/public/provider/chrome/browser/signin",
+  ]
+}
+
+source_set("identity_chooser_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_chooser_add_account_item.h",
+    "identity_chooser_add_account_item.mm",
+    "identity_chooser_cell.h",
+    "identity_chooser_cell.mm",
+    "identity_chooser_header_item.h",
+    "identity_chooser_header_item.mm",
+    "identity_chooser_item.h",
+    "identity_chooser_item.mm",
+    "identity_chooser_view_controller.h",
+    "identity_chooser_view_controller.mm",
+    "identity_chooser_view_controller_presentation_delegate.h",
+    "identity_chooser_view_controller_selection_delegate.h",
+    "identity_view.h",
+    "identity_view.mm",
+  ]
+  deps = [
+    "resources:identity_chooser_add_account",
+    "//base",
+    "//components/google/core/browser",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ui/base",
+  ]
+  public_deps = [
+    "//ios/chrome/browser/ui/table_view",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn
new file mode 100644
index 00000000000..89ae677d1d6
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 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("identity_chooser_add_account") {
+  sources = [
+    "identity_chooser_add_account.imageset/Contents.json",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account.png",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account@2x.png",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn
new file mode 100644
index 00000000000..c5475c10235
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 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("identity_picker_view_arrow_down") {
+  sources = [
+    "identity_picker_view_arrow_down.imageset/Contents.json",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down.png",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@2x.png",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index 2e8ba2ce44e..3ed0954cc8b 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -5,7 +5,6 @@
 source_set("autofill") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "autofill_save_card_infobar.mm",
     "autofill_ui_type_util.h",
     "autofill_ui_type_util.mm",
     "card_unmask_prompt_view_bridge.h",
@@ -57,13 +56,32 @@ source_set("autofill_ui") {
     "autofill_edit_accessory_view.h",
     "autofill_edit_accessory_view.mm",
     "autofill_ui_type.h",
+    "save_card_infobar_controller.h",
+    "save_card_infobar_controller.mm",
+    "save_card_infobar_view.h",
+    "save_card_infobar_view.mm",
+    "save_card_infobar_view_delegate.h",
   ]
   deps = [
     "//base",
+    "//base:i18n",
+    "//components/autofill/core/browser",
     "//components/strings:components_strings_grit",
+    "//ios/chrome/app/theme",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/infobars",
+    "//ios/chrome/browser/ui/infobars/resources:infobar_close",
+    "//ios/chrome/browser/ui/infobars/resources:infobar_shadow",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ios/third_party/material_roboto_font_loader_ios",
     "//ui/base:base",
+    "//url:url",
   ]
   libs = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 5835553c610..3236c0a440e 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -7,16 +7,17 @@ source_set("bookmarks") {
   sources = [
     "bookmark_edit_view_controller.h",
     "bookmark_edit_view_controller.mm",
-    "bookmark_elevated_toolbar.h",
-    "bookmark_elevated_toolbar.mm",
     "bookmark_empty_background.h",
     "bookmark_empty_background.mm",
     "bookmark_folder_editor_view_controller.h",
     "bookmark_folder_editor_view_controller.mm",
-    "bookmark_folder_table_view_cell.h",
-    "bookmark_folder_table_view_cell.mm",
     "bookmark_folder_view_controller.h",
     "bookmark_folder_view_controller.mm",
+    "bookmark_home_consumer.h",
+    "bookmark_home_mediator.h",
+    "bookmark_home_mediator.mm",
+    "bookmark_home_shared_state.h",
+    "bookmark_home_shared_state.mm",
     "bookmark_home_view_controller.h",
     "bookmark_home_view_controller.mm",
     "bookmark_home_waiting_view.h",
@@ -33,8 +34,8 @@ source_set("bookmarks") {
     "bookmark_path_cache.mm",
     "bookmark_promo_controller.h",
     "bookmark_promo_controller.mm",
-    "bookmark_table_view.h",
-    "bookmark_table_view.mm",
+    "bookmark_transitioning_delegate.h",
+    "bookmark_transitioning_delegate.mm",
     "bookmark_utils_ios.h",
     "bookmark_utils_ios.mm",
     "undo_manager_bridge_observer.h",
@@ -43,6 +44,7 @@ source_set("bookmarks") {
     "undo_manager_wrapper.mm",
   ]
   deps = [
+    ":bookmarks_ui",
     "resources:bookmark_bar_innershadow",
     "resources:bookmark_bar_shadow",
     "resources:bookmark_black_delete",
@@ -51,6 +53,7 @@ source_set("bookmarks") {
     "resources:bookmark_black_select",
     "resources:bookmark_blue_check",
     "resources:bookmark_blue_folder",
+    "resources:bookmark_blue_new_folder",
     "resources:bookmark_gray_back",
     "resources:bookmark_gray_check",
     "resources:bookmark_gray_close",
@@ -93,24 +96,24 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
-    "//ios/chrome/browser/ui/bookmarks/bars",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/collection_view",
-    "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/main:feature_flags",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/signin_interaction/public",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:presentation",
+    "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/undo",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
-    "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
     "//skia",
@@ -118,10 +121,7 @@ source_set("bookmarks") {
     "//ui/gfx",
     "//url",
   ]
-  allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/bookmarks/bars",
-    "//ios/chrome/browser/ui/bookmarks/cells",
-  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
   libs = [
     "CoreGraphics.framework",
     "QuartzCore.framework",
@@ -129,6 +129,15 @@ source_set("bookmarks") {
   ]
 }
 
+source_set("bookmarks_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_ui_constants.h",
+    "bookmark_ui_constants.mm",
+  ]
+  deps = []
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -161,6 +170,7 @@ source_set("eg_tests") {
     "bookmarks_egtest.mm",
   ]
   deps = [
+    ":bookmarks_ui",
     "//base",
     "//components/bookmarks/browser",
     "//components/prefs",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
deleted file mode 100644
index 1f78781479f..00000000000
--- a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
+++ /dev/null
@@ -1,20 +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("bars") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "bookmark_context_bar.h",
-    "bookmark_context_bar.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/colors",
-    "//ios/third_party/material_components_ios",
-    "//ui/base",
-  ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index 9fc312927e4..5e2d5892658 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -4,6 +4,12 @@
 
 source_set("cells") {
   sources = [
+    "bookmark_folder_item.h",
+    "bookmark_folder_item.mm",
+    "bookmark_home_node_item.h",
+    "bookmark_home_node_item.mm",
+    "bookmark_home_promo_item.h",
+    "bookmark_home_promo_item.mm",
     "bookmark_parent_folder_item.h",
     "bookmark_parent_folder_item.mm",
     "bookmark_table_cell.h",
@@ -18,11 +24,15 @@ source_set("cells") {
     "//base",
     "//components/bookmarks/browser:browser",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
-    "//ios/chrome/browser/ui/collection_view/cells",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
@@ -43,6 +53,7 @@ source_set("unit_tests") {
   deps = [
     ":cells",
     "//ios/chrome/browser/ui/collection_view/cells",
+    "//ios/chrome/browser/ui/table_view:styler",
     "//ios/third_party/material_components_ios",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
index 811b52b25e4..0e7fe2fde98 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
@@ -76,6 +76,15 @@ imageset("bookmark_blue_folder") {
   ]
 }
 
+imageset("bookmark_blue_new_folder") {
+  sources = [
+    "bookmark_blue_new_folder.imageset/Contents.json",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder.png",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder@2x.png",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder@3x.png",
+  ]
+}
+
 imageset("bookmark_gray_back") {
   sources = [
     "bookmark_gray_back.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
new file mode 100644
index 00000000000..ee2534b862d
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright 2018 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("browser_container") {
+  sources = [
+    "browser_container_coordinator.h",
+    "browser_container_coordinator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":ui",
+    "//base",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+  ]
+}
+
+source_set("ui") {
+  sources = [
+    "browser_container_view_controller.h",
+    "browser_container_view_controller.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/fullscreen:ui",
+    "//ios/chrome/browser/ui/util",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "browser_container_view_controller_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":ui",
+    "//base",
+    "//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 54e7a7b2fec..ead731b115d 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -131,6 +131,7 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons:buttons",
     "//ios/chrome/browser/ui/util:util",
+    "//ios/web/public",
     "//ui/base",
   ]
   public_deps = [
@@ -158,6 +159,7 @@ source_set("content_suggestions_ui_util") {
   deps = [
     ":content_suggestions_constant",
     "//base",
+    "//base:i18n",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
@@ -167,7 +169,6 @@ source_set("content_suggestions_ui_util") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/third_party/material_components_ios",
-    "//mojo/common:common_custom_types",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
index 03a44e332fc..f06e253edd7 100644
--- a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
@@ -55,6 +55,7 @@ source_set("contextual_search") {
     "//base",
     "//components/google/core/browser",
     "//components/prefs",
+    "//components/prefs/ios",
     "//components/search_engines",
     "//components/variations",
     "//components/variations/net",
@@ -62,7 +63,6 @@ source_set("contextual_search") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
index 79e5b7289cc..21f8b2f8af6 100644
--- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
@@ -55,6 +55,7 @@ source_set("eg_tests") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
index d15dcc65a80..73bad64b4f6 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -39,6 +39,7 @@ source_set("features") {
 
   deps = [
     "//base",
+    "//components/flags_ui",
   ]
 }
 
@@ -91,8 +92,11 @@ source_set("internal") {
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/common:timing",
     "//ios/web",
+    "//ui/gfx/geometry",
   ]
 }
 
@@ -100,12 +104,6 @@ source_set("ui") {
   sources = [
     "fullscreen_animator.h",
     "fullscreen_animator.mm",
-    "fullscreen_foreground_animator.h",
-    "fullscreen_foreground_animator.mm",
-    "fullscreen_scroll_end_animator.h",
-    "fullscreen_scroll_end_animator.mm",
-    "fullscreen_scroll_to_top_animator.h",
-    "fullscreen_scroll_to_top_animator.mm",
     "fullscreen_ui_element.h",
   ]
 
@@ -135,6 +133,8 @@ source_set("unit_tests") {
     ":fullscreen",
     ":internal",
     ":ui",
+    "//base/test:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/fullscreen/test",
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 9d3da6d5b75..127fdfc3a13 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -97,12 +97,13 @@ source_set("history_ui") {
     "history_entry_item.mm",
     "history_entry_item_delegate.h",
     "history_entry_item_interface.h",
-    "history_table_container_view_controller.h",
-    "history_table_container_view_controller.mm",
-    "history_table_updater_delegate.h",
+    "history_local_commands.h",
     "history_table_view_controller.h",
     "history_table_view_controller.mm",
-    "history_table_view_controller_delegate.h",
+    "history_transitioning_delegate.h",
+    "history_transitioning_delegate.mm",
+    "history_ui_constants.h",
+    "history_ui_constants.mm",
     "history_util.h",
     "history_util.mm",
   ]
@@ -113,18 +114,20 @@ source_set("history_ui") {
     "//components/history/core/browser",
     "//components/strings",
     "//components/url_formatter",
+    "//components/url_formatter",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/collection_view/cells",
-    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/util",
     "//ui/base",
   ]
 }
@@ -174,6 +177,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sync:sync",
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/util",
@@ -214,6 +218,7 @@ source_set("eg_tests") {
   ]
   deps = [
     ":history",
+    ":history_ui",
     "//base",
     "//components/browsing_data/core",
     "//components/prefs",
@@ -226,6 +231,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index 8d3618aa3e8..210a51c1734 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -5,9 +5,10 @@
 source_set("infobars") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "infobar_view.h",
-    "infobar_view.mm",
-    "infobar_view_delegate.h",
+    "confirm_infobar_view.h",
+    "confirm_infobar_view.mm",
+    "infobar_view_sizing.h",
+    "infobar_view_sizing_delegate.h",
   ]
   deps = [
     "resources:infobar_close",
@@ -18,6 +19,8 @@ source_set("infobars") {
     "//base",
     "//base:i18n",
     "//components/strings",
+    "//ios/chrome/app/theme:theme",
+    "//ios/chrome/app/theme:theme_grit",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/fancy_ui",
@@ -39,7 +42,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "infobar_view_unittest.mm",
+    "confirm_infobar_view_unittest.mm",
   ]
   deps = [
     ":infobars",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index c0abd89c842..4b2b31fdde3 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -5,11 +5,11 @@
 source_set("location_bar") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "extended_touch_target_button.h",
+    "extended_touch_target_button.mm",
     "location_bar_consumer.h",
     "location_bar_coordinator.h",
     "location_bar_coordinator.mm",
-    "location_bar_edit_view.h",
-    "location_bar_edit_view.mm",
     "location_bar_generic_coordinator.h",
     "location_bar_legacy_consumer.h",
     "location_bar_legacy_coordinator.h",
@@ -28,6 +28,8 @@ source_set("location_bar") {
   ]
   deps = [
     ":constants",
+    "resources:location_bar_share",
+    "resources:location_bar_voice",
     "//base",
     "//components/google/core/browser",
     "//components/google/core/browser",
@@ -35,6 +37,7 @@ source_set("location_bar") {
     "//components/search_engines",
     "//components/strings",
     "//components/toolbar",
+    "//components/variations/net",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
@@ -44,6 +47,8 @@ source_set("location_bar") {
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/fullscreen",
+    "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/omnibox:omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_util",
@@ -53,9 +58,11 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/toolbar/keyboard_assist:keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:timing",
+    "//ios/public/provider/chrome/browser:browser",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
@@ -102,13 +109,18 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/toolbar:test_support",
+    "//components/variations",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/test/fakes",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
index 10a7ce86f75..19ab2362e37 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
@@ -48,3 +48,21 @@ imageset("omnibox_voice") {
     "omnibox_voice.imageset/omnibox_voice@3x.png",
   ]
 }
+
+imageset("location_bar_share") {
+  sources = [
+    "location_bar_share.imageset/Contents.json",
+    "location_bar_share.imageset/location_bar_share.png",
+    "location_bar_share.imageset/location_bar_share@2x.png",
+    "location_bar_share.imageset/location_bar_share@3x.png",
+  ]
+}
+
+imageset("location_bar_voice") {
+  sources = [
+    "location_bar_voice.imageset/Contents.json",
+    "location_bar_voice.imageset/location_bar_voice.png",
+    "location_bar_voice.imageset/location_bar_voice@2x.png",
+    "location_bar_voice.imageset/location_bar_voice@3x.png",
+  ]
+}
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 9dcc8af9da9..718e9cf2aef 100644
--- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
@@ -78,6 +78,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test",
@@ -98,6 +99,7 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/ui/history:history_ui",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index e10ecf53a32..05582c84656 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -9,6 +9,7 @@ source_set("omnibox") {
     "location_bar_controller.cc",
     "location_bar_controller.h",
     "location_bar_delegate.h",
+    "omnibox_left_image_consumer.h",
     "web_omnibox_edit_controller.cc",
     "web_omnibox_edit_controller.h",
   ]
@@ -67,13 +68,20 @@ source_set("omnibox_internal") {
     "image_retriever.h",
     "location_bar_controller_impl.h",
     "location_bar_controller_impl.mm",
+    "omnibox_consumer.h",
+    "omnibox_container_view.h",
+    "omnibox_container_view.mm",
     "omnibox_coordinator.h",
     "omnibox_coordinator.mm",
+    "omnibox_mediator.h",
+    "omnibox_mediator.mm",
     "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_controller.h",
+    "omnibox_view_controller.mm",
     "omnibox_view_ios.h",
     "omnibox_view_ios.mm",
     "web_omnibox_edit_controller_impl.h",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 2fa2ec002aa..3c231e34cd7 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -17,7 +17,6 @@ source_set("popup") {
     "omnibox_popup_view_ios.h",
     "omnibox_popup_view_ios.mm",
     "omnibox_popup_view_suggestions_delegate.h",
-    "table_view_owning.h",
   ]
   deps = [
     ":popup_internal",
@@ -45,6 +44,8 @@ source_set("popup_internal") {
   sources = [
     "omnibox_popup_row.h",
     "omnibox_popup_row.mm",
+    "self_sizing_table_view.h",
+    "self_sizing_table_view.mm",
   ]
   deps = [
     "//base",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 0cbbc1b633d..c5369590d32 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -20,8 +20,11 @@ source_set("overscroll_actions") {
     "resources:ptr_reload",
     "resources:ptr_reload_active",
     "//base",
+    "//ios/chrome/app/strings:ios_chromium_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/fullscreen",
@@ -34,6 +37,7 @@ source_set("overscroll_actions") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/web",
+    "//ui/base",
     "//ui/gfx",
   ]
   allow_circular_includes_from = [ "//ios/chrome/browser/ui/static_content" ]
diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
index 7097bce3e68..6438aa78e12 100644
--- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
@@ -260,9 +260,11 @@ source_set("eg_tests") {
     "//components/image_fetcher/core",
     "//components/payments/core",
     "//components/payments/mojom",
+    "//components/prefs",
     "//components/strings",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/browser/autofill",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/payments",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/payments/cells",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index 63a7258051c..832672cdbbd 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -25,9 +25,11 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/tools_menu/public",
@@ -50,6 +52,7 @@ source_set("popup_menu_ui") {
     "popup_menu_presenter.mm",
     "popup_menu_table_view_controller.h",
     "popup_menu_table_view_controller.mm",
+    "popup_menu_table_view_controller_commands.h",
     "popup_menu_view.h",
     "popup_menu_view.mm",
     "popup_menu_view_controller.h",
@@ -61,6 +64,8 @@ source_set("popup_menu_ui") {
     "resources:popup_background",
     "resources:popup_menu_add_bookmark",
     "resources:popup_menu_bookmarks",
+    "resources:popup_menu_close_tab",
+    "resources:popup_menu_edit_bookmark",
     "resources:popup_menu_find_in_page",
     "resources:popup_menu_help",
     "resources:popup_menu_history",
@@ -82,6 +87,7 @@ source_set("popup_menu_ui") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/resources:menu_shadow",
     "//ios/chrome/browser/ui/table_view",
@@ -122,7 +128,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
+    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:test_support",
+    "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
index 9aeb4a3bbb3..121d381dd21 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
@@ -16,6 +16,7 @@ source_set("cells") {
   deps = [
     "//base",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/reading_list:reading_list_ui",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
new file mode 100644
index 00000000000..50b9d336ab5
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 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("public") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "popup_menu_ui_updating.h",
+  ]
+  deps = [
+    "//base",
+  ]
+  libs = [ "UIKit.framework" ]
+}
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 c5d3c1814fb..89490646b7c 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -13,6 +13,15 @@ imageset("popup_menu_read_later") {
   ]
 }
 
+imageset("popup_menu_edit_bookmark") {
+  sources = [
+    "popup_menu_edit_bookmark.imageset/Contents.json",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark.png",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark@2x.png",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark@3x.png",
+  ]
+}
+
 imageset("popup_menu_add_bookmark") {
   sources = [
     "popup_menu_add_bookmark.imageset/Contents.json",
@@ -22,6 +31,15 @@ imageset("popup_menu_add_bookmark") {
   ]
 }
 
+imageset("popup_menu_close_tab") {
+  sources = [
+    "popup_menu_close_tab.imageset/Contents.json",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab.png",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab@2x.png",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab@3x.png",
+  ]
+}
+
 imageset("popup_menu_site_information") {
   sources = [
     "popup_menu_site_information.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index 1f22a14b006..5059d943d50 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -49,6 +49,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/qr_scanner/requirements",
+    "//ios/chrome/browser/ui/toolbar/public",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index b726b95caef..60a7b372f7b 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -138,6 +138,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/static_content",
+    "//ios/chrome/test/fakes",
     "//ios/web",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 61f6b999d00..8c9fffc9f65 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -19,6 +19,7 @@ source_set("recent_tabs") {
     "//components/sync",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/favicon:favicon",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
@@ -34,6 +35,7 @@ source_set("recent_tabs") {
 source_set("recent_tabs_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "recent_tabs_image_data_source.h",
     "recent_tabs_table_view_controller.h",
     "recent_tabs_table_view_controller.mm",
     "recent_tabs_transitioning_delegate.h",
diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
index 2a592c7a918..d1b5238da93 100644
--- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
@@ -38,6 +38,7 @@ source_set("eg_tests") {
     "//base",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index ad2f11f430b..9cdf879e5a4 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -26,6 +26,10 @@ source_set("settings") {
     "block_popups_collection_view_controller.mm",
     "clear_browsing_data_collection_view_controller.h",
     "clear_browsing_data_collection_view_controller.mm",
+    "clear_browsing_data_coordinator.h",
+    "clear_browsing_data_coordinator.mm",
+    "clear_browsing_data_table_view_controller.h",
+    "clear_browsing_data_table_view_controller.mm",
     "compose_email_handler_collection_view_controller.h",
     "compose_email_handler_collection_view_controller.mm",
     "content_settings_collection_view_controller.h",
@@ -105,6 +109,8 @@ source_set("settings") {
     "//components/metrics",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
+    "//components/payments/core",
+    "//components/prefs/ios",
     "//components/resources",
     "//components/search_engines",
     "//components/signin/core/browser",
@@ -127,7 +133,6 @@ source_set("settings") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/mailto:features",
     "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
@@ -144,6 +149,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/material_components",
@@ -265,6 +271,7 @@ source_set("unit_tests") {
     "//components/handoff",
     "//components/password_manager/core/browser:test_support",
     "//components/password_manager/core/common",
+    "//components/payments/core",
     "//components/pref_registry",
     "//components/prefs:test_support",
     "//components/search_engines",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index f31af8add49..ab33b2f985a 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -28,6 +28,7 @@ source_set("side_swipe") {
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/tabs/requirements",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
index 85eaace534b..c0bd81956aa 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
@@ -28,6 +28,8 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/recent_tabs",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
@@ -70,6 +72,7 @@ source_set("tab_grid_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_grid/transitions",
     "//ios/chrome/browser/ui/util:constraints_ui",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
index 8a06d34c16d..72a2cbaeb47 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
@@ -54,6 +54,8 @@ source_set("tab_switcher") {
     "resources:tabswitcher_phone",
     "resources:tabswitcher_recently_closed",
     "resources:tabswitcher_tab_switcher_button",
+    "resources:tabswitcher_tab_switcher_count_button",
+    "resources:tabswitcher_tab_switcher_count_button_pressed",
     "resources:tabswitcher_tablet",
     "//base",
     "//components/browser_sync",
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 911c6a9648e..62c0b85d0ea 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
@@ -112,6 +112,22 @@ imageset("tabswitcher_tab_switcher_button") {
   ]
 }
 
+imageset("tabswitcher_tab_switcher_count_button") {
+  sources = [
+    "tabswitcher_tab_switcher_count_button.imageset/Contents.json",
+    "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button.png",
+    "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button@2x.png",
+  ]
+}
+
+imageset("tabswitcher_tab_switcher_count_button_pressed") {
+  sources = [
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/Contents.json",
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed.png",
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed@2x.png",
+  ]
+}
+
 imageset("tabswitcher_tablet") {
   sources = [
     "tabswitcher_tablet.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
index 183389277b7..67ed7b59b45 100644
--- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
@@ -5,23 +5,22 @@
 source_set("table_view") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "chrome_table_view_consumer.h",
     "chrome_table_view_controller.h",
     "chrome_table_view_controller.mm",
-    "table_container_bottom_toolbar.h",
-    "table_container_bottom_toolbar.mm",
-    "table_container_constants.h",
-    "table_container_constants.mm",
-    "table_container_view_controller.h",
-    "table_container_view_controller.mm",
     "table_view_model.h",
     "table_view_model.mm",
+    "table_view_navigation_controller.h",
+    "table_view_navigation_controller.mm",
+    "table_view_navigation_controller_constants.h",
+    "table_view_navigation_controller_constants.mm",
   ]
   deps = [
     ":styler",
     "//base",
-    "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/list_model",
-    "//ui/base",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/third_party/material_components_ios",
   ]
   public_deps = [
     "//ios/chrome/browser/ui/table_view/cells",
@@ -57,7 +56,6 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "chrome_table_view_controller_unittest.mm",
-    "table_container_bottom_toolbar_unittest.mm",
     "table_view_model_unittest.mm",
   ]
   deps = [
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
index 066b1aaff7a..3927a150bb7 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -4,6 +4,10 @@
 
 source_set("cells") {
   sources = [
+    "table_view_accessory_item.h",
+    "table_view_accessory_item.mm",
+    "table_view_activity_indicator_header_footer_item.h",
+    "table_view_activity_indicator_header_footer_item.mm",
     "table_view_cells_constants.h",
     "table_view_cells_constants.mm",
     "table_view_disclosure_header_footer_item.h",
@@ -14,6 +18,8 @@ source_set("cells") {
     "table_view_item.mm",
     "table_view_signin_promo_item.h",
     "table_view_signin_promo_item.mm",
+    "table_view_text_button_item.h",
+    "table_view_text_button_item.mm",
     "table_view_text_header_footer_item.h",
     "table_view_text_header_footer_item.mm",
     "table_view_text_item.h",
@@ -24,12 +30,17 @@ source_set("cells") {
 
   deps = [
     "resources:table_view_cell_chevron",
+    "resources:table_view_cell_favicon_background",
     "//base",
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/colors:colors",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/third_party/material_components_ios:material_components_ios",
+    "//url:url",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
@@ -37,8 +48,10 @@ source_set("cells") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "table_view_accessory_item_unittest.mm",
     "table_view_header_footer_item_unittest.mm",
     "table_view_item_unittest.mm",
+    "table_view_text_button_item_unittest.mm",
     "table_view_text_header_footer_item_unittest.mm",
     "table_view_text_item_unittest.mm",
     "table_view_url_item_unittest.mm",
@@ -48,7 +61,9 @@ source_set("unit_tests") {
     ":cells",
     "//base",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//net:net",
     "//testing/gtest",
+    "//third_party/ocmock:ocmock",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index 854202dd281..82a321f0f5a 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -23,17 +23,29 @@ source_set("tabs") {
   ]
   deps = [
     "resources:tabstrip_background_tab",
+    "resources:tabstrip_background_tab_legacy",
     "resources:tabstrip_foreground_tab",
+    "resources:tabstrip_foreground_tab_legacy",
     "resources:tabstrip_incognito_background_tab",
+    "resources:tabstrip_incognito_background_tab_legacy",
     "resources:tabstrip_incognito_foreground_tab",
+    "resources:tabstrip_incognito_foreground_tab_legacy",
     "resources:tabstrip_new_tab",
     "resources:tabstrip_new_tab_incognito",
+    "resources:tabstrip_new_tab_incognito_legacy",
     "resources:tabstrip_new_tab_incognito_pressed",
+    "resources:tabstrip_new_tab_incognito_pressed_legacy",
+    "resources:tabstrip_new_tab_legacy",
     "resources:tabstrip_new_tab_pressed",
+    "resources:tabstrip_new_tab_pressed_legacy",
     "resources:tabstrip_tab_close",
     "resources:tabstrip_tab_close_incognito",
+    "resources:tabstrip_tab_close_incognito_legacy",
     "resources:tabstrip_tab_close_incognito_pressed",
+    "resources:tabstrip_tab_close_incognito_pressed_legacy",
+    "resources:tabstrip_tab_close_legacy",
     "resources:tabstrip_tab_close_pressed",
+    "resources:tabstrip_tab_close_pressed_legacy",
     "resources:tabstrip_toggle_button_gradient",
     "//base",
     "//base:i18n",
diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
index 02ed68d6d9e..12ffc96d457 100644
--- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
@@ -36,6 +36,38 @@ imageset("tabstrip_incognito_foreground_tab") {
   ]
 }
 
+imageset("tabstrip_background_tab_legacy") {
+  sources = [
+    "tabstrip_background_tab_legacy.imageset/Contents.json",
+    "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy@2x~ipad.png",
+    "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_foreground_tab_legacy") {
+  sources = [
+    "tabstrip_foreground_tab_legacy.imageset/Contents.json",
+    "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy@2x~ipad.png",
+    "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_incognito_background_tab_legacy") {
+  sources = [
+    "tabstrip_incognito_background_tab_legacy.imageset/Contents.json",
+    "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy@2x~ipad.png",
+    "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_incognito_foreground_tab_legacy") {
+  sources = [
+    "tabstrip_incognito_foreground_tab_legacy.imageset/Contents.json",
+    "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy@2x~ipad.png",
+    "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_new_tab") {
   sources = [
     "tabstrip_new_tab.imageset/Contents.json",
@@ -68,6 +100,38 @@ imageset("tabstrip_new_tab_pressed") {
   ]
 }
 
+imageset("tabstrip_new_tab_legacy") {
+  sources = [
+    "tabstrip_new_tab_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy@2x~ipad.png",
+    "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_incognito_legacy") {
+  sources = [
+    "tabstrip_new_tab_incognito_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy@2x~ipad.png",
+    "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_incognito_pressed_legacy") {
+  sources = [
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy@2x~ipad.png",
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_pressed_legacy") {
+  sources = [
+    "tabstrip_new_tab_pressed_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy@2x~ipad.png",
+    "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_tab_close") {
   sources = [
     "tabstrip_tab_close.imageset/Contents.json",
@@ -100,6 +164,38 @@ imageset("tabstrip_tab_close_pressed") {
   ]
 }
 
+imageset("tabstrip_tab_close_legacy") {
+  sources = [
+    "tabstrip_tab_close_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy@2x~ipad.png",
+    "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_incognito_legacy") {
+  sources = [
+    "tabstrip_tab_close_incognito_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy@2x~ipad.png",
+    "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_incognito_pressed_legacy") {
+  sources = [
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy@2x~ipad.png",
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_pressed_legacy") {
+  sources = [
+    "tabstrip_tab_close_pressed_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy@2x~ipad.png",
+    "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_toggle_button_gradient") {
   sources = [
     "tabstrip_toggle_button_gradient.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index f42f1dd6630..fb086f66a68 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -141,6 +141,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
     "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
+    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/legacy",
     "//ios/chrome/browser/ui/tools_menu/public",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
index 78d5c1ef44d..016d002d141 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
@@ -27,7 +27,6 @@ source_set("adaptive") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:util",
@@ -35,6 +34,7 @@ source_set("adaptive") {
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
@@ -71,10 +71,10 @@ source_set("adaptive_ui") {
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/ntp:ntp",
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu:flags",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/public",
diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
index 4404360903c..8d7e67ee630 100644
--- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
@@ -104,6 +104,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser:browser",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/earl_grey:earl_grey+link",
diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
index 1d3e9bb7df0..f64a8f23d27 100644
--- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
@@ -37,8 +37,6 @@ source_set("webui") {
     "//components/metrics_services_manager",
     "//components/ntp_tiles",
     "//components/password_manager/core/browser",
-    "//components/physical_web/data_source",
-    "//components/physical_web/webui",
     "//components/prefs",
     "//components/resources",
     "//components/strings",
diff --git a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
index 42d40dacb16..12db2649c51 100644
--- a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
@@ -13,7 +13,7 @@ source_set("gcm") {
     "//components/resources",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/web",
   ]
 }
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index 91ad5817763..2fbec3a9017 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",
+    "error_page_util.h",
+    "error_page_util.mm",
     "load_timing_tab_helper.h",
     "load_timing_tab_helper.mm",
     "mailto_handler.h",
@@ -33,6 +35,8 @@ source_set("web") {
   deps = [
     ":tab_helper_delegates",
     "//base",
+    "//components/error_page/common",
+    "//components/resources:components_resources_grit",
     "//components/strings",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
@@ -42,6 +46,7 @@ source_set("web") {
     "//ios/chrome/browser/ui/commands:commands",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/util:util",
+    "//ios/net",
     "//ios/web",
     "//ui/base",
     "//url",
@@ -75,6 +80,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "error_page_util_unittest.mm",
     "load_timing_tab_helper_unittest.mm",
     "mailto_handler_gmail_unittest.mm",
     "mailto_handler_inbox_unittest.mm",
@@ -93,6 +99,7 @@ source_set("unit_tests") {
     ":web",
     "//base:base",
     "//base/test:test_support",
+    "//components/strings:components_strings_grit",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/test:test_support",
@@ -169,7 +176,6 @@ source_set("web_internal") {
     "//base",
     "//components/content_settings/core/browser",
     "//components/dom_distiller/core",
-    "//components/error_page/common",
     "//components/infobars/core",
     "//components/payments/core",
     "//components/prefs",
@@ -251,6 +257,7 @@ source_set("unit_tests_internal") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/web",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
@@ -269,6 +276,7 @@ source_set("eg_tests") {
     "browsing_prevent_default_egtest.mm",
     "cache_egtest.mm",
     "child_window_open_by_dom_egtest.mm",
+    "error_page_egtest.mm",
     "forms_egtest.mm",
     "http_auth_egtest.mm",
     "js_print_egtest.mm",
@@ -294,6 +302,7 @@ source_set("eg_tests") {
     "//ios/chrome/test:test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/testing:embedded_test_server_support",
     "//ios/testing:ios_test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 34941167c8a..e7fdd899278 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -147,7 +147,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/find_in_page:unit_tests",
     "//ios/chrome/browser/geolocation:unit_tests",
     "//ios/chrome/browser/history:unit_tests",
-    "//ios/chrome/browser/itunes_links:unit_tests",
+    "//ios/chrome/browser/itunes_urls:unit_tests",
     "//ios/chrome/browser/language:unit_tests",
     "//ios/chrome/browser/metrics:unit_tests",
     "//ios/chrome/browser/metrics:unit_tests_internal",
@@ -176,6 +176,7 @@ test("ios_chrome_unittests") {
     "//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_container:unit_tests",
     "//ios/chrome/browser/ui/browser_list:unit_tests",
     "//ios/chrome/browser/ui/bubble:unit_tests",
     "//ios/chrome/browser/ui/collection_view:unit_tests",
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index d1ef0cf0546..25bf197e821 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -194,7 +194,6 @@ chrome_ios_eg_test("ios_chrome_external_url_egtests") {
   deps = [
     "//ios/chrome/browser/metrics:external_url_eg_tests",
     "//ios/chrome/browser/translate:external_url_eg_tests",
-    "//ios/chrome/browser/ui:external_url_eg_tests",
   ]
 }
 
diff --git a/chromium/ios/chrome/test/fakes/BUILD.gn b/chromium/ios/chrome/test/fakes/BUILD.gn
index d3fa3bd10f3..61a757175f5 100644
--- a/chromium/ios/chrome/test/fakes/BUILD.gn
+++ b/chromium/ios/chrome/test/fakes/BUILD.gn
@@ -21,12 +21,15 @@ source_set("fakes") {
     "fake_store_kit_launcher.mm",
     "fake_ui_view_controller.h",
     "fake_ui_view_controller.mm",
+    "fake_url_loader.h",
+    "fake_url_loader.mm",
   ]
 
   deps = [
     "//base",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/store_kit",
+    "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/download",
     "//ios/chrome/browser/ui/presenters",
     "//ios/web/public",
diff --git a/chromium/ios/components/io_thread/BUILD.gn b/chromium/ios/components/io_thread/BUILD.gn
index 2df9ca536a7..cda4acb3642 100644
--- a/chromium/ios/components/io_thread/BUILD.gn
+++ b/chromium/ios/components/io_thread/BUILD.gn
@@ -12,7 +12,6 @@ component("io_thread") {
     "//components/prefs",
     "//components/proxy_config",
     "//components/proxy_config/ios",
-    "//components/ssl_config",
     "//components/variations",
     "//components/version_info",
     "//ios/web",
@@ -38,7 +37,6 @@ source_set("unit_tests") {
     "//components/prefs",
     "//components/prefs:test_support",
     "//components/proxy_config",
-    "//components/ssl_config",
     "//ios/web",
     "//ios/web/public/test",
     "//net",
diff --git a/chromium/ios/showcase/BUILD.gn b/chromium/ios/showcase/BUILD.gn
index 736c3b0f9a4..0830741404d 100644
--- a/chromium/ios/showcase/BUILD.gn
+++ b/chromium/ios/showcase/BUILD.gn
@@ -13,11 +13,11 @@ ios_app_bundle("showcase") {
   output_name = "Showcase"
   deps = [
     ":features",
-    "//ios/showcase/core:main",
 
     # All shared libraries must have the sanitizer deps to properly link in
     # asan mode (this target will be empty in other cases).
     "//build/config:exe_and_shlib_deps",
+    "//ios/showcase/core:main",
   ]
   bundle_deps = [ "//ios/showcase/core/resources" ]
   assert_no_deps = ios_assert_no_deps
@@ -27,10 +27,11 @@ group("features") {
   deps = [
     "//ios/showcase/bubble",
     "//ios/showcase/content_suggestions",
+    "//ios/showcase/manual_fill",
     "//ios/showcase/payments",
+    "//ios/showcase/recent_tabs",
     "//ios/showcase/settings",
     "//ios/showcase/tab_grid",
-    "//ios/showcase/table_view",
     "//ios/showcase/text_badge_view",
     "//ios/showcase/uikit_table_view_cell",
     "//ios/showcase/widget",
diff --git a/chromium/ios/showcase/content_suggestions/BUILD.gn b/chromium/ios/showcase/content_suggestions/BUILD.gn
index c3cfa201518..85cfe66d1ab 100644
--- a/chromium/ios/showcase/content_suggestions/BUILD.gn
+++ b/chromium/ios/showcase/content_suggestions/BUILD.gn
@@ -38,6 +38,7 @@ source_set("eg_tests") {
     ":content_suggestions",
     "//components/strings",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/showcase/core/BUILD.gn b/chromium/ios/showcase/core/BUILD.gn
index f4f88a0f255..fdc8b3721ad 100644
--- a/chromium/ios/showcase/core/BUILD.gn
+++ b/chromium/ios/showcase/core/BUILD.gn
@@ -14,6 +14,7 @@ source_set("core") {
   deps = [
     "//base",
     "//base:i18n",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/showcase/common",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
diff --git a/chromium/ios/showcase/manual_fill/BUILD.gn b/chromium/ios/showcase/manual_fill/BUILD.gn
new file mode 100644
index 00000000000..6bab01f0ce3
--- /dev/null
+++ b/chromium/ios/showcase/manual_fill/BUILD.gn
@@ -0,0 +1,34 @@
+# 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("manual_fill") {
+  sources = [
+    "ipad_keyboard_proto_view_controller.h",
+    "ipad_keyboard_proto_view_controller.mm",
+    "iphone_keyboard_proto_view_controller.h",
+    "iphone_keyboard_proto_view_controller.mm",
+    "keyboard_accessory_view.h",
+    "keyboard_accessory_view.mm",
+    "keyboard_complement_view.h",
+    "keyboard_complement_view.mm",
+    "keyboard_proto_view_controller.h",
+    "keyboard_proto_view_controller.mm",
+    "password_picker_view_controller.h",
+    "password_picker_view_controller.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/showcase/common",
+    "//third_party/material_design_icons:ic_account_circle",
+    "//third_party/material_design_icons:ic_credit_card",
+    "//third_party/material_design_icons:ic_keyboard_arrow_down",
+    "//third_party/material_design_icons:ic_keyboard_arrow_up",
+    "//third_party/material_design_icons:ic_vpn_key",
+  ]
+  libs = [
+    "UIKit.framework",
+    "WebKit.framework",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/showcase/table_view/BUILD.gn b/chromium/ios/showcase/recent_tabs/BUILD.gn
index 85c3f424738..24602343233 100644
--- a/chromium/ios/showcase/table_view/BUILD.gn
+++ b/chromium/ios/showcase/recent_tabs/BUILD.gn
@@ -2,14 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("table_view") {
+source_set("recent_tabs") {
   sources = [
-    "sc_table_container_coordinator.h",
-    "sc_table_container_coordinator.mm",
+    "sc_dark_theme_recent_tabs_coordinator.h",
+    "sc_dark_theme_recent_tabs_coordinator.mm",
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/showcase/common",
   ]
   libs = [ "UIKit.framework" ]
diff --git a/chromium/ios/testing/BUILD.gn b/chromium/ios/testing/BUILD.gn
index 19286c738a7..21e18e031f3 100644
--- a/chromium/ios/testing/BUILD.gn
+++ b/chromium/ios/testing/BUILD.gn
@@ -26,6 +26,19 @@ source_set("ios_test_support") {
   ]
 }
 
+source_set("embedded_test_server_support") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  deps = [
+    "//net:test_support",
+  ]
+  sources = [
+    "embedded_test_server_handlers.cc",
+    "embedded_test_server_handlers.h",
+  ]
+}
+
 source_set("ocmock_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn
index a596d0e2845..b203d674149 100644
--- a/chromium/ios/third_party/earl_grey/BUILD.gn
+++ b/chromium/ios/third_party/earl_grey/BUILD.gn
@@ -9,6 +9,13 @@ config("config") {
   include_dirs = [ "src/EarlGrey" ]
 }
 
+config("disable_deprecated_errors") {
+  cflags = [
+    "-Wno-deprecated",
+    "-Wno-deprecated-declarations",
+  ]
+}
+
 ios_framework_bundle("earl_grey") {
   output_name = "EarlGrey"
   info_plist = "Info.plist"
@@ -18,6 +25,7 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Action/GREYAction.h",
     "src/EarlGrey/Action/GREYActionBlock.h",
     "src/EarlGrey/Action/GREYActionBlock.m",
+    "src/EarlGrey/Action/GREYActions+Internal.h",
     "src/EarlGrey/Action/GREYActions.h",
     "src/EarlGrey/Action/GREYActions.m",
     "src/EarlGrey/Action/GREYBaseAction.h",
@@ -66,6 +74,8 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Additions/NSURL+GREYAdditions.m",
     "src/EarlGrey/Additions/NSURLConnection+GREYAdditions.h",
     "src/EarlGrey/Additions/NSURLConnection+GREYAdditions.m",
+    "src/EarlGrey/Additions/NSURLSession+GREYAdditions.h",
+    "src/EarlGrey/Additions/NSURLSession+GREYAdditions.m",
     "src/EarlGrey/Additions/UIAnimation+GREYAdditions.h",
     "src/EarlGrey/Additions/UIAnimation+GREYAdditions.m",
     "src/EarlGrey/Additions/UIApplication+GREYAdditions.h",
@@ -97,11 +107,13 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Assertion/GREYAssertionBlock.h",
     "src/EarlGrey/Assertion/GREYAssertionBlock.m",
     "src/EarlGrey/Assertion/GREYAssertionDefines.h",
+    "src/EarlGrey/Assertion/GREYAssertions+Internal.h",
     "src/EarlGrey/Assertion/GREYAssertions.h",
     "src/EarlGrey/Assertion/GREYAssertions.m",
     "src/EarlGrey/Common/GREYAnalytics.h",
     "src/EarlGrey/Common/GREYAnalytics.m",
     "src/EarlGrey/Common/GREYAnalyticsDelegate.h",
+    "src/EarlGrey/Common/GREYAppleInternals.h",
     "src/EarlGrey/Common/GREYConfiguration.h",
     "src/EarlGrey/Common/GREYConfiguration.m",
     "src/EarlGrey/Common/GREYConstants.h",
@@ -118,6 +130,7 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Common/GREYFailureFormatter.m",
     "src/EarlGrey/Common/GREYFailureScreenshotter.h",
     "src/EarlGrey/Common/GREYFailureScreenshotter.m",
+    "src/EarlGrey/Common/GREYFatalAsserts.h",
     "src/EarlGrey/Common/GREYLogger.h",
     "src/EarlGrey/Common/GREYLogger.m",
     "src/EarlGrey/Common/GREYObjcRuntime.h",
@@ -135,12 +148,16 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Common/GREYTestCaseInvocation.m",
     "src/EarlGrey/Common/GREYTestHelper.h",
     "src/EarlGrey/Common/GREYTestHelper.m",
+    "src/EarlGrey/Common/GREYThrowDefines.h",
     "src/EarlGrey/Common/GREYVisibilityChecker.h",
     "src/EarlGrey/Common/GREYVisibilityChecker.m",
+    "src/EarlGrey/Core/EarlGreyImpl.h",
+    "src/EarlGrey/Core/EarlGreyImpl.m",
     "src/EarlGrey/Core/GREYAutomationSetup.h",
     "src/EarlGrey/Core/GREYAutomationSetup.m",
     "src/EarlGrey/Core/GREYElementFinder.h",
     "src/EarlGrey/Core/GREYElementFinder.m",
+    "src/EarlGrey/Core/GREYElementInteraction+Internal.h",
     "src/EarlGrey/Core/GREYElementInteraction.h",
     "src/EarlGrey/Core/GREYElementInteraction.m",
     "src/EarlGrey/Core/GREYInteraction.h",
@@ -156,7 +173,6 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Delegate/GREYUIWebViewDelegate.h",
     "src/EarlGrey/Delegate/GREYUIWebViewDelegate.m",
     "src/EarlGrey/EarlGrey.h",
-    "src/EarlGrey/EarlGrey.m",
     "src/EarlGrey/Event/GREYSyntheticEvents.h",
     "src/EarlGrey/Event/GREYSyntheticEvents.m",
     "src/EarlGrey/Event/GREYTouchInfo.h",
@@ -221,6 +237,7 @@ ios_framework_bundle("earl_grey") {
     "src/EarlGrey/Synchronization/GREYSyncAPI.m",
     "src/EarlGrey/Synchronization/GREYTimedIdlingResource.h",
     "src/EarlGrey/Synchronization/GREYTimedIdlingResource.m",
+    "src/EarlGrey/Synchronization/GREYUIThreadExecutor+Internal.h",
     "src/EarlGrey/Synchronization/GREYUIThreadExecutor.h",
     "src/EarlGrey/Synchronization/GREYUIThreadExecutor.m",
     "src/EarlGrey/Synchronization/GREYUIWebViewIdlingResource.h",
@@ -234,48 +251,46 @@ ios_framework_bundle("earl_grey") {
   ]
   public_headers = [
     "src/EarlGrey/EarlGrey.h",
+    "src/EarlGrey/Core/EarlGreyImpl.h",
     "src/EarlGrey/Action/GREYAction.h",
     "src/EarlGrey/Action/GREYActionBlock.h",
     "src/EarlGrey/Action/GREYActions.h",
-    "src/EarlGrey/Action/GREYBaseAction.h",
-    "src/EarlGrey/Action/GREYPinchAction.h",
-    "src/EarlGrey/Action/GREYScrollActionError.h",
-    "src/EarlGrey/AppSupport/GREYIdlingResource.h",
+    "src/EarlGrey/Matcher/GREYAllOf.h",
+    "src/EarlGrey/Matcher/GREYAnyOf.h",
     "src/EarlGrey/Assertion/GREYAssertion.h",
     "src/EarlGrey/Assertion/GREYAssertionBlock.h",
     "src/EarlGrey/Assertion/GREYAssertionDefines.h",
     "src/EarlGrey/Assertion/GREYAssertions.h",
+    "src/EarlGrey/Action/GREYBaseAction.h",
+    "src/EarlGrey/Matcher/GREYBaseMatcher.h",
+    "src/EarlGrey/Synchronization/GREYCondition.h",
     "src/EarlGrey/Common/GREYConfiguration.h",
     "src/EarlGrey/Common/GREYConstants.h",
+    "src/EarlGrey/Provider/GREYDataEnumerator.h",
     "src/EarlGrey/Common/GREYDefines.h",
-    "src/EarlGrey/Common/GREYElementHierarchy.h",
-    "src/EarlGrey/Common/GREYScreenshotUtil.h",
-    "src/EarlGrey/Common/GREYStopwatch.h",
-    "src/EarlGrey/Common/GREYTestHelper.h",
+    "src/EarlGrey/Matcher/GREYDescription.h",
+    "src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h",
     "src/EarlGrey/Core/GREYElementFinder.h",
+    "src/EarlGrey/Common/GREYElementHierarchy.h",
     "src/EarlGrey/Core/GREYElementInteraction.h",
-    "src/EarlGrey/Core/GREYInteraction.h",
+    "src/EarlGrey/Matcher/GREYElementMatcherBlock.h",
     "src/EarlGrey/Exception/GREYFailureHandler.h",
     "src/EarlGrey/Exception/GREYFrameworkException.h",
-    "src/EarlGrey/Matcher/GREYAllOf.h",
-    "src/EarlGrey/Matcher/GREYAnyOf.h",
-    "src/EarlGrey/Matcher/GREYBaseMatcher.h",
-    "src/EarlGrey/Matcher/GREYDescription.h",
-    "src/EarlGrey/Matcher/GREYElementMatcherBlock.h",
+    "src/EarlGrey/AppSupport/GREYIdlingResource.h",
+    "src/EarlGrey/Core/GREYInteraction.h",
     "src/EarlGrey/Matcher/GREYLayoutConstraint.h",
+    "src/EarlGrey/Synchronization/GREYManagedObjectContextIdlingResource.h",
     "src/EarlGrey/Matcher/GREYMatcher.h",
     "src/EarlGrey/Matcher/GREYMatchers.h",
-    "src/EarlGrey/Matcher/GREYNot.h",
-    "src/EarlGrey/Provider/GREYDataEnumerator.h",
-    "src/EarlGrey/Provider/GREYProvider.h",
-    "src/EarlGrey/Synchronization/GREYManagedObjectContextIdlingResource.h",
     "src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.h",
+    "src/EarlGrey/Matcher/GREYNot.h",
     "src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h",
-    "src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h",
+    "src/EarlGrey/Provider/GREYProvider.h",
+    "src/EarlGrey/Common/GREYScreenshotUtil.h",
+    "src/EarlGrey/Action/GREYScrollActionError.h",
     "src/EarlGrey/Synchronization/GREYSyncAPI.h",
-    "src/EarlGrey/Synchronization/GREYCondition.h",
+    "src/EarlGrey/Common/GREYTestHelper.h",
     "src/EarlGrey/Synchronization/GREYUIThreadExecutor.h",
-    "src/EarlGrey/Traversal/GREYTraversal.h",
   ]
   deps = [
     "//build/config/ios:xctest",
@@ -294,7 +309,6 @@ ios_framework_bundle("earl_grey") {
     "UIKit.framework",
     "XCTest.framework",
   ]
-
   public_configs = [ ":config" ]
 
   configs -= [
@@ -305,5 +319,9 @@ ios_framework_bundle("earl_grey") {
     "//build/config/compiler:no_chromium_code",
     "//build/config/compiler:enable_arc",
     "//build/config/gcc:symbol_visibility_default",
+
+    # earl_grey internally uses deprecated methods.
+    # Disable the warning about deprecation usage.
+    ":disable_deprecated_errors",
   ]
 }
diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn
index 71060e88623..773bbd9e0f6 100644
--- a/chromium/ios/third_party/material_components_ios/BUILD.gn
+++ b/chromium/ios/third_party/material_components_ios/BUILD.gn
@@ -7,8 +7,8 @@ import("//build/config/locales.gni")
 config("config") {
   visibility = [ ":material_components_ios" ]
   include_dirs = [
-    "src/components/AppBar/src",
     "src/components/ActivityIndicator/src",
+    "src/components/AppBar/src",
     "src/components/ButtonBar/src",
     "src/components/Buttons/src",
     "src/components/CollectionCells/src",
@@ -18,18 +18,19 @@ config("config") {
     "src/components/FlexibleHeader/src",
     "src/components/HeaderStackView/src",
     "src/components/Ink/src",
-    "src/components/private/UIMetrics/src",
     "src/components/NavigationBar/src",
     "src/components/OverlayWindow/src",
     "src/components/Palettes/src",
     "src/components/ProgressView/src",
-    "src/components/schemes/Color/src",
-    "src/components/schemes/Typography/src",
     "src/components/ShadowElevations/src",
     "src/components/ShadowLayer/src",
     "src/components/Snackbar/src",
     "src/components/Themes/src",
     "src/components/Typography/src",
+    "src/components/private/Shapes/src/",
+    "src/components/private/UIMetrics/src",
+    "src/components/schemes/Color/src",
+    "src/components/schemes/Typography/src",
   ]
 }
 
@@ -94,7 +95,6 @@ source_set("material_components_ios") {
     "src/components/ButtonBar/src/MaterialButtonBar.h",
     "src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.h",
     "src/components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m",
-    "src/components/ButtonBar/src/private/MDCButtonBarButton+Private.h",
     "src/components/ButtonBar/src/private/MDCButtonBarButton.m",
     "src/components/Buttons/src/MDCButton.h",
     "src/components/Buttons/src/MDCButton.m",
@@ -265,6 +265,9 @@ source_set("material_components_ios") {
     "src/components/private/Overlay/src/private/MDCOverlayObserverTransition.m",
     "src/components/private/Overlay/src/private/MDCOverlayUtilities.h",
     "src/components/private/Overlay/src/private/MDCOverlayUtilities.m",
+    "src/components/private/Shapes/src/MDCShapedShadowLayer.h",
+    "src/components/private/Shapes/src/MDCShapedShadowLayer.m",
+    "src/components/private/Shapes/src/MaterialShapes.h",
     "src/components/private/ThumbTrack/src/MDCNumericValueLabel.h",
     "src/components/private/ThumbTrack/src/MDCNumericValueLabel.m",
     "src/components/private/ThumbTrack/src/MDCThumbTrack.h",
@@ -284,6 +287,11 @@ source_set("material_components_ios") {
     "src/components/schemes/Color/src/MDCSemanticColorScheme.h",
     "src/components/schemes/Color/src/MDCSemanticColorScheme.m",
     "src/components/schemes/Color/src/MaterialColorScheme.h",
+    "src/components/schemes/Typography/src/MDCLegacyFontScheme.h",
+    "src/components/schemes/Typography/src/MDCLegacyFontScheme.m",
+    "src/components/schemes/Typography/src/MDCTypographyScheme.h",
+    "src/components/schemes/Typography/src/MDCTypographyScheme.m",
+    "src/components/schemes/Typography/src/MaterialTypographyScheme.h",
   ]
   include_dirs = [
     "src/components/ActivityIndicator/src",
@@ -305,6 +313,7 @@ source_set("material_components_ios") {
     "src/components/private/Icons/icons/ic_reorder/src",
     "src/components/private/KeyboardWatcher/src",
     "src/components/private/Overlay/src",
+    "src/components/private/Shapes/src",
     "src/components/private/ThumbTrack/src",
   ]
 
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 6ce8d9641f5..f1ca8e40690 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -62,6 +62,7 @@ source_set("web") {
     "crw_navigation_item_storage.mm",
     "features.mm",
     "load_committed_details.cc",
+    "network_context_owner.cc",
     "service_manager_connection_impl.cc",
     "service_manager_connection_impl.h",
     "service_manager_context.h",
@@ -207,10 +208,12 @@ source_set("ios_web_general_unittests") {
   sources = [
     "browser_state_unittest.cc",
     "history_state_util_unittest.mm",
+    "network_context_owner_unittest.cc",
     "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
     "url_scheme_util_unittest.mm",
     "url_util_unittest.cc",
+    "web_client_unittest.mm",
   ]
 }
 
@@ -249,6 +252,7 @@ source_set("ios_web_navigation_unittests") {
     "navigation/crw_navigation_item_storage_unittest.mm",
     "navigation/crw_session_controller_unittest.mm",
     "navigation/crw_session_storage_unittest.mm",
+    "navigation/error_retry_state_machine_unittest.mm",
     "navigation/navigation_item_impl_unittest.mm",
     "navigation/navigation_item_storage_test_util.h",
     "navigation/navigation_item_storage_test_util.mm",
@@ -540,6 +544,7 @@ test("ios_web_inttests") {
   deps = [
     ":web",
     "//base/test:test_support",
+    "//ios/testing:embedded_test_server_support",
     "//ios/testing:http_server_bundle_data",
     "//ios/testing:ios_test_support",
     "//ios/web:resources_grit",
@@ -567,6 +572,7 @@ test("ios_web_inttests") {
     "public/test/http_server_inttest.mm",
     "test/run_all_unittests.cc",
     "url_loader_inttest.mm",
+    "web_state/error_page_inttest.mm",
     "web_state/favicon_callbacks_inttest.mm",
     "web_state/http_auth_inttest.mm",
     "web_state/navigation_and_load_callbacks_inttest.mm",
diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni
index 82e6ceb17d1..83bcc0b7dd7 100644
--- a/chromium/ios/web/js_compile.gni
+++ b/chromium/ios/web/js_compile.gni
@@ -196,6 +196,7 @@ template("js_compile_checked") {
     }
   } else {
     bundle_data(target_name) {
+      not_needed(invoker, [ "js_modules" ])
       forward_variables_from(invoker,
                              [
                                "data_deps",
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index cda071a5219..4ecba639794 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -53,6 +53,8 @@ source_set("core") {
   ]
 
   sources = [
+    "error_retry_state_machine.h",
+    "error_retry_state_machine.mm",
     "navigation_item_impl.h",
     "navigation_item_impl.mm",
     "navigation_manager_delegate.h",
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 2b10807247a..c04ae2cb72d 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -27,6 +27,8 @@ source_set("test") {
   allow_circular_includes_from = [ "//ios/web/test:test_support" ]
 
   sources = [
+    "error_test_util.h",
+    "error_test_util.mm",
     "js_test_util.h",
     "js_test_util.mm",
     "native_controller_test_util.h",
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index 6d6813af5dc..0768b04a0df 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -101,6 +101,7 @@ source_set("session_certificate_policy_cache") {
 source_set("error_translation_util") {
   deps = [
     "//base",
+    "//ios/net",
     "//net",
   ]
 
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index 7c8100ec514..0ea33ec4a97 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -5,11 +5,13 @@
 import("//build/buildflag_header.gni")
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/ios/rules.gni")
+import("//build/config/locales.gni")
 import("//components/cronet/native/include/headers.gni")
 import("//components/grpc_support/include/headers.gni")
 import("//ios/build/config.gni")
 import("//ios/web/js_compile.gni")
 import("//ios/web_view/features.gni")
+import("//ios/web_view/repack.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
@@ -49,6 +51,7 @@ ios_web_view_public_headers = [
   "public/cwv_navigation_type.h",
   "public/cwv_preferences.h",
   "public/cwv_preview_element_info.h",
+  "public/cwv_script_command.h",
   "public/cwv_scroll_view.h",
   "public/cwv_scroll_view_delegate.h",
   "public/cwv_translation_controller.h",
@@ -74,8 +77,11 @@ if (ios_web_view_enable_autofill) {
     "public/cwv_autofill_controller.h",
     "public/cwv_autofill_controller_delegate.h",
     "public/cwv_autofill_data_manager.h",
+    "public/cwv_autofill_data_manager_delegate.h",
     "public/cwv_autofill_profile.h",
     "public/cwv_autofill_suggestion.h",
+    "public/cwv_credit_card.h",
+    "public/cwv_credit_card_verifier.h",
     "public/cwv_preferences_autofill.h",
     "public/cwv_web_view_autofill.h",
     "public/cwv_web_view_configuration_autofill.h",
@@ -105,6 +111,8 @@ ios_web_view_sources = [
   "internal/cwv_preferences_internal.h",
   "internal/cwv_preview_element_info.mm",
   "internal/cwv_preview_element_info_internal.h",
+  "internal/cwv_script_command.mm",
+  "internal/cwv_script_command_internal.h",
   "internal/cwv_scroll_view.mm",
   "internal/cwv_scroll_view_internal.h",
   "internal/cwv_user_content_controller.mm",
@@ -187,6 +195,7 @@ if (ios_web_view_enable_signin) {
 }
 if (ios_web_view_enable_autofill) {
   ios_web_view_sources += [
+    "internal/autofill/cwv_autofill_client_ios_bridge.h",
     "internal/autofill/cwv_autofill_controller.mm",
     "internal/autofill/cwv_autofill_controller_internal.h",
     "internal/autofill/cwv_autofill_data_manager.mm",
@@ -195,13 +204,17 @@ if (ios_web_view_enable_autofill) {
     "internal/autofill/cwv_autofill_profile_internal.h",
     "internal/autofill/cwv_autofill_suggestion.mm",
     "internal/autofill/cwv_autofill_suggestion_internal.h",
+    "internal/autofill/cwv_credit_card.mm",
+    "internal/autofill/cwv_credit_card_internal.h",
+    "internal/autofill/cwv_credit_card_verifier.mm",
+    "internal/autofill/cwv_credit_card_verifier_internal.h",
   ]
 }
 
 ios_web_view_deps = [
   ":web_view_bundle",
   ":web_view_features",
-  ":packed_resources",
+  ":web_view_resources",
   "//base",
   "//components/autofill/core/browser",
   "//components/autofill/core/common",
@@ -213,6 +226,7 @@ ios_web_view_deps = [
   "//components/keyed_service/core",
   "//components/keyed_service/ios",
   "//components/language/core/browser",
+  "//components/language/core/common",
   "//components/net_log",
   "//components/pref_registry",
   "//components/prefs",
@@ -220,7 +234,7 @@ ios_web_view_deps = [
   "//components/signin/core/browser",
   "//components/signin/ios/browser",
   "//components/signin/ios/browser:active_state_manager",
-  "//components/ssl_config",
+  "//components/strings:components_strings_grit",
   "//components/sync",
   "//components/translate/core/browser",
   "//components/translate/core/common",
@@ -305,7 +319,9 @@ test("ios_web_view_unittests") {
   testonly = true
   sources = [
     "internal/autofill/cwv_autofill_controller_unittest.mm",
+    "internal/autofill/cwv_autofill_profile_unittest.mm",
     "internal/autofill/cwv_autofill_suggestion_unittest.mm",
+    "internal/autofill/cwv_credit_card_unittest.mm",
     "internal/cwv_html_element_unittest.mm",
     "internal/cwv_preferences_unittest.mm",
     "internal/cwv_preview_element_info_unittest.mm",
@@ -320,6 +336,7 @@ test("ios_web_view_unittests") {
   deps = [
     "test:test_support",
     "//base/test:run_all_unittests",
+    "//components/autofill/core/browser:test_support",
     "//components/autofill/ios/browser:test_support",
     "//ios/testing:ios_test_support",
     "//ios/web/public/test",
@@ -359,8 +376,20 @@ js_compile_bundle("web_view_bundle") {
   ]
 }
 
+repack_locales("repack_locales") {
+  visibility = [ ":web_view_resources" ]
+  source_patterns = [ "${root_gen_dir}/components/strings/components_strings_" ]
+
+  deps = [
+    "//components/strings:components_strings",
+  ]
+  input_locales = ios_packed_locales
+  output_locales = ios_packed_locales_as_mac_outputs
+  copy_data_to_bundle = true
+}
+
 repack("repack_resources") {
-  visibility = [ ":packed_resources" ]
+  visibility = [ ":web_view_resources" ]
   deps = [
     "//components/resources:components_resources",
     "//ios/web:resources",
@@ -370,19 +399,27 @@ repack("repack_resources") {
     "$root_gen_dir/ios/web/ios_web_resources.pak",
   ]
   output = "$target_gen_dir/web_view_resources.pak"
+  copy_data_to_bundle = true
+}
+
+ios_web_view_repack_all_scales("repack_scalable_resources") {
+  visibility = [ ":web_view_resources" ]
+  scales = [
+    "100",
+    "200",
+    "300",
+  ]
 }
 
-bundle_data("packed_resources") {
+group("web_view_resources") {
   visibility = [ "//ios/web_view:*" ]
-  public_deps = [
+  deps = [
+    ":repack_locales",
     ":repack_resources",
   ]
-  sources = [
-    "$target_gen_dir/web_view_resources.pak",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
+  if (ios_web_view_enable_autofill) {
+    deps += [ ":repack_scalable_resources" ]
+  }
 }
 
 if (additional_toolchains == [] || current_toolchain == default_toolchain) {
diff --git a/chromium/ios/web_view/repack.gni b/chromium/ios/web_view/repack.gni
new file mode 100644
index 00000000000..c2813453fbd
--- /dev/null
+++ b/chromium/ios/web_view/repack.gni
@@ -0,0 +1,70 @@
+# Copyright 2018 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("//tools/grit/repack.gni")
+
+# Template to repack all scalable resources at a given scale.
+#
+# Arguments
+#
+#     scale
+#         string, scale as a percentage, e.g. "200" corresponds to @2x scale.
+#
+# Generates a bundle_data target for convenience.
+template("_ios_web_view_repack_one_scale") {
+  assert(defined(invoker.scale), "scale must be defined for ${target_name}")
+
+  repack(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
+
+    sources = [
+      # TODO(crbug.com/842244): Bundle less resources.
+      "${root_gen_dir}/components/components_resources_${invoker.scale}_percent.pak",
+    ]
+    deps = [
+      "//components/resources:components_scaled_resources",
+    ]
+
+    output = "$target_gen_dir/web_view_${invoker.scale}_percent.pak"
+    copy_data_to_bundle = true
+  }
+}
+
+# Template to repack all scalable resources at all scales.
+#
+# Arguments
+#
+#     scales
+#       list of strings corresponding to scales as percentage, e.g. "200"
+#       corresponds to @2x scale.
+#
+# Generates a collection of bundle_data targets for convenience.
+template("ios_web_view_repack_all_scales") {
+  assert(defined(invoker.scales), "scales must be defined for ${target_name}")
+
+  _scale_targets = []
+  _target_name = target_name
+
+  foreach(_scale, invoker.scales) {
+    _scale_targets += [ ":${_target_name}_${_scale}_percent" ]
+    _ios_web_view_repack_one_scale("${_target_name}_${_scale}_percent") {
+      forward_variables_from(invoker, [ "testonly" ])
+      visibility = [ ":${_target_name}" ]
+      scale = _scale
+    }
+  }
+
+  group(_target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "testonly",
+                             "visibility",
+                           ])
+    public_deps = _scale_targets
+  }
+}
diff --git a/chromium/ios/web_view/test/BUILD.gn b/chromium/ios/web_view/test/BUILD.gn
index 4bd0535373f..6d4abac0090 100644
--- a/chromium/ios/web_view/test/BUILD.gn
+++ b/chromium/ios/web_view/test/BUILD.gn
@@ -15,6 +15,7 @@ source_set("inttests") {
     "web_view_int_test.mm",
     "web_view_kvo_inttest.mm",
     "web_view_restorable_state_inttest.mm",
+    "web_view_script_command_inttest.mm",
   ]
 
   deps = [
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2018-08-24 12:15:48 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2018-08-28 13:30:04 +0000
commit	b014812705fc80bff0a5c120dfcef88f349816dc (patch)
tree	25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/ios
parent	9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff)
download	qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz