BASELINE: Update Chromium to 75.0.3770.56

Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2019-05-24 11:40:17 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2019-05-24 12:42:11 +0000
commit: 5d87695f37678f96492b258bbab36486c59866b4 (patch)
tree: be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/ios
parent: 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
download: qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz
134 files changed, 1826 insertions, 686 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index fdc3516aff7..124a9204df7 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -114,7 +114,6 @@ compile_entitlements("entitlements") {
 source_set("app_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "application_mode.h",
     "chrome_overlay_window.h",
     "chrome_overlay_window.mm",
     "firebase_utils.h",
@@ -134,6 +133,7 @@ source_set("app_internal") {
   deps = [
     ":app",
     ":firebase_buildflags",
+    ":mode",
     ":tests_hook",
     "//base",
     "//components/bookmarks/browser",
@@ -160,6 +160,8 @@ source_set("app_internal") {
     "//components/proxy_config",
     "//components/suggestions",
     "//components/sync",
+    "//components/ukm/ios:features",
+    "//components/unified_consent",
     "//components/url_formatter",
     "//components/web_resource",
     "//ios/chrome/app/application_delegate",
@@ -178,6 +180,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/crash_report",
     "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/download",
+    "//ios/chrome/browser/external_files",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/first_run",
@@ -189,6 +192,7 @@ source_set("app_internal") {
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/net",
+    "//ios/chrome/browser/ntp:features",
     "//ios/chrome/browser/ntp_snippets",
     "//ios/chrome/browser/omaha",
     "//ios/chrome/browser/passwords",
@@ -205,8 +209,8 @@ source_set("app_internal") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/download",
     "//ios/chrome/browser/ui/first_run",
@@ -241,6 +245,7 @@ source_set("app_internal") {
     "//ios/public/provider/chrome/browser/distribution",
     "//ios/public/provider/chrome/browser/mailto",
     "//ios/public/provider/chrome/browser/signin",
+    "//ios/public/provider/chrome/browser/user",
     "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/testing/perf:startup",
     "//ios/third_party/material_roboto_font_loader_ios",
@@ -263,6 +268,17 @@ source_set("app_internal") {
       [ "//ios/chrome/app/application_delegate:application_delegate_internal" ]
 }
 
+source_set("mode") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "application_mode.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("main") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -353,7 +369,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/content_widget_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }
@@ -367,7 +383,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/search_widget_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }
@@ -381,7 +397,7 @@ if (current_toolchain == default_toolchain) {
         "$root_out_dir/share_extension.appex",
       ]
       outputs = [
-        "{{bundle_plugins_dir}}/{{source_file_part}}",
+        "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}",
       ]
     }
   }
diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn
index d4ab56740a1..e99d1fb7abb 100644
--- a/chromium/ios/chrome/app/application_delegate/BUILD.gn
+++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn
@@ -37,6 +37,7 @@ source_set("unit_tests") {
     "//components/metrics",
     "//ios/chrome/app",
     "//ios/chrome/app:app_internal",
+    "//ios/chrome/app:mode",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
     "//ios/chrome/browser",
@@ -50,13 +51,14 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/u2f",
-    "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/main/test",
     "//ios/chrome/browser/ui/safe_mode",
     "//ios/chrome/browser/ui/settings",
     "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
@@ -109,7 +111,9 @@ source_set("application_delegate_internal") {
     "//components/metrics",
     "//components/payments/core",
     "//components/prefs",
+    "//components/ukm/ios:features",
     "//ios/chrome/app",
+    "//ios/chrome/app:mode",
     "//ios/chrome/app/spotlight",
     "//ios/chrome/app/startup",
     "//ios/chrome/browser",
@@ -125,11 +129,12 @@ source_set("application_delegate_internal") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/u2f",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/safe_mode",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common/app_group:main_app",
@@ -164,7 +169,9 @@ source_set("test_support") {
     "//base",
     "//base/test:test_support",
     "//ios/chrome/app:app_internal",
+    "//ios/chrome/app:mode",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/url_loading",
     "//net",
     "//ui/base",
     "//url",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index e85121beae4..1cc6af396aa 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",
+    "//components/thread_pool_util",
     "//ios/chrome/browser:chrome_paths",
     "//ios/web/public/app",
     "//skia",
@@ -41,8 +41,6 @@ source_set("startup") {
     "client_registration.mm",
     "content_suggestions_scheduler_notifications.h",
     "content_suggestions_scheduler_notifications.mm",
-    "network_stack_setup.h",
-    "network_stack_setup.mm",
     "provider_registration.h",
     "provider_registration.mm",
   ]
@@ -59,7 +57,6 @@ source_set("startup") {
     "//ios/chrome/browser/first_run",
     "//ios/chrome/browser/net:net",
     "//ios/chrome/browser/ntp_snippets",
-    "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/common",
     "//ios/chrome/common/app_group",
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn
index 0641526eeaa..ae885c6a68d 100644
--- a/chromium/ios/chrome/browser/BUILD.gn
+++ b/chromium/ios/chrome/browser/BUILD.gn
@@ -105,6 +105,7 @@ source_set("browser") {
     "//components/search_engines",
     "//components/search_provider_logos",
     "//components/security_state/core",
+    "//components/send_tab_to_self",
     "//components/signin/core/browser",
     "//components/strings",
     "//components/sync",
@@ -113,6 +114,7 @@ source_set("browser") {
     "//components/unified_consent",
     "//components/url_formatter",
     "//components/variations",
+    "//components/variations/net",
     "//components/variations/service",
     "//components/version_info",
     "//components/webdata_services",
@@ -123,14 +125,12 @@ source_set("browser") {
     "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/crash_report:flags",
     "//ios/chrome/browser/download",
-    "//ios/chrome/browser/download:features",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/find_in_page:feature_flags",
     "//ios/chrome/browser/itunes_urls",
     "//ios/chrome/browser/passwords:feature_flags",
     "//ios/chrome/browser/payments:constants",
     "//ios/chrome/browser/reading_list:features",
-    "//ios/chrome/browser/search_engines:feature_flags",
     "//ios/chrome/browser/signin:feature_flags",
     "//ios/chrome/browser/ssl:feature_flags",
     "//ios/chrome/browser/sync/glue",
@@ -149,6 +149,7 @@ source_set("browser") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/web",
+    "//ios/web/common",
     "//ios/web/public",
     "//net",
     "//rlz/buildflags",
@@ -182,6 +183,7 @@ source_set("browser_impl") {
     "//components/gcm_driver",
     "//components/history/core/browser",
     "//components/keyed_service/core",
+    "//components/language/core/browser",
     "//components/language_usage_metrics",
     "//components/metrics",
     "//components/metrics_services_manager",
@@ -193,6 +195,7 @@ source_set("browser_impl") {
     "//components/sessions",
     "//components/translate/core/browser",
     "//components/ukm",
+    "//components/ukm/ios:features",
     "//components/update_client",
     "//components/variations",
     "//components/variations/field_trial_config",
@@ -210,6 +213,7 @@ source_set("browser_impl") {
     "//ios/chrome/browser/open_from_clipboard",
     "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/prefs:browser_prefs",
+    "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/update_client",
diff --git a/chromium/ios/chrome/browser/autocomplete/BUILD.gn b/chromium/ios/chrome/browser/autocomplete/BUILD.gn
index b4576e1baca..dc1e9ad0b1f 100644
--- a/chromium/ios/chrome/browser/autocomplete/BUILD.gn
+++ b/chromium/ios/chrome/browser/autocomplete/BUILD.gn
@@ -24,6 +24,7 @@ source_set("autocomplete") {
     "//components/history/core/browser",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
+    "//components/language/core/browser",
     "//components/omnibox/browser",
     "//components/prefs",
     "//components/signin/core/browser",
diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn
index 480b838fc6f..3bb6bbccee6 100644
--- a/chromium/ios/chrome/browser/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/BUILD.gn
@@ -510,6 +510,7 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
   ]
 }
diff --git a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn
index 47b24ffe98f..4dd97d7fd00 100644
--- a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn
+++ b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn
@@ -31,6 +31,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server:http_server",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn
index 2923ab0955c..9d8b2190c14 100644
--- a/chromium/ios/chrome/browser/browser_state/BUILD.gn
+++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn
@@ -20,6 +20,7 @@ source_set("browser_state") {
     "//base",
     "//components/prefs",
     "//components/sync_preferences",
+    "//components/variations/net",
     "//ios/chrome/browser/net:net_types",
   ]
 
@@ -102,6 +103,7 @@ source_set("browser_state_impl") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/send_tab_to_self",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/snapshots",
@@ -138,12 +140,14 @@ source_set("browser_state_impl") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "chrome_browser_state_unittest.cc",
     "test_chrome_browser_state_manager_unittest.cc",
   ]
   deps = [
     ":browser_state",
     ":test_support",
     "//base",
+    "//components/variations/net",
     "//ios/web/public/test",
     "//testing/gtest",
   ]
@@ -161,6 +165,7 @@ source_set("test_support") {
 
   public_deps = [
     ":browser_state",
+    ":browser_state_impl",
   ]
 
   deps = [
diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
index e63f5ba7ed5..5e3b7ba64bb 100644
--- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn
@@ -31,6 +31,8 @@ source_set("browsing_data") {
     "browsing_data_remover_impl.h",
     "browsing_data_remover_impl.mm",
     "browsing_data_remover_observer.h",
+    "browsing_data_remover_observer_bridge.h",
+    "browsing_data_remover_observer_bridge.mm",
   ]
   deps = [
     ":counters",
@@ -55,6 +57,7 @@ source_set("browsing_data") {
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/external_files",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/language",
     "//ios/chrome/browser/passwords",
@@ -66,7 +69,6 @@ source_set("browsing_data") {
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/translate:translate",
-    "//ios/chrome/browser/ui:external_files",
     "//ios/net",
     "//ios/public/provider/chrome/browser",
     "//ios/web",
@@ -101,11 +103,13 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "browsing_data_remover_impl_unittest.mm",
+    "browsing_data_remover_observer_bridge_unittest.mm",
     "cache_counter_unittest.cc",
   ]
   deps = [
     ":browsing_data",
     ":counters",
+    ":test_support",
     "//base",
     "//base/test:test_support",
     "//components/browsing_data/core",
@@ -125,3 +129,20 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 }
+
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "fake_browsing_data_remover.h",
+    "fake_browsing_data_remover.mm",
+    "fake_browsing_data_remover_observer.h",
+    "fake_browsing_data_remover_observer.mm",
+  ]
+
+  deps = [
+    ":browsing_data",
+    "//base",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/component_updater/BUILD.gn b/chromium/ios/chrome/browser/component_updater/BUILD.gn
index 5036bc9d775..273566f66a4 100644
--- a/chromium/ios/chrome/browser/component_updater/BUILD.gn
+++ b/chromium/ios/chrome/browser/component_updater/BUILD.gn
@@ -11,6 +11,7 @@ source_set("component_updater") {
     "//base",
     "//components/component_updater",
     "//components/update_client",
+    "//components/update_client:common_impl",
     "//ios/chrome/browser",
     "//ios/chrome/browser/google",
     "//ios/chrome/common",
diff --git a/chromium/ios/chrome/browser/context_menu/BUILD.gn b/chromium/ios/chrome/browser/context_menu/BUILD.gn
index 63b60e5d74a..9be41b12639 100644
--- a/chromium/ios/chrome/browser/context_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/context_menu/BUILD.gn
@@ -22,6 +22,7 @@ source_set("eg_tests") {
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/download/BUILD.gn b/chromium/ios/chrome/browser/download/BUILD.gn
index df8a7a8ceca..437749ba0ca 100644
--- a/chromium/ios/chrome/browser/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/download/BUILD.gn
@@ -34,7 +34,7 @@ source_set("download") {
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui:network_activity_indicator_manager",
+    "//ios/chrome/browser/network_activity",
     "//ios/web/public",
     "//ios/web/public/download",
   ]
@@ -80,7 +80,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/download:features",
-    "//ios/chrome/browser/ui:network_activity_indicator_manager",
+    "//ios/chrome/browser/network_activity",
     "//ios/chrome/test/fakes",
     "//ios/web/public",
     "//ios/web/public/download",
diff --git a/chromium/ios/chrome/browser/external_files/BUILD.gn b/chromium/ios/chrome/browser/external_files/BUILD.gn
new file mode 100644
index 00000000000..14de18c3a11
--- /dev/null
+++ b/chromium/ios/chrome/browser/external_files/BUILD.gn
@@ -0,0 +1,27 @@
+# Copyright 2019 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("external_files") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "external_file_remover.h",
+    "external_file_remover_factory.h",
+    "external_file_remover_factory.mm",
+    "external_file_remover_impl.h",
+    "external_file_remover_impl.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/bookmarks/browser",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/sessions",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/web_state_list",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
index e2719988456..ce0155153cc 100644
--- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
+++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn
@@ -40,6 +40,7 @@ source_set("eg_tests") {
     "//base/test:test_support",
     "//components/feature_engagement/public",
     "//components/feature_engagement/test:test_support",
+    "//components/translate/core/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
diff --git a/chromium/ios/chrome/browser/find_in_page/BUILD.gn b/chromium/ios/chrome/browser/find_in_page/BUILD.gn
index f5fdc4126ff..be428735899 100644
--- a/chromium/ios/chrome/browser/find_in_page/BUILD.gn
+++ b/chromium/ios/chrome/browser/find_in_page/BUILD.gn
@@ -11,17 +11,21 @@ source_set("find_in_page") {
     "find_in_page_controller.mm",
     "find_in_page_model.h",
     "find_in_page_model.mm",
+    "find_in_page_response_delegate.h",
     "find_tab_helper.h",
     "find_tab_helper.mm",
     "js_findinpage_manager.h",
     "js_findinpage_manager.mm",
   ]
   deps = [
+    ":feature_flags",
     ":injected_js",
     "//base",
     "//ios/chrome/browser/metrics:ukm_url_recorder",
     "//ios/chrome/browser/web",
     "//ios/web",
+    "//ios/web/public",
+    "//ios/web/public/find_in_page",
     "//services/metrics/public/cpp:ukm_builders",
   ]
   libs = [ "CoreGraphics.framework" ]
@@ -61,6 +65,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//components/ukm:test_support",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/find_in_page:feature_flags",
     "//ios/chrome/browser/metrics:ukm_url_recorder",
     "//ios/chrome/browser/web:test_support",
     "//ios/chrome/browser/web:web_internal",
diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn
index abaea0f5013..e7cdd228d71 100644
--- a/chromium/ios/chrome/browser/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/BUILD.gn
@@ -55,3 +55,24 @@ source_set("public") {
     "infobar_controller_delegate.h",
   ]
 }
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "infobar_badge_tab_helper_unittest.mm",
+  ]
+  deps = [
+    ":badge",
+    ":infobars",
+    "//base/test:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/infobars:test_support",
+    "//ios/chrome/browser/ui/infobars/coordinators",
+    "//ios/chrome/test:test_support",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn
index d87b37ae45c..c50555d35ad 100644
--- a/chromium/ios/chrome/browser/metrics/BUILD.gn
+++ b/chromium/ios/chrome/browser/metrics/BUILD.gn
@@ -35,6 +35,8 @@ source_set("metrics") {
     "ios_profile_session_durations_service.mm",
     "ios_profile_session_durations_service_factory.h",
     "ios_profile_session_durations_service_factory.mm",
+    "ios_user_type_metrics_provider.h",
+    "ios_user_type_metrics_provider.mm",
     "mobile_session_shutdown_metrics_provider.h",
     "mobile_session_shutdown_metrics_provider.mm",
     "previous_session_info.h",
@@ -60,6 +62,7 @@ source_set("metrics") {
     "//components/rappor",
     "//components/signin/core/browser",
     "//components/sync",
+    "//components/sync:device_info",
     "//components/ukm",
     "//components/ukm:observers",
     "//components/variations",
@@ -78,6 +81,8 @@ source_set("metrics") {
     "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/user",
     "//ios/web",
     "//url",
   ]
@@ -205,6 +210,7 @@ source_set("eg_tests") {
     "//ios/public/provider/chrome/browser/signin:test_support",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//ui/base",
     "//url",
diff --git a/chromium/ios/chrome/browser/net/BUILD.gn b/chromium/ios/chrome/browser/net/BUILD.gn
index 73205ddcdee..bd2711a9f98 100644
--- a/chromium/ios/chrome/browser/net/BUILD.gn
+++ b/chromium/ios/chrome/browser/net/BUILD.gn
@@ -26,6 +26,7 @@ source_set("net") {
     "//base",
     "//components/component_updater",
     "//components/content_settings/core/browser",
+    "//components/language/core/browser",
     "//components/pref_registry",
     "//components/prefs",
     "//components/update_client",
@@ -33,7 +34,7 @@ source_set("net") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browsing_data",
     "//ios/net",
-    "//ios/web",
+    "//ios/web/common",
     "//net",
     "//net:extras",
     "//url",
@@ -68,6 +69,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//ios/net",
     "//ios/net:test_support",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//services/network:test_support",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/network_activity/BUILD.gn b/chromium/ios/chrome/browser/network_activity/BUILD.gn
new file mode 100644
index 00000000000..05deed78d75
--- /dev/null
+++ b/chromium/ios/chrome/browser/network_activity/BUILD.gn
@@ -0,0 +1,44 @@
+# Copyright 2019 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("network_activity") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "network_activity_indicator_manager.h",
+    "network_activity_indicator_manager.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
+source_set("tab_helper") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "network_activity_indicator_tab_helper.h",
+    "network_activity_indicator_tab_helper.mm",
+  ]
+  deps = [
+    ":network_activity",
+    "//base",
+    "//ios/web/public",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "network_activity_indicator_manager_unittest.mm",
+    "network_activity_indicator_tab_helper_unittest.mm",
+  ]
+  deps = [
+    ":network_activity",
+    ":tab_helper",
+    "//ios/web/public",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
index 2ad1a2b7a27..3aa15dd8770 100644
--- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
+++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn
@@ -27,6 +27,7 @@ source_set("ntp_snippets") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/history",
+    "//ios/chrome/browser/leveldb_proto:factory",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/overlays/BUILD.gn b/chromium/ios/chrome/browser/overlays/BUILD.gn
new file mode 100644
index 00000000000..155d2099c4f
--- /dev/null
+++ b/chromium/ios/chrome/browser/overlays/BUILD.gn
@@ -0,0 +1,63 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("overlays") {
+  sources = [
+    "overlay_request.h",
+    "overlay_request_queue.h",
+    "overlay_response.h",
+    "overlay_user_data.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  allow_circular_includes_from = [ ":internal" ]
+
+  deps = [
+    ":internal",
+    "//base",
+    "//ios/web/public",
+  ]
+}
+
+source_set("internal") {
+  sources = [
+    "overlay_request_impl.cc",
+    "overlay_request_impl.h",
+    "overlay_request_queue_impl.h",
+    "overlay_request_queue_impl.mm",
+    "overlay_request_queue_impl_observer.h",
+    "overlay_response_impl.cc",
+    "overlay_response_impl.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/web/public",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "overlay_request_queue_impl_unittest.mm",
+    "overlay_request_unittest.cc",
+    "overlay_response_unittest.cc",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":internal",
+    ":overlays",
+    "//base/test:test_support",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/web/public",
+    "//ios/web/public/test/fakes",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/overlays/test/BUILD.gn b/chromium/ios/chrome/browser/overlays/test/BUILD.gn
new file mode 100644
index 00000000000..851c72a2ad2
--- /dev/null
+++ b/chromium/ios/chrome/browser/overlays/test/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("test") {
+  testonly = true
+  sources = [
+    "fake_overlay_user_data.cc",
+    "fake_overlay_user_data.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/overlays",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn
new file mode 100644
index 00000000000..3184f6e926f
--- /dev/null
+++ b/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn
@@ -0,0 +1,42 @@
+# Copyright 2019 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("overscroll_actions") {
+  sources = [
+    "overscroll_actions_tab_helper.h",
+    "overscroll_actions_tab_helper.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/keyed_service/ios",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/overscroll_actions",
+    "//ios/web/public",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "overscroll_actions_tab_helper_unittest.mm",
+  ]
+  deps = [
+    ":overscroll_actions",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/ui/overscroll_actions",
+    "//ios/chrome/test/fakes",
+    "//ios/web/public",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn
index 815cf487dc8..5bd2ca1557c 100644
--- a/chromium/ios/chrome/browser/passwords/BUILD.gn
+++ b/chromium/ios/chrome/browser/passwords/BUILD.gn
@@ -23,6 +23,8 @@ source_set("passwords") {
     "ios_chrome_update_password_infobar_delegate.mm",
     "ios_password_infobar_controller.h",
     "ios_password_infobar_controller.mm",
+    "ios_password_requirements_service_factory.cc",
+    "ios_password_requirements_service_factory.h",
     "js_credential_manager.h",
     "js_credential_manager.mm",
     "notify_auto_signin_view_controller.h",
diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn
index 8288b405a36..e2c496b926b 100644
--- a/chromium/ios/chrome/browser/prefs/BUILD.gn
+++ b/chromium/ios/chrome/browser/prefs/BUILD.gn
@@ -58,6 +58,7 @@ source_set("browser_prefs") {
     "//components/sync_sessions",
     "//components/translate/core/browser",
     "//components/translate/core/common",
+    "//components/ukm/ios:features",
     "//components/unified_consent",
     "//components/update_client",
     "//components/variations/service",
@@ -74,6 +75,7 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/voice:prefs",
     "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/user",
     "//services/identity/public/cpp:cpp",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn
index 1a3ceb92f09..88ce54b4592 100644
--- a/chromium/ios/chrome/browser/prerender/BUILD.gn
+++ b/chromium/ios/chrome/browser/prerender/BUILD.gn
@@ -24,6 +24,7 @@ source_set("prerender") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/app_launcher:app_launcher",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/geolocation:geolocation_internal",
     "//ios/chrome/browser/history:tab_helper",
     "//ios/chrome/browser/itunes_urls:itunes_urls",
@@ -70,7 +71,7 @@ source_set("eg_tests") {
     "//base",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
+    "//ios/chrome/browser/ui/omnibox/popup:popup_ui",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/providers/BUILD.gn b/chromium/ios/chrome/browser/providers/BUILD.gn
index 2a6e7c7c8e2..88bc5343535 100644
--- a/chromium/ios/chrome/browser/providers/BUILD.gn
+++ b/chromium/ios/chrome/browser/providers/BUILD.gn
@@ -25,6 +25,7 @@ source_set("providers") {
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/spotlight",
     "//ios/public/provider/chrome/browser/ui",
+    "//ios/public/provider/chrome/browser/user",
     "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/public/provider/chrome/browser/voice",
   ]
diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn
index 7542cc39338..2237330a250 100644
--- a/chromium/ios/chrome/browser/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn
@@ -49,6 +49,7 @@ source_set("reading_list") {
     "//ios/web",
     "//ios/web/public",
     "//net",
+    "//ui/base",
     "//url",
   ]
   public_deps = [
@@ -65,6 +66,8 @@ source_set("features") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/web:feature_flags",
+    "//ios/web/common",
     "//ios/web/public",
   ]
 }
diff --git a/chromium/ios/chrome/browser/search_engines/BUILD.gn b/chromium/ios/chrome/browser/search_engines/BUILD.gn
index 6ca2c260d40..6f45520594f 100644
--- a/chromium/ios/chrome/browser/search_engines/BUILD.gn
+++ b/chromium/ios/chrome/browser/search_engines/BUILD.gn
@@ -2,21 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//ios/web/js_compile.gni")
 import("//rlz/buildflags/buildflags.gni")
 
-source_set("feature_flags") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "feature_flags.cc",
-    "feature_flags.h",
-  ]
-  deps = [
-    "//base",
-  ]
-}
-
 source_set("search_engines") {
   sources = [
     "search_engine_observer_bridge.h",
diff --git a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
new file mode 100644
index 00000000000..2da9c1066c3
--- /dev/null
+++ b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn
@@ -0,0 +1,38 @@
+# Copyright 2019 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("send_tab_to_self") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "ios_send_tab_to_self_infobar_delegate.cc",
+    "ios_send_tab_to_self_infobar_delegate.h",
+    "send_tab_to_self_client_service_factory.h",
+    "send_tab_to_self_client_service_factory.mm",
+    "send_tab_to_self_client_service_ios.h",
+    "send_tab_to_self_client_service_ios.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/infobars/core",
+    "//components/keyed_service/core",
+    "//components/keyed_service/ios",
+    "//components/send_tab_to_self",
+    "//components/sync",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/app/theme:theme_grit",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/strings:ui_strings_grit",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn
index 7d87fab0723..cdedefcc5fa 100644
--- a/chromium/ios/chrome/browser/signin/BUILD.gn
+++ b/chromium/ios/chrome/browser/signin/BUILD.gn
@@ -9,8 +9,6 @@ source_set("signin") {
     "about_signin_internals_factory.h",
     "account_consistency_service_factory.h",
     "account_consistency_service_factory.mm",
-    "account_fetcher_service_factory.cc",
-    "account_fetcher_service_factory.h",
     "account_reconcilor_factory.cc",
     "account_reconcilor_factory.h",
     "account_tracker_service_factory.cc",
@@ -32,8 +30,6 @@ source_set("signin") {
     "gaia_auth_fetcher_ios_ns_url_session_bridge.mm",
     "gaia_auth_fetcher_ios_wk_webview_bridge.h",
     "gaia_auth_fetcher_ios_wk_webview_bridge.mm",
-    "gaia_cookie_manager_service_factory.cc",
-    "gaia_cookie_manager_service_factory.h",
     "identity_manager_factory.cc",
     "identity_manager_factory.h",
     "identity_manager_factory_observer.h",
@@ -43,8 +39,6 @@ source_set("signin") {
     "ios_chrome_signin_client.mm",
     "ios_chrome_signin_status_metrics_provider_delegate.cc",
     "ios_chrome_signin_status_metrics_provider_delegate.h",
-    "profile_oauth2_token_service_factory.h",
-    "profile_oauth2_token_service_factory.mm",
     "profile_oauth2_token_service_ios_provider_impl.h",
     "profile_oauth2_token_service_ios_provider_impl.mm",
     "signin_browser_state_info_updater.h",
@@ -55,8 +49,6 @@ source_set("signin") {
     "signin_client_factory.h",
     "signin_error_controller_factory.cc",
     "signin_error_controller_factory.h",
-    "signin_manager_factory.cc",
-    "signin_manager_factory.h",
     "signin_util.h",
     "signin_util.mm",
   ]
@@ -76,6 +68,7 @@ source_set("signin") {
     "//components/signin/ios/browser",
     "//components/signin/ios/browser:active_state_manager",
     "//components/sync",
+    "//components/unified_consent",
     "//google_apis",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks:bookmarks_utils",
@@ -88,7 +81,7 @@ source_set("signin") {
     "//ios/net",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/web",
+    "//ios/web/common",
     "//net",
     "//services/identity:lib",
     "//services/identity/public/cpp",
@@ -123,7 +116,9 @@ source_set("test_support") {
   deps = [
     ":signin",
     "//base",
+    "//components/image_fetcher/core:test_support",
     "//components/keyed_service/core",
+    "//components/signin/core/browser",
     "//components/signin/core/browser:internals_test_support",
     "//components/signin/ios/browser",
     "//ios/chrome/browser/browser_state",
@@ -150,13 +145,13 @@ source_set("unit_tests") {
     ":signin",
     ":test_support",
     "//base",
-    "//components/browser_sync:test_support",
     "//components/pref_registry",
     "//components/prefs",
     "//components/signin/core/browser",
     "//components/signin/core/browser:internals_test_support",
     "//components/signin/ios/browser",
     "//components/signin/ios/browser:test_support",
+    "//components/sync:test_support_driver",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//google_apis",
@@ -173,6 +168,7 @@ source_set("unit_tests") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net:test_support",
diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn
index 7d58c8378c6..03d3fd0bc0b 100644
--- a/chromium/ios/chrome/browser/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/sync/BUILD.gn
@@ -23,6 +23,8 @@ source_set("sync") {
     "model_type_store_service_factory.h",
     "profile_sync_service_factory.cc",
     "profile_sync_service_factory.h",
+    "send_tab_to_self_sync_service_factory.h",
+    "send_tab_to_self_sync_service_factory.mm",
     "session_sync_service_factory.h",
     "session_sync_service_factory.mm",
     "sync_observer_bridge.h",
@@ -48,11 +50,15 @@ source_set("sync") {
     "//components/prefs",
     "//components/reading_list/core",
     "//components/search_engines",
+    "//components/send_tab_to_self",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/sync",
+    "//components/sync:device_info",
+    "//components/sync:user_events",
     "//components/sync_preferences",
     "//components/sync_sessions",
+    "//components/unified_consent",
     "//components/version_info",
     "//google_apis",
     "//ios/chrome/browser",
@@ -92,20 +98,15 @@ source_set("sync") {
 source_set("test_support") {
   testonly = true
   sources = [
-    "ios_chrome_profile_sync_test_util.cc",
-    "ios_chrome_profile_sync_test_util.h",
     "sync_setup_service_mock.cc",
     "sync_setup_service_mock.h",
   ]
   deps = [
     ":sync",
     "//base",
-    "//components/browser_sync",
-    "//components/browser_sync:test_support",
     "//components/keyed_service/core",
     "//components/keyed_service/ios",
     "//components/sync",
-    "//components/sync:test_support_driver",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/signin",
     "//ios/chrome/common",
diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn
index 957d779c2ea..ef495fdf4c3 100644
--- a/chromium/ios/chrome/browser/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/tabs/BUILD.gn
@@ -6,7 +6,6 @@ source_set("tabs") {
   sources = [
     "legacy_tab_helper.h",
     "tab.h",
-    "tab_dialog_delegate.h",
     "tab_helper_util.h",
     "tab_model.h",
     "tab_model_list.h",
@@ -93,6 +92,7 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/content_settings",
+    "//ios/chrome/browser/crash_report:crash_report_internal",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/download:features",
     "//ios/chrome/browser/favicon",
@@ -106,11 +106,12 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/language",
     "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/network_activity:tab_helper",
+    "//ios/chrome/browser/overscroll_actions",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/search_engines:feature_flags",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/snapshots",
@@ -122,10 +123,10 @@ source_set("tabs_internal") {
     "//ios/chrome/browser/u2f",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/voice",
@@ -184,7 +185,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sessions:test_support",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/web_state_list",
@@ -194,7 +195,7 @@ source_set("unit_tests") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:test_support",
     "//ios/testing:ocmock_support",
-    "//ios/web",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//ios/web/test/fakes:fakes",
diff --git a/chromium/ios/chrome/browser/test/BUILD.gn b/chromium/ios/chrome/browser/test/BUILD.gn
index 62143f73824..8dd4f768982 100644
--- a/chromium/ios/chrome/browser/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/test/BUILD.gn
@@ -22,8 +22,8 @@ source_set("perf_test_support") {
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sessions:serialisation",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/browser_container:ui",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn
index d5d6217bb4f..ba1eab1dd7a 100644
--- a/chromium/ios/chrome/browser/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/translate/BUILD.gn
@@ -80,6 +80,7 @@ source_set("unit_tests") {
     ":translate",
     "//base",
     "//base/test:test_support",
+    "//components/language/core/browser",
     "//components/translate/core/browser:test_support",
     "//components/translate/ios/browser",
     "//ios/chrome/browser",
@@ -110,10 +111,16 @@ source_set("eg_tests") {
     "//components/translate/core/browser",
     "//components/translate/core/common",
     "//components/translate/ios/browser",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/translate",
     "//ios/chrome/browser/ui/translate:translate_ui",
+    "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/chrome/test/fakes",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn
index 9e1a2882b2c..4f7091cfafd 100644
--- a/chromium/ios/chrome/browser/ui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/BUILD.gn
@@ -6,23 +6,10 @@ import("//build/config/ios/rules.gni")
 
 source_set("ui") {
   sources = [
-    "UIView+SizeClassSupport.h",
-    "UIView+SizeClassSupport.mm",
-    "chrome_load_params.h",
-    "chrome_load_params.mm",
-    "file_locations.h",
-    "file_locations.mm",
     "native_content_controller.h",
     "native_content_controller.mm",
-    "orientation_limiting_navigation_controller.h",
-    "orientation_limiting_navigation_controller.mm",
-    "prerender_final_status.h",
-    "side_swipe_gesture_recognizer.h",
-    "side_swipe_gesture_recognizer.mm",
-    "url_loader.h",
   ]
   public_deps = [
-    ":network_activity_indicator_manager",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/ui_util",
   ]
@@ -32,24 +19,12 @@ source_set("ui") {
     "//components/sessions",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/commands",
-    "//ios/web",
     "//ui/base",
   ]
   allow_circular_includes_from = [ "//ios/chrome/browser/ui/commands" ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("network_activity_indicator_manager") {
-  sources = [
-    "network_activity_indicator_manager.h",
-    "network_activity_indicator_manager.mm",
-  ]
-  deps = [
-    "//base",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("feature_flags") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
@@ -65,21 +40,12 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "browser_view_controller_helper_unittest.mm",
-    "browser_view_controller_unittest.mm",
-    "file_locations_unittest.mm",
-    "key_commands_provider_unittest.mm",
     "native_content_controller_unittest.mm",
-    "network_activity_indicator_manager_unittest.mm",
-    "open_in_controller_unittest.mm",
-    "open_in_toolbar_unittest.mm",
-    "page_not_available_controller_unittest.mm",
   ]
   deps = [
     ":native_content_controller_test_xib",
     ":resources_unit_tests",
     ":ui",
-    ":ui_internal",
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/browser",
@@ -118,7 +84,6 @@ source_set("unit_tests") {
     "//ios/chrome/test:test_support",
     "//ios/net",
     "//ios/testing:ocmock_support",
-    "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//net",
@@ -139,284 +104,6 @@ bundle_data_ib_file("native_content_controller_test_xib") {
   source = "native_content_controller_test.xib"
 }
 
-bundle_data("resources") {
-  sources = [
-    # On iOS, the terms of service file need to be loaded from the application
-    # bundle, not from a datapack. As GetTermsOfServicePath() returns path to
-    # those files, they are added to //ios/chrome/browser/ui:resources.
-    "//components/resources/terms/terms_am.html",
-    "//components/resources/terms/terms_ar.html",
-    "//components/resources/terms/terms_bg.html",
-    "//components/resources/terms/terms_bn.html",
-    "//components/resources/terms/terms_ca.html",
-    "//components/resources/terms/terms_cs.html",
-    "//components/resources/terms/terms_da.html",
-    "//components/resources/terms/terms_de.html",
-    "//components/resources/terms/terms_el.html",
-    "//components/resources/terms/terms_en-GB.html",
-    "//components/resources/terms/terms_en.html",
-    "//components/resources/terms/terms_es-419.html",
-    "//components/resources/terms/terms_es.html",
-    "//components/resources/terms/terms_et.html",
-    "//components/resources/terms/terms_fa.html",
-    "//components/resources/terms/terms_fi.html",
-    "//components/resources/terms/terms_fil.html",
-    "//components/resources/terms/terms_fr.html",
-    "//components/resources/terms/terms_gu.html",
-    "//components/resources/terms/terms_he.html",
-    "//components/resources/terms/terms_hi.html",
-    "//components/resources/terms/terms_hr.html",
-    "//components/resources/terms/terms_hu.html",
-    "//components/resources/terms/terms_id.html",
-    "//components/resources/terms/terms_it.html",
-    "//components/resources/terms/terms_ja.html",
-    "//components/resources/terms/terms_kn.html",
-    "//components/resources/terms/terms_ko.html",
-    "//components/resources/terms/terms_lt.html",
-    "//components/resources/terms/terms_lv.html",
-    "//components/resources/terms/terms_ml.html",
-    "//components/resources/terms/terms_mr.html",
-    "//components/resources/terms/terms_nb.html",
-    "//components/resources/terms/terms_nl.html",
-    "//components/resources/terms/terms_pl.html",
-    "//components/resources/terms/terms_pt-BR.html",
-    "//components/resources/terms/terms_pt-PT.html",
-    "//components/resources/terms/terms_ro.html",
-    "//components/resources/terms/terms_ru.html",
-    "//components/resources/terms/terms_sk.html",
-    "//components/resources/terms/terms_sl.html",
-    "//components/resources/terms/terms_sr.html",
-    "//components/resources/terms/terms_sv.html",
-    "//components/resources/terms/terms_sw.html",
-    "//components/resources/terms/terms_ta.html",
-    "//components/resources/terms/terms_te.html",
-    "//components/resources/terms/terms_th.html",
-    "//components/resources/terms/terms_tr.html",
-    "//components/resources/terms/terms_uk.html",
-    "//components/resources/terms/terms_vi.html",
-    "//components/resources/terms/terms_zh-CN.html",
-    "//components/resources/terms/terms_zh-TW.html",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
-}
-
-source_set("external_files") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "external_file_controller.h",
-    "external_file_controller.mm",
-    "external_file_remover.h",
-    "external_file_remover_factory.h",
-    "external_file_remover_factory.mm",
-    "external_file_remover_impl.h",
-    "external_file_remover_impl.mm",
-  ]
-  deps = [
-    ":ui",
-    "//base",
-    "//components/bookmarks/browser",
-    "//components/keyed_service/core",
-    "//components/keyed_service/ios",
-    "//components/sessions",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/web_state_list",
-  ]
-}
-
-source_set("ui_internal") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "browser_view_controller+private.h",
-    "browser_view_controller.h",
-    "browser_view_controller.mm",
-    "browser_view_controller_dependency_factory.h",
-    "browser_view_controller_dependency_factory.mm",
-    "browser_view_controller_helper.h",
-    "browser_view_controller_helper.mm",
-    "fade_truncated_label.h",
-    "fade_truncated_label.mm",
-    "key_commands_provider.h",
-    "key_commands_provider.mm",
-    "open_in_controller.h",
-    "open_in_controller.mm",
-    "open_in_controller_testing.h",
-    "open_in_toolbar.h",
-    "open_in_toolbar.mm",
-    "page_not_available_controller.h",
-    "page_not_available_controller.mm",
-  ]
-  deps = [
-    ":notifications",
-    ":resources",
-    ":ui",
-    "resources:custom_row_voice",
-    "resources:custom_row_voice_pressed",
-    "resources:keyboard_bg_portrait_tablet",
-    "resources:keyboard_button",
-    "//base",
-    "//base:i18n",
-    "//components/bookmarks/browser",
-    "//components/image_fetcher/ios",
-    "//components/language/ios/browser",
-    "//components/omnibox/browser",
-    "//components/payments/core",
-    "//components/reading_list/core",
-    "//components/search_engines",
-    "//components/sessions",
-    "//components/signin/core/browser",
-    "//components/signin/ios/browser",
-    "//components/signin/ios/browser:active_state_manager",
-    "//components/strings",
-    "//components/url_formatter",
-    "//ios/chrome/app:tests_hook",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
-    "//ios/chrome/browser/autofill:autofill_internal",
-    "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/download",
-    "//ios/chrome/browser/feature_engagement",
-    "//ios/chrome/browser/find_in_page",
-    "//ios/chrome/browser/first_run",
-    "//ios/chrome/browser/geolocation:geolocation_internal",
-    "//ios/chrome/browser/language",
-    "//ios/chrome/browser/metrics:metrics_internal",
-    "//ios/chrome/browser/net",
-    "//ios/chrome/browser/ntp",
-    "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/prefs",
-    "//ios/chrome/browser/prerender",
-    "//ios/chrome/browser/reading_list",
-    "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/sessions",
-    "//ios/chrome/browser/sessions:serialisation",
-    "//ios/chrome/browser/signin",
-    "//ios/chrome/browser/snapshots",
-    "//ios/chrome/browser/ssl",
-    "//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/autofill:autofill",
-    "//ios/chrome/browser/ui/autofill/manual_fill",
-    "//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",
-    "//ios/chrome/browser/ui/content_suggestions",
-    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
-    "//ios/chrome/browser/ui/context_menu",
-    "//ios/chrome/browser/ui/dialogs:dialogs_internal",
-    "//ios/chrome/browser/ui/download",
-    "//ios/chrome/browser/ui/elements:elements_internal",
-    "//ios/chrome/browser/ui/find_bar",
-    "//ios/chrome/browser/ui/first_run",
-    "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/fullscreen:feature_flags",
-    "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/history",
-    "//ios/chrome/browser/ui/image_util",
-    "//ios/chrome/browser/ui/infobars",
-    "//ios/chrome/browser/ui/infobars:public",
-    "//ios/chrome/browser/ui/keyboard",
-    "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
-    "//ios/chrome/browser/ui/main:tab_switcher",
-    "//ios/chrome/browser/ui/main_content:main_content_ui",
-    "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util",
-    "//ios/chrome/browser/ui/ntp",
-    "//ios/chrome/browser/ui/ntp:coordinator",
-    "//ios/chrome/browser/ui/ntp:ntp_controller",
-    "//ios/chrome/browser/ui/ntp:util",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/omnibox/popup",
-    "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/page_info/requirements",
-    "//ios/chrome/browser/ui/payments",
-    "//ios/chrome/browser/ui/popup_menu",
-    "//ios/chrome/browser/ui/presenters",
-    "//ios/chrome/browser/ui/qr_scanner:coordinator",
-    "//ios/chrome/browser/ui/reading_list",
-    "//ios/chrome/browser/ui/sad_tab",
-    "//ios/chrome/browser/ui/sad_tab:coordinator",
-    "//ios/chrome/browser/ui/settings/sync/utils",
-    "//ios/chrome/browser/ui/snackbar",
-    "//ios/chrome/browser/ui/static_content",
-    "//ios/chrome/browser/ui/tabs",
-    "//ios/chrome/browser/ui/tabs:coordinator",
-    "//ios/chrome/browser/ui/tabs/requirements",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
-    "//ios/chrome/browser/ui/toolbar/buttons",
-    "//ios/chrome/browser/ui/toolbar/fullscreen",
-    "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util",
-    "//ios/chrome/browser/ui/toolbar/public",
-    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
-    "//ios/chrome/browser/ui/toolbar_container",
-    "//ios/chrome/browser/ui/toolbar_container:feature_flags",
-    "//ios/chrome/browser/ui/translate",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/voice",
-    "//ios/chrome/browser/upgrade",
-    "//ios/chrome/browser/url_loading",
-    "//ios/chrome/browser/voice:voice",
-    "//ios/chrome/browser/web",
-    "//ios/chrome/browser/web:tab_helper_delegates",
-    "//ios/chrome/browser/web:web_internal",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/browser/web_state_list/web_usage_enabler",
-    "//ios/chrome/browser/webui",
-    "//ios/chrome/common",
-    "//ios/public/provider/chrome/browser",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/public/provider/chrome/browser/voice",
-    "//ios/third_party/material_components_ios",
-    "//ios/web",
-    "//ios/web/public",
-    "//third_party/google_toolbox_for_mac",
-    "//ui/base",
-    "//ui/gfx",
-    "//url",
-
-    # Fake dependencies to break cycles
-    "//ios/chrome/browser/ui/settings",
-  ]
-  public_deps = [
-    ":external_files",
-    "//ios/chrome/browser/ui/side_swipe",
-  ]
-  allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/overscroll_actions",
-    "//ios/chrome/browser/ui/settings",
-    "//ios/chrome/browser/ui/tabs:coordinator",
-    "//ios/chrome/browser/web:web_internal",
-  ]
-  libs = [
-    "MessageUI.framework",
-    "Photos.framework",
-    "UIKit.framework",
-    "WebKit.framework",
-  ]
-}
-
-# TODO(crbug.com/778008): Remove this target.
-source_set("notifications") {
-  sources = [
-    "location_bar_notification_names.h",
-    "location_bar_notification_names.mm",
-  ]
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 bundle_data("resources_unit_tests") {
   visibility = [ ":unit_tests" ]
   testonly = true
@@ -428,70 +115,3 @@ bundle_data("resources_unit_tests") {
     "{{bundle_resources_dir}}/ios/chrome/test/data/{{source_file_part}}",
   ]
 }
-
-source_set("eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "browser_view_controller_egtest.mm",
-    "keyboard_commands_egtest.mm",
-  ]
-  deps = [
-    ":ui",
-    ":ui_internal",
-    "//base",
-    "//base/test:test_support",
-    "//components/strings",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
-    "//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/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/third_party/earl_grey:earl_grey+link",
-    "//ios/web:earl_grey_test_support",
-    "//ios/web/public/test",
-    "//ios/web/public/test/http_server",
-    "//ui/base",
-    "//url",
-  ]
-  libs = [
-    "UIKit.framework",
-    "WebKit.framework",
-    "XCTest.framework",
-  ]
-}
-
-source_set("perf_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "omnibox_perftest.mm",
-  ]
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//components/omnibox/browser:test_support",
-    "//ios/chrome/browser/autocomplete",
-    "//ios/chrome/browser/browser_state:test_support",
-    "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/tabs:tabs_internal",
-    "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
-    "//ios/chrome/browser/ui/toolbar",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/web_state_list",
-    "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/chrome/test/base:perf_test_support",
-    "//ios/web/public/test/fakes",
-    "//testing/gtest",
-    "//third_party/ocmock",
-    "//ui/base:test_support",
-  ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index fb1c1f2880b..d35b35bb868 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -126,7 +126,6 @@ source_set("eg_tests") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/material_components_ios",
diff --git a/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn
new file mode 100644
index 00000000000..7f360bbaa30
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn
@@ -0,0 +1,15 @@
+# Copyright 2019 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("alert_view_controller") {
+  sources = [
+    "alert_view_controller.h",
+    "alert_view_controller.mm",
+  ]
+  deps = [
+    "//ios/chrome/common/ui_util",
+  ]
+  libs = [ "UIKit.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index c0388b4ad55..258b731c8da 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -165,6 +165,7 @@ source_set("eg_test_support") {
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
index f6fd0430880..7286007a37c 100644
--- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn
@@ -32,7 +32,7 @@ source_set("cells") {
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
-    "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
index c9810866526..23fee9ca0ac 100644
--- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn
@@ -15,7 +15,6 @@ source_set("cells") {
   ]
 
   deps = [
-    "resources:autofill_edit_item_icon",
     "//components/resources",
     "//components/strings",
     "//ios/chrome/app/strings",
@@ -42,7 +41,6 @@ source_set("cells") {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "autofill_edit_item_unittest.mm",
     "cvc_item_unittest.mm",
     "legacy_autofill_edit_item_unittest.mm",
     "status_item_unittest.mm",
diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/resources/BUILD.gn
deleted file mode 100644
index 569570522b8..00000000000
--- a/chromium/ios/chrome/browser/ui/autofill/cells/resources/BUILD.gn
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019 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("autofill_edit_item_icon") {
-  sources = [
-    "autofill_edit_item_icon.imageset/Contents.json",
-    "autofill_edit_item_icon.imageset/autofill_edit_item_icon@2x.png",
-    "autofill_edit_item_icon.imageset/autofill_edit_item_icon@3x.png",
-  ]
-}
diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
index 7b76e939d03..841716aa19b 100644
--- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn
@@ -46,7 +46,8 @@ source_set("manual_fill") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/autofill:autofill_shared",
-    "//ios/chrome/browser/autofill/manual_fill:manual_fill",
+    "//ios/chrome/browser/autofill/manual_fill",
+    "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
@@ -76,14 +77,14 @@ source_set("manual_fill_ui") {
     "card_list_delegate.h",
     "card_view_controller.h",
     "card_view_controller.mm",
+    "chip_button.h",
+    "chip_button.mm",
     "credential.h",
     "credential.mm",
     "credit_card.h",
     "credit_card.mm",
     "fallback_view_controller.h",
     "fallback_view_controller.mm",
-    "keyboard_observer_helper.h",
-    "keyboard_observer_helper.mm",
     "manual_fill_accessory_view_controller.h",
     "manual_fill_accessory_view_controller.mm",
     "manual_fill_address_cell.h",
@@ -113,6 +114,7 @@ source_set("manual_fill_ui") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autofill/manual_fill:manual_fill",
+    "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_down",
     "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_up",
     "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_gradient",
@@ -120,6 +122,7 @@ source_set("manual_fill_ui") {
     "//ios/chrome/browser/ui/list_model:list_model",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view:table_view",
+    "//ios/chrome/common/favicon",
     "//ios/chrome/common/ui_util:ui_util",
     "//ios/third_party/material_components_ios",
     "//net:net",
@@ -216,6 +219,7 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//third_party/ocmock",
   ]
diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
new file mode 100644
index 00000000000..269cd571b7b
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn
@@ -0,0 +1,263 @@
+# Copyright 2019 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_view") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "browser_view_controller+private.h",
+    "browser_view_controller.h",
+    "browser_view_controller.mm",
+    "browser_view_controller_dependency_factory.h",
+    "browser_view_controller_dependency_factory.mm",
+    "browser_view_controller_helper.h",
+    "browser_view_controller_helper.mm",
+    "key_commands_provider.h",
+    "key_commands_provider.mm",
+  ]
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//components/bookmarks/browser",
+    "//components/feature_engagement/public",
+    "//components/image_fetcher/ios",
+    "//components/language/ios/browser",
+    "//components/omnibox/browser",
+    "//components/payments/core",
+    "//components/reading_list/core",
+    "//components/search_engines",
+    "//components/sessions",
+    "//components/signin/core/browser",
+    "//components/signin/ios/browser",
+    "//components/signin/ios/browser:active_state_manager",
+    "//components/strings",
+    "//components/translate/core/browser",
+    "//components/unified_consent",
+    "//components/url_formatter",
+    "//ios/chrome/app:tests_hook",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/autofill:autofill_internal",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/download",
+    "//ios/chrome/browser/feature_engagement",
+    "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/first_run",
+    "//ios/chrome/browser/geolocation:geolocation_internal",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/language",
+    "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/net",
+    "//ios/chrome/browser/ntp",
+    "//ios/chrome/browser/overscroll_actions",
+    "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/prefs",
+    "//ios/chrome/browser/prerender",
+    "//ios/chrome/browser/reading_list",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/sessions:serialisation",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/ssl",
+    "//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/authentication",
+    "//ios/chrome/browser/ui/autofill:autofill",
+    "//ios/chrome/browser/ui/autofill/manual_fill",
+    "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
+    "//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",
+    "//ios/chrome/browser/ui/content_suggestions",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
+    "//ios/chrome/browser/ui/context_menu",
+    "//ios/chrome/browser/ui/dialogs:dialogs_internal",
+    "//ios/chrome/browser/ui/download",
+    "//ios/chrome/browser/ui/elements:elements_internal",
+    "//ios/chrome/browser/ui/find_bar",
+    "//ios/chrome/browser/ui/first_run",
+    "//ios/chrome/browser/ui/fullscreen",
+    "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/fullscreen:ui",
+    "//ios/chrome/browser/ui/history",
+    "//ios/chrome/browser/ui/image_util:web",
+    "//ios/chrome/browser/ui/infobars",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:public",
+    "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
+    "//ios/chrome/browser/ui/location_bar:notifications",
+    "//ios/chrome/browser/ui/main:tab_switcher",
+    "//ios/chrome/browser/ui/main_content:main_content_ui",
+    "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util",
+    "//ios/chrome/browser/ui/ntp",
+    "//ios/chrome/browser/ui/ntp:coordinator",
+    "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/ntp:util",
+    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/omnibox/popup",
+    "//ios/chrome/browser/ui/overscroll_actions",
+    "//ios/chrome/browser/ui/page_info/requirements",
+    "//ios/chrome/browser/ui/payments",
+    "//ios/chrome/browser/ui/popup_menu",
+    "//ios/chrome/browser/ui/presenters",
+    "//ios/chrome/browser/ui/qr_scanner:coordinator",
+    "//ios/chrome/browser/ui/reading_list",
+    "//ios/chrome/browser/ui/sad_tab",
+    "//ios/chrome/browser/ui/sad_tab:coordinator",
+    "//ios/chrome/browser/ui/settings/sync/utils",
+    "//ios/chrome/browser/ui/side_swipe",
+    "//ios/chrome/browser/ui/signin_interaction/public",
+    "//ios/chrome/browser/ui/snackbar",
+    "//ios/chrome/browser/ui/static_content",
+    "//ios/chrome/browser/ui/tabs",
+    "//ios/chrome/browser/ui/tabs:coordinator",
+    "//ios/chrome/browser/ui/tabs/requirements",
+    "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/ui/toolbar:toolbar_ui",
+    "//ios/chrome/browser/ui/toolbar/buttons",
+    "//ios/chrome/browser/ui/toolbar/fullscreen",
+    "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util",
+    "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
+    "//ios/chrome/browser/ui/toolbar_container",
+    "//ios/chrome/browser/ui/toolbar_container:feature_flags",
+    "//ios/chrome/browser/ui/translate",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/voice",
+    "//ios/chrome/browser/upgrade",
+    "//ios/chrome/browser/url_loading",
+    "//ios/chrome/browser/voice:voice",
+    "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web:tab_helper_delegates",
+    "//ios/chrome/browser/web:web_internal",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list/web_usage_enabler",
+    "//ios/chrome/browser/webui",
+    "//ios/chrome/common",
+    "//ios/chrome/common/ui_util",
+    "//ios/public/provider/chrome/browser",
+    "//ios/public/provider/chrome/browser/ui",
+    "//ios/public/provider/chrome/browser/voice",
+    "//ios/third_party/material_components_ios",
+    "//ios/web",
+    "//ios/web/common",
+    "//ios/web/public",
+    "//third_party/google_toolbox_for_mac",
+    "//ui/base",
+    "//ui/gfx",
+    "//url",
+
+    # Fake dependencies to break cycles
+    "//ios/chrome/browser/ui/settings",
+  ]
+  libs = [
+    "MessageUI.framework",
+    "Photos.framework",
+    "UIKit.framework",
+    "WebKit.framework",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "browser_view_controller_helper_unittest.mm",
+    "browser_view_controller_unittest.mm",
+    "key_commands_provider_unittest.mm",
+  ]
+  deps = [
+    ":browser_view",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/test",
+    "//components/omnibox/browser:test_support",
+    "//components/prefs:test_support",
+    "//components/search_engines",
+    "//components/sessions",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/activity_services",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/browser_container:ui",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/test",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/browser/web_state_list/web_usage_enabler",
+    "//ios/chrome/test:block_cleanup_test",
+    "//ios/chrome/test:test_support",
+    "//ios/net",
+    "//ios/testing:ocmock_support",
+    "//ios/web/public",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//ios/web/web_state:web_state_impl_header",
+    "//ios/web/web_state/ui",
+    "//net",
+    "//net:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+    "//ui/base:test_support",
+  ]
+}
+
+source_set("eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "browser_view_controller_egtest.mm",
+  ]
+  deps = [
+    ":browser_view",
+    "//base",
+    "//base/test:test_support",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ntp:features",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//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/util",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/third_party/earl_grey:earl_grey+link",
+    "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test",
+    "//ios/web/public/test/http_server",
+    "//ui/base",
+    "//url",
+  ]
+  libs = [
+    "UIKit.framework",
+    "WebKit.framework",
+    "XCTest.framework",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index d5186a20f45..128e556a108 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -48,7 +48,6 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands",
@@ -60,6 +59,7 @@ source_set("content_suggestions") {
     "//ios/chrome/browser/ui/content_suggestions/identifier",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/location_bar:notifications",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/browser/ui/overscroll_actions",
@@ -131,7 +131,7 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/common/favicon",
-    "//ios/web/public",
+    "//ios/web/common",
     "//ui/base",
   ]
   public_deps = [
@@ -171,7 +171,7 @@ source_set("content_suggestions_ui_util") {
     "//ios/chrome/browser/ui/ntp_tile_views:constants",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/third_party/material_components_ios",
-    "//ios/web/public",
+    "//ios/web/common",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -198,7 +198,6 @@ source_set("unit_tests") {
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/commands",
@@ -206,6 +205,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
     "//ios/chrome/browser/ui/content_suggestions/identifier",
+    "//ios/chrome/browser/ui/location_bar:notifications",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
@@ -258,6 +258,8 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/tab_grid:egtest_support",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/test:eg_test_support",
+    "//ios/chrome/test:test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/base:base",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
index 4f054c6cc01..3e7e7f6e850 100644
--- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn
@@ -120,6 +120,7 @@ source_set("eg_tests") {
     "//ios/web",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//ui/base",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn
index 41da94e77d1..2440ba3e46e 100644
--- a/chromium/ios/chrome/browser/ui/download/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn
@@ -121,8 +121,9 @@ source_set("eg_tests") {
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/download:features",
     "//ios/chrome/browser/download:test_support",
-    "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/test:eg_test_support",
     "//ios/chrome/test:test_support",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
@@ -130,6 +131,7 @@ source_set("eg_tests") {
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public",
+    "//ios/web/public/test:element_selector",
     "//ui/base",
   ]
   libs = [ "XCTest.framework" ]
diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
index 4003db5c025..0213e739a6e 100644
--- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn
@@ -5,6 +5,8 @@
 source_set("elements") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "extended_touch_target_button.h",
+    "extended_touch_target_button.mm",
     "selector_coordinator.h",
     "selector_coordinator.mm",
     "selector_picker_presentation_controller.h",
@@ -14,11 +16,14 @@ source_set("elements") {
     "selector_view_controller_delegate.h",
     "top_aligned_image_view.h",
     "top_aligned_image_view.mm",
+    "windowed_container_view.h",
+    "windowed_container_view.mm",
   ]
   deps = [
     "//base",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/util",
   ]
 }
 
@@ -30,12 +35,14 @@ source_set("unit_tests") {
     "chrome_activity_overlay_coordinator_unittest.mm",
     "selector_coordinator_unittest.mm",
     "selector_picker_view_controller_unittest.mm",
+    "windowed_container_view_unittest.mm",
   ]
   deps = [
     ":elements",
     ":elements_internal",
     "//base",
     "//base/test:test_support",
+    "//ios/chrome/test:test_support",
     "//testing/gtest",
     "//third_party/ocmock",
   ]
diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
index 4f7c023bd0c..ea141d75221 100644
--- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -10,6 +10,8 @@ source_set("first_run") {
     "first_run_histograms.h",
     "first_run_util.h",
     "first_run_util.mm",
+    "orientation_limiting_navigation_controller.h",
+    "orientation_limiting_navigation_controller.mm",
     "static_file_view_controller.h",
     "static_file_view_controller.mm",
     "welcome_to_chrome_view.h",
@@ -43,6 +45,7 @@ source_set("first_run") {
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:terms_util",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
index 8604fc39100..a755029b548 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -99,6 +99,7 @@ source_set("internal") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/web",
+    "//ios/web/common",
     "//ui/gfx/geometry",
   ]
 }
@@ -144,7 +145,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
-    "//ios/web",
+    "//ios/web/common",
     "//ios/web/public",
     "//ios/web/public/test/fakes",
     "//testing/gmock",
@@ -170,6 +171,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/common",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 98bb8841eaf..dbe170d4aa5 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -84,6 +84,7 @@ source_set("history_ui") {
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/common/favicon",
     "//ui/base",
   ]
@@ -106,6 +107,7 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:presentation",
+    "//ios/chrome/browser/url_loading",
     "//ios/web/public",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
index 3fb922a22b2..032c38ab681 100644
--- a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn
@@ -4,14 +4,25 @@
 
 source_set("image_util") {
   sources = [
+    "image_util.h",
+    "image_util.mm",
+  ]
+  deps = [
+    "//third_party/google_toolbox_for_mac",
+    "//ui/base",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("web") {
+  sources = [
     "image_copier.h",
     "image_copier.mm",
     "image_saver.h",
     "image_saver.mm",
-    "image_util.h",
-    "image_util.mm",
   ]
   deps = [
+    ":image_util",
     "//base",
     "//components/image_fetcher/core",
     "//components/image_fetcher/ios",
@@ -20,8 +31,6 @@ source_set("image_util") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/web",
     "//ios/web",
-    "//net",
-    "//third_party/google_toolbox_for_mac",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index 4bf6415e879..ea440e7e0e8 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -17,16 +17,11 @@ source_set("infobars") {
     "//base",
     "//ios/chrome/browser",
     "//ios/chrome/browser/infobars",
-    "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui/authentication",
+    "//ios/chrome/browser/infobars:badge",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/infobars/coordinators",
-    "//ios/chrome/browser/ui/infobars/presentation",
-    "//ios/chrome/browser/ui/settings/sync/utils",
-    "//ios/chrome/browser/ui/signin_interaction/public",
-    "//ios/chrome/browser/ui/translate",
     "//ios/chrome/browser/upgrade",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/browser/web_state_list",
@@ -55,6 +50,7 @@ source_set("infobars_ui") {
   sources = [
     "confirm_infobar_view.h",
     "confirm_infobar_view.mm",
+    "infobar_badge_ui_delegate.h",
     "infobar_constants.h",
     "infobar_constants.mm",
     "infobar_container_consumer.h",
@@ -67,6 +63,7 @@ source_set("infobars_ui") {
     "resources:infobar_downloading",
     "resources:infobar_passwords_icon",
     "resources:infobar_popup_blocker",
+    "resources:infobar_settings_icon",
     "resources:infobar_warning",
     "//base",
     "//base:i18n",
diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
index aa42e0742a0..cd02ebee5da 100644
--- a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn
@@ -10,6 +10,30 @@ source_set("banners") {
     "infobar_banner_view_controller.mm",
   ]
   deps = [
+    ":public",
+    "//base",
     "//ios/chrome/browser/ui/util",
   ]
 }
+
+source_set("public") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "infobar_banner_constants.h",
+    "infobar_banner_constants.mm",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "infobar_banner_view_controller_unittest.mm",
+  ]
+  deps = [
+    ":banners",
+    "//ios/chrome/test:test_support",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
index 83644899ff9..72091d07550 100644
--- a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn
@@ -7,7 +7,9 @@ source_set("coordinators") {
   sources = [
     "infobar_confirm_coordinator.h",
     "infobar_confirm_coordinator.mm",
-    "infobar_coordinating.h",
+    "infobar_coordinator.h",
+    "infobar_coordinator.mm",
+    "infobar_coordinator_implementation.h",
     "infobar_password_coordinator.h",
     "infobar_password_coordinator.mm",
   ]
@@ -17,9 +19,12 @@ source_set("coordinators") {
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/passwords:public",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/infobars:infobars_ui",
     "//ios/chrome/browser/ui/infobars/banners",
     "//ios/chrome/browser/ui/infobars/modals",
     "//ios/chrome/browser/ui/infobars/presentation",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
index 31837bcae24..971e2ff22e3 100644
--- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn
@@ -8,5 +8,24 @@ source_set("modals") {
     "infobar_modal_delegate.h",
     "infobar_modal_view_controller.h",
     "infobar_modal_view_controller.mm",
+    "infobar_password_modal_delegate",
+    "infobar_password_table_view_controller.h",
+    "infobar_password_table_view_controller.mm",
+  ]
+  deps = [
+    ":public",
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ui/base",
+  ]
+}
+
+source_set("public") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "infobar_modal_constants.h",
+    "infobar_modal_constants.mm",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
index 4a712d61be9..6a639ce5e78 100644
--- a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn
@@ -7,14 +7,20 @@ source_set("presentation") {
   sources = [
     "infobar_banner_animator.h",
     "infobar_banner_animator.mm",
+    "infobar_banner_positioner.h",
     "infobar_banner_presentation_controller.h",
     "infobar_banner_presentation_controller.mm",
+    "infobar_banner_transition_driver.h",
+    "infobar_banner_transition_driver.mm",
     "infobar_expand_banner_animator.h",
     "infobar_expand_banner_animator.mm",
     "infobar_modal_presentation_controller.h",
     "infobar_modal_presentation_controller.mm",
+    "infobar_modal_transition_driver.h",
+    "infobar_modal_transition_driver.mm",
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
index 65ebd2f2a90..1da4e819014 100644
--- a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn
@@ -39,3 +39,12 @@ imageset("infobar_passwords_icon") {
     "infobar_passwords_icon.imageset/infobar_passwords_icon@3x.png",
   ]
 }
+
+imageset("infobar_settings_icon") {
+  sources = [
+    "infobar_settings_icon.imageset/Contents.json",
+    "infobar_settings_icon.imageset/infobar_settings_icon.png",
+    "infobar_settings_icon.imageset/infobar_settings_icon@2x.png",
+    "infobar_settings_icon.imageset/infobar_settings_icon@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
index eec343de948..a8aef36ba8f 100644
--- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn
@@ -27,3 +27,30 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 }
+
+source_set("eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "keyboard_commands_egtest.mm",
+  ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/browser_view",
+    "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/test/app:test_support",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/web/public/test/http_server",
+  ]
+  libs = [
+    "UIKit.framework",
+    "XCTest.framework",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index 1a32fb7a0da..40702c59137 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -5,8 +5,6 @@
 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",
@@ -47,6 +45,7 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/infobars:feature_flags",
@@ -123,6 +122,15 @@ source_set("constants") {
   ]
 }
 
+# TODO(crbug.com/778008): Remove this target.
+source_set("notifications") {
+  sources = [
+    "location_bar_notification_names.h",
+    "location_bar_notification_names.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn
index c1838cc1239..843a72292d7 100644
--- a/chromium/ios/chrome/browser/ui/main/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn
@@ -39,6 +39,7 @@ source_set("main") {
     "//ios/chrome/browser/ui/app_launcher",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/browser_container",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/download",
@@ -57,9 +58,6 @@ source_set("main") {
     "//ios/public/provider/chrome/browser",
     "//net",
   ]
-  public_deps = [
-    "//ios/chrome/browser/ui:ui_internal",
-  ]
   libs = [ "UIKit.framework" ]
 }
 
@@ -92,7 +90,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/test:block_cleanup_test",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index a5479f1008b..7b4930f13a8 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -55,12 +55,12 @@ source_set("ntp_controller") {
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util",
+    "//ios/chrome/browser/ui/location_bar:notifications",
     "//ios/chrome/browser/url_loading",
     "//ios/public/provider/chrome/browser/voice",
     "//ui/base",
@@ -133,13 +133,13 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/suggestions",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/bookmarks",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/location_bar:notifications",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
@@ -257,7 +257,7 @@ source_set("perf_tests") {
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/test:perf_test_support",
-    "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index a364f13203e..f791d273009 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -23,15 +23,6 @@ source_set("omnibox_popup_shared") {
   sources = [
     "omnibox_constants.h",
     "omnibox_constants.mm",
-    "truncating_attributed_label.h",
-    "truncating_attributed_label.mm",
-  ]
-  deps = [
-    "//base",
-    "//components/omnibox/browser",
-  ]
-  public_deps = [
-    "//ui/base",
   ]
 }
 
@@ -43,6 +34,13 @@ source_set("omnibox_util") {
     "omnibox_util.mm",
   ]
   deps = [
+    "resources:omnibox_background",
+    "resources:omnibox_clear_icon",
+    "resources:omnibox_completion_bookmark",
+    "resources:omnibox_completion_calculator",
+    "resources:omnibox_completion_default_favicon",
+    "resources:omnibox_completion_history",
+    "resources:omnibox_completion_search",
     "//base",
     "//components/omnibox/browser",
     "//components/security_state/core",
@@ -55,13 +53,8 @@ source_set("omnibox_util") {
 source_set("omnibox_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "autocomplete_match_formatter.h",
-    "autocomplete_match_formatter.mm",
-    "autocomplete_result_consumer.h",
-    "autocomplete_suggestion.h",
     "chrome_omnibox_client_ios.h",
     "chrome_omnibox_client_ios.mm",
-    "image_retriever.h",
     "omnibox_consumer.h",
     "omnibox_container_view.h",
     "omnibox_container_view.mm",
@@ -85,24 +78,15 @@ source_set("omnibox_internal") {
     ":omnibox",
     ":omnibox_popup_shared",
     ":omnibox_util",
-    "resources:omnibox_background",
-    "resources:omnibox_clear_icon",
-    "resources:omnibox_completion_bookmark",
-    "resources:omnibox_completion_calculator",
-    "resources:omnibox_completion_default_favicon",
-    "resources:omnibox_completion_history",
-    "resources:omnibox_completion_search",
     "resources:omnibox_transparent_background",
     "//base",
     "//components/favicon/ios",
-    "//components/image_fetcher/ios",
     "//components/open_from_clipboard:",
     "//components/resources",
     "//components/search_engines",
     "//components/security_state/core",
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/bookmarks",
@@ -119,13 +103,11 @@ source_set("omnibox_internal") {
     "//ios/chrome/browser/ui/location_bar:constants",
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator:orchestrator",
-    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/public/provider/chrome/browser",
-    "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
     "//net",
@@ -136,10 +118,6 @@ source_set("omnibox_internal") {
     "//ui/gfx/geometry",
     "//url",
   ]
-  allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/omnibox/popup",
-    ":omnibox",
-  ]
   public_deps = [
     "//components/omnibox/browser",
   ]
@@ -184,3 +162,34 @@ bundle_data("resources_unit_tests") {
         "ios/chrome/test/data/omnibox/{{source_file_part}}",
   ]
 }
+
+source_set("perf_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "omnibox_perftest.mm",
+  ]
+  deps = [
+    ":omnibox_internal",
+    "//base",
+    "//base/test:test_support",
+    "//components/omnibox/browser:test_support",
+    "//ios/chrome/browser/autocomplete",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/tabs:tabs_internal",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate",
+    "//ios/chrome/browser/ui/toolbar",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/test/base:perf_test_support",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base:test_support",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 0765e2abafa..8be7717384b 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -11,14 +11,13 @@ source_set("popup") {
     "omnibox_popup_presenter.h",
     "omnibox_popup_presenter.mm",
     "omnibox_popup_provider.h",
-    "omnibox_popup_view_controller.h",
-    "omnibox_popup_view_controller.mm",
     "omnibox_popup_view_ios.h",
     "omnibox_popup_view_ios.mm",
     "omnibox_popup_view_suggestions_delegate.h",
   ]
   deps = [
     ":popup_internal",
+    ":popup_ui",
     "//base",
     "//components/image_fetcher/ios",
     "//components/omnibox/browser",
@@ -26,43 +25,82 @@ source_set("popup") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui:ui",
+    "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:util",
-    "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
     "//ios/chrome/browser/ui/omnibox:omnibox_util",
     "//ios/chrome/browser/ui/omnibox/popup/shortcuts",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
-    "//ios/chrome/browser/ui/toolbar/public:public",
-    "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/browser/web_state_list:web_state_list",
+    "//ios/chrome/common/favicon",
     "//ios/web/public:public",
     "//net",
+    "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("popup_internal") {
+source_set("popup_ui") {
   sources = [
+    "autocomplete_result_consumer.h",
+    "autocomplete_suggestion.h",
+    "favicon_retriever.h",
+    "image_retriever.h",
+    "omnibox_popup_base_view_controller+internal.h",
+    "omnibox_popup_base_view_controller.h",
+    "omnibox_popup_base_view_controller.mm",
+    "omnibox_popup_legacy_view_controller.h",
+    "omnibox_popup_legacy_view_controller.mm",
     "omnibox_popup_row.h",
     "omnibox_popup_row.mm",
+    "omnibox_popup_row_cell.h",
+    "omnibox_popup_row_cell.mm",
+    "omnibox_popup_truncating_label.h",
+    "omnibox_popup_truncating_label.mm",
+    "omnibox_popup_view_controller.h",
+    "omnibox_popup_view_controller.mm",
     "self_sizing_table_view.h",
     "self_sizing_table_view.mm",
   ]
   deps = [
     "resources:omnibox_popup_tab_match",
     "//base",
-    "//components/image_fetcher/ios",
-    "//components/omnibox/browser",
-    "//ios/chrome/app/theme:theme",
-    "//ios/chrome/browser/browser_state",
+    "//components/omnibox/common",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/theme",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared",
+    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util:util",
-    "//net",
+    "//ios/chrome/common/ui_util",
+    "//ui/base",
+    "//url",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("popup_internal") {
+  sources = [
+    "autocomplete_match_formatter.h",
+    "autocomplete_match_formatter.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/omnibox/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/ui/omnibox:omnibox_util",
+    "//ios/chrome/browser/ui/util",
+    "//ios/third_party/material_components_ios",
+  ]
+
+  # Temporary until ios_internal CL is submitted
+  public_deps = [
+    ":popup_ui",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
@@ -76,11 +114,11 @@ source_set("unit_tests") {
   deps = [
     ":popup",
     ":popup_internal",
+    ":popup_ui",
     "//base",
     "//components/omnibox/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
-    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//testing/gtest",
     "//ui/base",
   ]
@@ -93,6 +131,7 @@ source_set("eg_tests") {
   ]
   deps = [
     ":popup_internal",
+    ":popup_ui",
     "//base",
     "//base/test:test_support",
     "//components/omnibox/browser",
diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn
new file mode 100644
index 00000000000..5267ee9cf76
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn
@@ -0,0 +1,51 @@
+# Copyright 2019 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("open_in") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "open_in_controller.h",
+    "open_in_controller.mm",
+    "open_in_controller_testing.h",
+    "open_in_toolbar.h",
+    "open_in_toolbar.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui_util",
+    "//ios/chrome/common/ui_util",
+    "//ios/third_party/material_components_ios",
+    "//ios/web/public",
+    "//net",
+    "//services/network/public/cpp",
+    "//ui/base",
+    "//ui/gfx",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "open_in_controller_unittest.mm",
+    "open_in_toolbar_unittest.mm",
+  ]
+  deps = [
+    ":open_in",
+    "//ios/web/public/test",
+    "//ios/web/public/test/fakes",
+    "//net",
+    "//net:test_support",
+    "//services/network:test_support",
+    "//services/network/public/cpp",
+    "//testing/gtest",
+    "//third_party/ocmock",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 01aefa8fa0b..73d2858cfb6 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -25,10 +25,10 @@ source_set("overscroll_actions") {
     "//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",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
+    "//ios/chrome/browser/ui/location_bar:notifications",
     "//ios/chrome/browser/ui/page_info:coordinator",
     "//ios/chrome/browser/ui/side_swipe",
     "//ios/chrome/browser/ui/static_content",
@@ -37,7 +37,8 @@ source_set("overscroll_actions") {
     "//ios/chrome/browser/ui/voice",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
-    "//ios/web",
+    "//ios/web/common",
+    "//ios/web/public",
     "//ui/base",
     "//ui/gfx",
   ]
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index 098990985fd..f06e19be0b2 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -36,11 +36,14 @@ source_set("popup_menu") {
     "resources:popup_menu_settings",
     "resources:popup_menu_site_information",
     "resources:popup_menu_stop",
+    "resources:popup_menu_translate",
     "resources:popup_menu_voice_search",
     "//base",
     "//components/bookmarks/browser",
     "//components/feature_engagement/public",
+    "//components/language/ios/browser",
     "//components/open_from_clipboard",
+    "//components/translate/core/browser",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
@@ -49,6 +52,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/find_in_page",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
@@ -93,6 +97,7 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/feature_engagement/test:test_support",
+    "//components/language/ios/browser",
     "//components/reading_list/core",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/ui/popup_menu/cells",
@@ -127,7 +132,6 @@ source_set("eg_tests") {
     "//base",
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:web_internal",
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 e152c0cf9e5..d4be342cad8 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -112,6 +112,14 @@ imageset("popup_menu_new_incognito_tab") {
   ]
 }
 
+imageset("popup_menu_translate") {
+  sources = [
+    "popup_menu_translate.imageset/Contents.json",
+    "popup_menu_translate.imageset/popup_menu_translate@2x.png",
+    "popup_menu_translate.imageset/popup_menu_translate@3x.png",
+  ]
+}
+
 imageset("popup_menu_find_in_page") {
   sources = [
     "popup_menu_find_in_page.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 0737ab76754..2644bfed327 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -68,7 +68,6 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui:ui",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/location_bar",
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index 22509db5eb2..a9157fdbe0f 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -186,6 +186,7 @@ source_set("eg_tests") {
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/third_party/material_components_ios",
     "//ios/web",
+    "//ios/web/common:common",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/http_server",
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 0a31daa9c59..c94b317b24a 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -31,6 +31,7 @@ source_set("recent_tabs") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//services/identity/public/cpp",
     "//ui/base",
   ]
@@ -125,8 +126,10 @@ source_set("eg_tests") {
     ":recent_tabs_ui",
     "//base/test:test_support",
     "//components/strings",
+    "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/history:history_ui",
     "//ios/chrome/browser/ui/table_view",
diff --git a/chromium/ios/chrome/browser/ui/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/resources/BUILD.gn
index f8fe677628c..f22869b9d5f 100644
--- a/chromium/ios/chrome/browser/ui/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/resources/BUILD.gn
@@ -4,46 +4,6 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
-imageset("custom_row_voice_pressed") {
-  sources = [
-    "custom_row_voice_pressed.imageset/Contents.json",
-    "custom_row_voice_pressed.imageset/custom_row_voice_pressed.png",
-    "custom_row_voice_pressed.imageset/custom_row_voice_pressed@2x.png",
-    "custom_row_voice_pressed.imageset/custom_row_voice_pressed@2x~ipad.png",
-    "custom_row_voice_pressed.imageset/custom_row_voice_pressed@3x.png",
-    "custom_row_voice_pressed.imageset/custom_row_voice_pressed~ipad.png",
-  ]
-}
-
-imageset("keyboard_bg_portrait_tablet") {
-  sources = [
-    "keyboard_bg_portrait_tablet.imageset/Contents.json",
-    "keyboard_bg_portrait_tablet.imageset/keyboard_bg_portrait_tablet.png",
-  ]
-}
-
-imageset("custom_row_voice") {
-  sources = [
-    "custom_row_voice.imageset/Contents.json",
-    "custom_row_voice.imageset/custom_row_voice.png",
-    "custom_row_voice.imageset/custom_row_voice@2x.png",
-    "custom_row_voice.imageset/custom_row_voice@2x~ipad.png",
-    "custom_row_voice.imageset/custom_row_voice@3x.png",
-    "custom_row_voice.imageset/custom_row_voice~ipad.png",
-  ]
-}
-
-imageset("keyboard_button") {
-  sources = [
-    "keyboard_button.imageset/Contents.json",
-    "keyboard_button.imageset/keyboard_button.png",
-    "keyboard_button.imageset/keyboard_button@2x.png",
-    "keyboard_button.imageset/keyboard_button@2x~ipad.png",
-    "keyboard_button.imageset/keyboard_button@3x.png",
-    "keyboard_button.imageset/keyboard_button~ipad.png",
-  ]
-}
-
 imageset("menu_shadow") {
   sources = [
     "menu_shadow.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index 52dc9bcf872..45cb9df4c78 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -24,6 +24,7 @@ source_set("settings_root") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
@@ -124,7 +125,9 @@ source_set("settings") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/browser_state:browser_state_impl",
     "//ios/chrome/browser/browsing_data",
+    "//ios/chrome/browser/browsing_data:feature_flags",
     "//ios/chrome/browser/content_settings",
+    "//ios/chrome/browser/favicon",
     "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/mailto:feature_flags",
@@ -153,6 +156,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/payments/cells",
     "//ios/chrome/browser/ui/settings/autofill",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/password",
@@ -168,6 +172,7 @@ source_set("settings") {
     "//ios/chrome/browser/voice",
     "//ios/chrome/browser/web:web",
     "//ios/chrome/common",
+    "//ios/chrome/common/favicon",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/mailto",
@@ -207,10 +212,10 @@ source_set("test_support") {
     ":settings_root",
     "//base",
     "//components/autofill/core/browser",
-    "//components/browser_sync:test_support",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/sync",
+    "//components/sync:test_support_driver",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//google_apis",
@@ -258,6 +263,7 @@ source_set("unit_tests") {
     "//components/content_settings/core/browser",
     "//components/google/core/browser",
     "//components/handoff",
+    "//components/language/core/browser",
     "//components/password_manager/core/browser:test_support",
     "//components/password_manager/core/common",
     "//components/payments/core",
@@ -269,6 +275,7 @@ source_set("unit_tests") {
     "//components/sync_preferences:test_support",
     "//components/translate/core/browser",
     "//components/translate/core/common",
+    "//components/ukm/ios:features",
     "//components/unified_consent",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -339,6 +346,7 @@ source_set("eg_tests") {
     "//components/prefs",
     "//components/search_engines",
     "//components/strings",
+    "//components/ukm/ios:features",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
@@ -351,7 +359,6 @@ source_set("eg_tests") {
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/settings:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index d40ada12b37..88f3b8e9648 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -18,10 +18,8 @@ source_set("cells") {
     "copied_to_chrome_item.mm",
     "passphrase_error_item.h",
     "passphrase_error_item.mm",
-    "settings_cells_constants.h",
-    "settings_cells_constants.mm",
-    "settings_detail_item.h",
-    "settings_detail_item.mm",
+    "search_engine_item.h",
+    "search_engine_item.mm",
     "settings_image_detail_text_cell.h",
     "settings_image_detail_text_cell.mm",
     "settings_image_detail_text_item.h",
@@ -43,11 +41,13 @@ source_set("cells") {
   ]
 
   deps = [
+    ":public",
     "//components/autofill/core/browser",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
@@ -66,6 +66,14 @@ source_set("cells") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("public") {
+  sources = [
+    "settings_cells_constants.h",
+    "settings_cells_constants.mm",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -74,6 +82,7 @@ source_set("unit_tests") {
     "clear_browsing_data_item_unittest.mm",
     "copied_to_chrome_item_unittest.mm",
     "passphrase_error_item_unittest.mm",
+    "search_engine_item_unittest.mm",
     "settings_multiline_detail_item_unittest.mm",
     "version_item_unittest.mm",
   ]
@@ -90,9 +99,11 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/browsing_data:counters",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/collection_view/cells:test_support",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/web/public/test:test",
     "//testing/gtest",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
index 5f8b42a422f..e66362c6159 100644
--- a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn
@@ -15,10 +15,15 @@ source_set("clear_browsing_data") {
     "clear_browsing_data_table_view_controller.mm",
     "clear_browsing_data_ui_constants.h",
     "clear_browsing_data_ui_constants.mm",
-    "time_range_selector_collection_view_controller.h",
-    "time_range_selector_collection_view_controller.mm",
+    "time_range_selector_table_view_controller.h",
+    "time_range_selector_table_view_controller.mm",
   ]
   deps = [
+    "resources:clear_browsing_data_autofill",
+    "resources:clear_browsing_data_cached_images",
+    "resources:clear_browsing_data_cookies",
+    "resources:clear_browsing_data_history",
+    "resources:clear_browsing_data_passwords",
     "//components/browsing_data/core",
     "//components/feature_engagement/public",
     "//components/history/core/browser",
@@ -32,6 +37,7 @@ source_set("clear_browsing_data") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/colors",
@@ -59,16 +65,16 @@ source_set("unit_tests") {
   sources = [
     "clear_browsing_data_collection_view_controller_unittest.mm",
     "clear_browsing_data_manager_unittest.mm",
-    "time_range_selector_collection_view_controller_unittest.mm",
+    "time_range_selector_table_view_controller_unittest.mm",
   ]
   deps = [
     ":clear_browsing_data",
     "//base",
     "//base/test:test_support",
-    "//components/browser_sync:test_support",
     "//components/browsing_data/core",
     "//components/pref_registry",
     "//components/prefs",
+    "//components/sync:test_support_driver",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//ios/chrome/app/strings",
@@ -79,10 +85,11 @@ source_set("unit_tests") {
     "//ios/chrome/browser/prefs:browser_prefs",
     "//ios/chrome/browser/signin:test_support",
     "//ios/chrome/browser/sync",
-    "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/collection_view:test_support",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/common",
     "//ios/web/public/test",
     "//services/identity/public/cpp:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/resources/BUILD.gn
new file mode 100644
index 00000000000..7b2c9c50cde
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/resources/BUILD.gn
@@ -0,0 +1,45 @@
+# Copyright 2019 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("clear_browsing_data_autofill") {
+  sources = [
+    "clear_browsing_data_autofill.imageset/Contents.json",
+    "clear_browsing_data_autofill.imageset/clear_browsing_data_autofill@2x.png",
+    "clear_browsing_data_autofill.imageset/clear_browsing_data_autofill@3x.png",
+  ]
+}
+
+imageset("clear_browsing_data_cached_images") {
+  sources = [
+    "clear_browsing_data_cached_images.imageset/Contents.json",
+    "clear_browsing_data_cached_images.imageset/clear_browsing_data_cached_images@2x.png",
+    "clear_browsing_data_cached_images.imageset/clear_browsing_data_cached_images@3x.png",
+  ]
+}
+
+imageset("clear_browsing_data_cookies") {
+  sources = [
+    "clear_browsing_data_cookies.imageset/Contents.json",
+    "clear_browsing_data_cookies.imageset/clear_browsing_data_cookies@2x.png",
+    "clear_browsing_data_cookies.imageset/clear_browsing_data_cookies@3x.png",
+  ]
+}
+
+imageset("clear_browsing_data_history") {
+  sources = [
+    "clear_browsing_data_history.imageset/Contents.json",
+    "clear_browsing_data_history.imageset/clear_browsing_data_history@2x.png",
+    "clear_browsing_data_history.imageset/clear_browsing_data_history@3x.png",
+  ]
+}
+
+imageset("clear_browsing_data_passwords") {
+  sources = [
+    "clear_browsing_data_passwords.imageset/Contents.json",
+    "clear_browsing_data_passwords.imageset/clear_browsing_data_passwords@2x.png",
+    "clear_browsing_data_passwords.imageset/clear_browsing_data_passwords@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index e0551e7ce27..462a1bdbebe 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -7,6 +7,10 @@ source_set("google_services") {
   sources = [
     "accounts_table_view_controller.h",
     "accounts_table_view_controller.mm",
+    "advanced_signin_settings_coordinator.h",
+    "advanced_signin_settings_coordinator.mm",
+    "advanced_signin_settings_navigation_controller.h",
+    "advanced_signin_settings_navigation_controller.mm",
     "google_services_navigation_coordinator.h",
     "google_services_navigation_coordinator.mm",
     "google_services_settings_command_handler.h",
@@ -15,6 +19,7 @@ source_set("google_services") {
     "google_services_settings_coordinator.mm",
     "google_services_settings_mediator.h",
     "google_services_settings_mediator.mm",
+    "google_services_settings_mode.h",
     "google_services_settings_service_delegate.h",
     "google_services_settings_view_controller.h",
     "google_services_settings_view_controller.mm",
@@ -31,6 +36,7 @@ source_set("google_services") {
     "manage_sync_settings_view_controller_model_delegate.h",
   ]
   deps = [
+    "resources:google_services_enterprise",
     "resources:google_services_sync_error",
     "//base",
     "//components/autofill/core/common",
@@ -40,6 +46,7 @@ source_set("google_services") {
     "//components/prefs",
     "//components/strings",
     "//components/sync",
+    "//components/ukm/ios:features",
     "//components/unified_consent",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
@@ -68,6 +75,8 @@ source_set("google_services") {
     "//services/identity/public/objc",
     "//ui/base",
   ]
+  allow_circular_includes_from =
+      [ "//ios/chrome/browser/ui/signin_interaction" ]
 }
 
 source_set("eg_tests") {
@@ -108,12 +117,16 @@ source_set("unified_consent_eg_tests") {
     "//base",
     "//base/test:test_support",
     "//components/prefs",
+    "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings:ios_chromium_strings_grit",
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
+    "//ios/public/provider/chrome/browser/signin:test_support",
     "//ui/base",
   ]
   libs = [
diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/resources/BUILD.gn
index a20471a69f0..cf88dba332c 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/resources/BUILD.gn
@@ -4,6 +4,14 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
+imageset("google_services_enterprise") {
+  sources = [
+    "google_services_enterprise.imageset/Contents.json",
+    "google_services_enterprise.imageset/google_services_enterprise@2x.png",
+    "google_services_enterprise.imageset/google_services_enterprise@3x.png",
+  ]
+}
+
 imageset("google_services_sync_error") {
   sources = [
     "google_services_sync_error.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index c71b6f7e945..68636df2cc6 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -34,6 +34,7 @@ source_set("password") {
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
@@ -113,6 +114,7 @@ source_set("eg_tests") {
     "//components/password_manager/core/common",
     "//components/prefs",
     "//components/strings",
+    "//components/ukm/ios:features",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
@@ -123,6 +125,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/material_components_ios",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test:util",
     "//ios/web/public/test/http_server",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
index e321c8a1b6a..8b1ae979208 100644
--- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn
@@ -22,6 +22,7 @@ source_set("sync") {
     "//components/prefs",
     "//components/strings",
     "//components/sync",
+    "//components/unified_consent",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser",
@@ -64,11 +65,10 @@ source_set("unit_tests") {
   deps = [
     ":sync",
     "//base/test:test_support",
-    "//base/test:test_support",
     "//components/autofill/core/common",
-    "//components/browser_sync:test_support",
     "//components/google/core/common",
     "//components/strings",
+    "//components/sync:test_support_driver",
     "//components/sync_preferences",
     "//components/sync_preferences:test_support",
     "//components/unified_consent",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index 0cd14b9c5d2..3a7827d1559 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -9,6 +9,8 @@ source_set("side_swipe") {
     "card_side_swipe_view.mm",
     "side_swipe_controller.h",
     "side_swipe_controller.mm",
+    "side_swipe_gesture_recognizer.h",
+    "side_swipe_gesture_recognizer.mm",
     "side_swipe_navigation_view.h",
     "side_swipe_navigation_view.mm",
     "side_swipe_util.h",
@@ -39,7 +41,7 @@ source_set("side_swipe") {
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
-    "//ios/web/public",
+    "//ios/web/common",
     "//ui/base",
     "//url",
   ]
@@ -59,6 +61,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/web_state_list",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn
index 1c94bffaa8c..0d48100f381 100644
--- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn
@@ -56,3 +56,24 @@ source_set("eg_tests") {
   ]
   libs = [ "XCTest.framework" ]
 }
+
+source_set("unity_eg_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "signin_interaction_controller_unity_egtest.mm",
+  ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//components/unified_consent",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/testing/earl_grey:earl_grey_support",
+    "//ui/base",
+  ]
+  libs = [ "XCTest.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
index 120c1456645..836814a9715 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
@@ -12,8 +12,6 @@ source_set("tab_grid") {
     "tab_grid_coordinator.mm",
     "tab_grid_mediator.h",
     "tab_grid_mediator.mm",
-    "tab_grid_url_loader.h",
-    "tab_grid_url_loader.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -39,6 +37,7 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/main:tab_switcher",
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
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 30d47cb54d2..a559b47d669 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -10,6 +10,8 @@ source_set("cells") {
     "table_view_cell.mm",
     "table_view_cells_constants.h",
     "table_view_cells_constants.mm",
+    "table_view_detail_icon_item.h",
+    "table_view_detail_icon_item.mm",
     "table_view_detail_text_item.h",
     "table_view_detail_text_item.mm",
     "table_view_disclosure_header_footer_item.h",
@@ -24,6 +26,8 @@ source_set("cells") {
     "table_view_link_header_footer_item.mm",
     "table_view_text_button_item.h",
     "table_view_text_button_item.mm",
+    "table_view_text_edit_item.h",
+    "table_view_text_edit_item.mm",
     "table_view_text_header_footer_item.h",
     "table_view_text_header_footer_item.mm",
     "table_view_text_item.h",
@@ -38,15 +42,16 @@ source_set("cells") {
 
   deps = [
     "resources:table_view_cell_chevron",
+    "resources:table_view_cell_edit_icon",
     "resources:table_view_cell_favicon_background",
     "//base",
     "//base:i18n",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/colors:colors",
     "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",
-    "//ios/chrome/browser/ui/util",
     "//ios/chrome/common",
     "//ios/chrome/common/favicon",
     "//ios/chrome/common/ui_util",
@@ -66,6 +71,7 @@ source_set("unit_tests") {
     "table_view_image_item_unittest.mm",
     "table_view_item_unittest.mm",
     "table_view_text_button_item_unittest.mm",
+    "table_view_text_edit_item_unittest.mm",
     "table_view_text_header_footer_item_unittest.mm",
     "table_view_text_item_unittest.mm",
     "table_view_url_item_unittest.mm",
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
index 5529492449c..b98df7d1596 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn
@@ -30,3 +30,11 @@ imageset("table_view_cell_favicon_background") {
     "table_view_cell_favicon_background.imageset/table_view_cell_favicon_background@3x.png",
   ]
 }
+
+imageset("table_view_cell_edit_icon") {
+  sources = [
+    "table_view_cell_edit_icon.imageset/Contents.json",
+    "table_view_cell_edit_icon.imageset/table_view_cell_edit_icon@2x.png",
+    "table_view_cell_edit_icon.imageset/table_view_cell_edit_icon@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index e87784d65c5..9e6952066fd 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -54,6 +54,7 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/ntp:util",
+    "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/tab_grid/grid/resources:grid_cell_close_button",
     "//ios/chrome/browser/ui/tabs/requirements",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index a6420c2b9a0..775ae4b622f 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -169,7 +169,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//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/omnibox/popup:popup_ui",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tab_grid:egtest_support",
     "//ios/chrome/browser/ui/toolbar/buttons",
@@ -180,6 +180,7 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//ui/base",
   ]
diff --git a/chromium/ios/chrome/browser/ui/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/BUILD.gn
index 7653127aa8b..ab67d428dc2 100644
--- a/chromium/ios/chrome/browser/ui/translate/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/translate/BUILD.gn
@@ -83,6 +83,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":translate",
+    "//components/language/ios/browser",
     "//components/translate/core/browser:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/translate",
diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn
index 0d5975338e2..3afba1b7dfb 100644
--- a/chromium/ios/chrome/browser/ui/util/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn
@@ -7,6 +7,8 @@ source_set("util") {
   sources = [
     "CRUILabel+AttributeUtils.h",
     "CRUILabel+AttributeUtils.mm",
+    "accessibility_close_menu_button.h",
+    "accessibility_close_menu_button.mm",
     "animation_util.h",
     "animation_util.mm",
     "core_text_util.h",
@@ -17,6 +19,8 @@ source_set("util") {
     "force_touch_long_press_gesture_recognizer.mm",
     "i18n_string.h",
     "i18n_string.mm",
+    "keyboard_observer_helper.h",
+    "keyboard_observer_helper.mm",
     "label_link_controller.h",
     "label_link_controller.mm",
     "label_observer.h",
@@ -61,6 +65,7 @@ source_set("util") {
     "//base",
     "//base:i18n",
     "//ios/chrome/app:tests_hook",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
@@ -79,6 +84,19 @@ source_set("util") {
   ]
 }
 
+source_set("terms_util") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "terms_util.h",
+    "terms_util.mm",
+  ]
+  deps = [
+    ":terms_resources",
+    "//base",
+    "//ios/chrome/browser",
+  ]
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -92,11 +110,13 @@ source_set("unit_tests") {
     "manual_text_framer_unittest.mm",
     "named_guide_unittest.mm",
     "optional_property_animator_unittest.mm",
+    "terms_util_unittest.mm",
     "text_region_mapper_unittest.mm",
     "ui_util_unittest.mm",
     "uikit_ui_util_unittest.mm",
   ]
   deps = [
+    ":terms_util",
     ":util",
     "//base",
     "//ios/third_party/material_components_ios",
@@ -106,3 +126,66 @@ source_set("unit_tests") {
     "//url",
   ]
 }
+
+bundle_data("terms_resources") {
+  sources = [
+    # On iOS, the terms of service file need to be loaded from the application
+    # bundle, not from a datapack. As GetTermsOfServicePath() returns path to
+    # those files, they are added to //ios/chrome/browser/ui/util:terms_resources.
+    "//components/resources/terms/terms_am.html",
+    "//components/resources/terms/terms_ar.html",
+    "//components/resources/terms/terms_bg.html",
+    "//components/resources/terms/terms_bn.html",
+    "//components/resources/terms/terms_ca.html",
+    "//components/resources/terms/terms_cs.html",
+    "//components/resources/terms/terms_da.html",
+    "//components/resources/terms/terms_de.html",
+    "//components/resources/terms/terms_el.html",
+    "//components/resources/terms/terms_en-GB.html",
+    "//components/resources/terms/terms_en.html",
+    "//components/resources/terms/terms_es-419.html",
+    "//components/resources/terms/terms_es.html",
+    "//components/resources/terms/terms_et.html",
+    "//components/resources/terms/terms_fa.html",
+    "//components/resources/terms/terms_fi.html",
+    "//components/resources/terms/terms_fil.html",
+    "//components/resources/terms/terms_fr.html",
+    "//components/resources/terms/terms_gu.html",
+    "//components/resources/terms/terms_he.html",
+    "//components/resources/terms/terms_hi.html",
+    "//components/resources/terms/terms_hr.html",
+    "//components/resources/terms/terms_hu.html",
+    "//components/resources/terms/terms_id.html",
+    "//components/resources/terms/terms_it.html",
+    "//components/resources/terms/terms_ja.html",
+    "//components/resources/terms/terms_kn.html",
+    "//components/resources/terms/terms_ko.html",
+    "//components/resources/terms/terms_lt.html",
+    "//components/resources/terms/terms_lv.html",
+    "//components/resources/terms/terms_ml.html",
+    "//components/resources/terms/terms_mr.html",
+    "//components/resources/terms/terms_nb.html",
+    "//components/resources/terms/terms_nl.html",
+    "//components/resources/terms/terms_pl.html",
+    "//components/resources/terms/terms_pt-BR.html",
+    "//components/resources/terms/terms_pt-PT.html",
+    "//components/resources/terms/terms_ro.html",
+    "//components/resources/terms/terms_ru.html",
+    "//components/resources/terms/terms_sk.html",
+    "//components/resources/terms/terms_sl.html",
+    "//components/resources/terms/terms_sr.html",
+    "//components/resources/terms/terms_sv.html",
+    "//components/resources/terms/terms_sw.html",
+    "//components/resources/terms/terms_ta.html",
+    "//components/resources/terms/terms_te.html",
+    "//components/resources/terms/terms_th.html",
+    "//components/resources/terms/terms_tr.html",
+    "//components/resources/terms/terms_uk.html",
+    "//components/resources/terms/terms_vi.html",
+    "//components/resources/terms/terms_zh-CN.html",
+    "//components/resources/terms/terms_zh-TW.html",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
index 8ab4e7727c9..9191715cb7d 100644
--- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
@@ -64,6 +64,7 @@ source_set("webui") {
     "//ios/chrome/browser/suggestions",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/util:terms_util",
     "//ios/chrome/browser/web:java_script_console",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common",
@@ -99,6 +100,7 @@ source_set("webui_internal") {
     "//ios/chrome/browser/ui/webui/gcm",
     "//ios/chrome/browser/ui/webui/net_export",
     "//ios/chrome/browser/ui/webui/sync_internals",
+    "//ios/chrome/browser/ui/webui/translate_internals",
     "//ios/web",
     "//services/identity/public/cpp",
     "//url",
@@ -122,6 +124,7 @@ source_set("eg_tests") {
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/web",
+    "//ios/web/public/test:element_selector",
     "//ui/base",
     "//url",
   ]
diff --git a/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn
new file mode 100644
index 00000000000..0771ed4698a
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2019 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("translate_internals") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "ios_translate_internals_handler.h",
+    "ios_translate_internals_handler.mm",
+    "translate_internals_ui.h",
+    "translate_internals_ui.mm",
+  ]
+  deps = [
+    "//components/language/ios/browser",
+    "//components/translate/core/common",
+    "//components/translate/translate_internals",
+    "//ios/chrome/app/resources:ios_resources",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/translate",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/url_loading/BUILD.gn b/chromium/ios/chrome/browser/url_loading/BUILD.gn
index 8c556163d67..ffb5bf39cad 100644
--- a/chromium/ios/chrome/browser/url_loading/BUILD.gn
+++ b/chromium/ios/chrome/browser/url_loading/BUILD.gn
@@ -5,6 +5,10 @@
 source_set("url_loading") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "app_url_loading_service.h",
+    "app_url_loading_service.mm",
+    "test_app_url_loading_service.h",
+    "test_app_url_loading_service.mm",
     "test_url_loading_service.h",
     "test_url_loading_service.mm",
     "url_loading_notifier.h",
@@ -26,11 +30,14 @@ source_set("url_loading") {
     "//base",
     "//components/keyed_service/ios",
     "//components/sessions",
+    "//ios/chrome/app:mode",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/feature_engagement",
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/prerender",
     "//ios/chrome/browser/sessions",
+    "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
diff --git a/chromium/ios/chrome/browser/voice/BUILD.gn b/chromium/ios/chrome/browser/voice/BUILD.gn
index 959c1c2d959..ab2dda51253 100644
--- a/chromium/ios/chrome/browser/voice/BUILD.gn
+++ b/chromium/ios/chrome/browser/voice/BUILD.gn
@@ -80,7 +80,7 @@ source_set("unit_tests") {
     ":voice",
     "//base",
     "//base/test:test_support",
-    "//ios/web",
+    "//ios/web/common",
     "//ios/web/public/test",
     "//testing/gtest",
     "//third_party/google_toolbox_for_mac",
diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn
index cea272a3415..cd872c4f58e 100644
--- a/chromium/ios/chrome/browser/web/BUILD.gn
+++ b/chromium/ios/chrome/browser/web/BUILD.gn
@@ -17,8 +17,6 @@ source_set("web") {
     "image_fetch_tab_helper.mm",
     "load_timing_tab_helper.h",
     "load_timing_tab_helper.mm",
-    "network_activity_indicator_tab_helper.h",
-    "network_activity_indicator_tab_helper.mm",
     "page_placeholder_tab_helper.h",
     "page_placeholder_tab_helper.mm",
     "repost_form_tab_helper.h",
@@ -43,11 +41,14 @@ source_set("web") {
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/commands:commands",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/util:util",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common/ui_util",
     "//ios/net",
     "//ios/web",
+    "//ios/web/common",
     "//ui/base",
     "//url",
   ]
@@ -86,7 +87,6 @@ source_set("unit_tests") {
     "image_fetch_js_unittest.mm",
     "image_fetch_tab_helper_unittest.mm",
     "load_timing_tab_helper_unittest.mm",
-    "network_activity_indicator_tab_helper_unittest.mm",
     "page_placeholder_tab_helper_unittest.mm",
     "repost_form_tab_helper_unittest.mm",
     "sad_tab_tab_helper_unittest.mm",
@@ -101,15 +101,17 @@ source_set("unit_tests") {
     ":test_support",
     ":web",
     ":web_internal",
-    "//base:base",
+    "//base",
     "//base/test:test_support",
     "//components/search_engines",
+    "//components/services/patch/public/interfaces",
     "//components/services/unzip/public/interfaces",
     "//components/strings:components_strings_grit",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/snapshots",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/test:test_support",
     "//ios/net:test_support",
     "//ios/web",
@@ -122,7 +124,7 @@ source_set("unit_tests") {
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/ocmock",
-    "//ui/base:base",
+    "//ui/base",
     "//url:url",
   ]
 }
@@ -220,6 +222,9 @@ source_set("web_internal") {
     "//components/payments/core",
     "//components/prefs",
     "//components/resources",
+    "//components/services/patch:lib",
+    "//components/services/patch/public/cpp:manifest",
+    "//components/services/patch/public/interfaces",
     "//components/services/unzip:lib",
     "//components/services/unzip/public/cpp:manifest",
     "//components/services/unzip/public/interfaces",
@@ -235,6 +240,7 @@ source_set("web_internal") {
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/ssl",
+    "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/util",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/voice",
@@ -267,7 +273,6 @@ source_set("test_support") {
     "//components/password_manager/core/browser:test_support",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/web",
     "//ios/web",
     "//ios/web/public/test",
@@ -349,9 +354,10 @@ source_set("eg_tests") {
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/third_party/material_components_ios",
-    "//ios/web",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/common",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//net",
     "//net:test_support",
diff --git a/chromium/ios/chrome/common/BUILD.gn b/chromium/ios/chrome/common/BUILD.gn
index 7135ebd9060..193525e9634 100644
--- a/chromium/ios/chrome/common/BUILD.gn
+++ b/chromium/ios/chrome/common/BUILD.gn
@@ -73,6 +73,10 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
+  if (use_xcode_clang) {
+    # TODO(crbug.com/939749): Remove once Xcode's Clang has Clang r355012.
+    defines = [ "XCODE_CLANG" ]
+  }
 }
 
 # The block_unittest.mm has been duplicated during the migration of iOS code
diff --git a/chromium/ios/chrome/common/favicon/BUILD.gn b/chromium/ios/chrome/common/favicon/BUILD.gn
index 5d07dcc61ad..4d59b01652a 100644
--- a/chromium/ios/chrome/common/favicon/BUILD.gn
+++ b/chromium/ios/chrome/common/favicon/BUILD.gn
@@ -4,7 +4,6 @@
 
 source_set("favicon") {
   sources = [
-    "favicon_attributes+private.h",
     "favicon_attributes.h",
     "favicon_attributes.mm",
     "favicon_view.h",
diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 393f666cb51..8eca483208d 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -33,7 +33,6 @@ source_set("test_support") {
     "root_view_controller_test.mm",
     "scoped_block_popups_pref.h",
     "scoped_block_popups_pref.mm",
-    "scoped_eg_synchronization_disabler.h",
     "scoped_key_window.h",
     "testing_application_context.h",
     "testing_application_context.mm",
@@ -69,6 +68,20 @@ source_set("test_support") {
   ]
 }
 
+source_set("eg_test_support") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "scoped_eg_synchronization_disabler.h",
+    "scoped_eg_synchronization_disabler.mm",
+  ]
+  deps = [
+    ":test_support",
+    "//base",
+    "//ios/third_party/earl_grey:earl_grey+link",
+  ]
+}
+
 source_set("block_cleanup_test") {
   # TODO(crbug.com/733237): Replace this comment with an explicit disable_arc config.
   # The files in this target depend on non-ARC memeory management.
@@ -105,8 +118,8 @@ test("ios_chrome_perftests") {
     ios_packed_resources_target,
 
     # Add perf_tests target here.
-    "//ios/chrome/browser/ui:perf_tests",
     "//ios/chrome/browser/ui/ntp:perf_tests",
+    "//ios/chrome/browser/ui/omnibox:perf_tests",
     "//ios/chrome/browser/web:perf_tests",
   ]
 
@@ -139,14 +152,18 @@ 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/infobars:unit_tests",
     "//ios/chrome/browser/itunes_urls:unit_tests",
     "//ios/chrome/browser/language:unit_tests",
     "//ios/chrome/browser/main:unit_tests",
     "//ios/chrome/browser/metrics:unit_tests",
     "//ios/chrome/browser/metrics:unit_tests_internal",
     "//ios/chrome/browser/net:unit_tests",
+    "//ios/chrome/browser/network_activity:unit_tests",
     "//ios/chrome/browser/ntp:unit_tests",
     "//ios/chrome/browser/omaha:unit_tests",
+    "//ios/chrome/browser/overlays:unit_tests",
+    "//ios/chrome/browser/overscroll_actions:unit_tests",
     "//ios/chrome/browser/passwords:unit_tests",
     "//ios/chrome/browser/payments:unit_tests",
     "//ios/chrome/browser/prerender:unit_tests",
@@ -174,6 +191,7 @@ test("ios_chrome_unittests") {
     "//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_view:unit_tests",
     "//ios/chrome/browser/ui/bubble:unit_tests",
     "//ios/chrome/browser/ui/collection_view:unit_tests",
     "//ios/chrome/browser/ui/collection_view/cells:unit_tests",
@@ -193,6 +211,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/history:unit_tests",
     "//ios/chrome/browser/ui/icons:unit_tests",
     "//ios/chrome/browser/ui/infobars:unit_tests",
+    "//ios/chrome/browser/ui/infobars/banners:unit_tests",
     "//ios/chrome/browser/ui/keyboard:unit_tests",
     "//ios/chrome/browser/ui/list_model:unit_tests",
     "//ios/chrome/browser/ui/location_bar:unit_tests",
@@ -202,6 +221,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/ntp_tile_views:unit_tests",
     "//ios/chrome/browser/ui/omnibox:unit_tests",
     "//ios/chrome/browser/ui/omnibox/popup:unit_tests",
+    "//ios/chrome/browser/ui/open_in:unit_tests",
     "//ios/chrome/browser/ui/payments:unit_tests",
     "//ios/chrome/browser/ui/payments/cells:unit_tests",
     "//ios/chrome/browser/ui/popup_menu:unit_tests",
diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn
index 9ffc32b0096..7ee64e3f989 100644
--- a/chromium/ios/chrome/test/app/BUILD.gn
+++ b/chromium/ios/chrome/test/app/BUILD.gn
@@ -45,6 +45,7 @@ source_set("test_support") {
     "//components/metrics",
     "//components/prefs",
     "//components/signin/core/browser",
+    "//components/sync:device_info",
     "//components/sync:test_support_fake_server",
     "//google_apis",
     "//ios/chrome/app:app_internal",
@@ -64,8 +65,8 @@ source_set("test_support") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui:ui_internal",
     "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/browser_view",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/browser/ui/main:tab_switcher",
@@ -79,6 +80,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/tabs",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list/web_usage_enabler",
     "//ios/public/provider/chrome/browser",
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index cb80093d870..95419789f49 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -22,6 +22,10 @@ group("all_tests") {
     ":ios_chrome_tab_grid_egtests",
     ":ios_chrome_translate_egtests",
     ":ios_chrome_ui_egtests",
+    ":ios_chrome_ui_payments_egtests",
+    ":ios_chrome_ui_qr_scanner_egtests",
+    ":ios_chrome_ui_settings_egtests",
+    ":ios_chrome_ui_signin_interaction_egtests",
     ":ios_chrome_unified_consent_egtests",
     ":ios_chrome_web_egtests",
   ]
@@ -88,10 +92,10 @@ chrome_ios_eg_test("ios_chrome_tab_grid_egtests") {
 
 chrome_ios_eg_test("ios_chrome_ui_egtests") {
   deps = [
-    "//ios/chrome/browser/ui:eg_tests",
     "//ios/chrome/browser/ui/activity_services:eg_tests",
     "//ios/chrome/browser/ui/alert_coordinator:eg_tests",
     "//ios/chrome/browser/ui/autofill:eg_tests",
+    "//ios/chrome/browser/ui/browser_view:eg_tests",
     "//ios/chrome/browser/ui/content_suggestions:eg_tests",
     "//ios/chrome/browser/ui/dialogs:eg_tests",
     "//ios/chrome/browser/ui/download:eg_tests",
@@ -100,26 +104,47 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") {
     "//ios/chrome/browser/ui/fullscreen:eg_tests",
     "//ios/chrome/browser/ui/history:eg_tests",
     "//ios/chrome/browser/ui/infobars:eg_tests",
+    "//ios/chrome/browser/ui/keyboard:eg_tests",
     "//ios/chrome/browser/ui/ntp:eg_tests",
     "//ios/chrome/browser/ui/omnibox/popup:eg_tests",
     "//ios/chrome/browser/ui/omnibox/popup/shortcuts:eg_tests",
     "//ios/chrome/browser/ui/page_info:eg_tests",
-    "//ios/chrome/browser/ui/payments:eg_tests",
     "//ios/chrome/browser/ui/popup_menu:eg_tests",
     "//ios/chrome/browser/ui/print:eg_tests",
-    "//ios/chrome/browser/ui/qr_scanner:eg_tests",
     "//ios/chrome/browser/ui/recent_tabs:eg_tests",
     "//ios/chrome/browser/ui/sad_tab:eg_tests",
     "//ios/chrome/browser/ui/safe_mode:eg_tests",
-    "//ios/chrome/browser/ui/settings/sync/utils:eg_tests",
     "//ios/chrome/browser/ui/side_swipe:eg_tests",
-    "//ios/chrome/browser/ui/signin_interaction:eg_tests",
     "//ios/chrome/browser/ui/tabs:eg_tests",
     "//ios/chrome/browser/ui/toolbar:eg_tests",
     "//ios/chrome/browser/ui/webui:eg_tests",
   ]
 }
 
+chrome_ios_eg_test("ios_chrome_ui_payments_egtests") {
+  deps = [
+    "//ios/chrome/browser/ui/payments:eg_tests",
+  ]
+}
+
+chrome_ios_eg_test("ios_chrome_ui_qr_scanner_egtests") {
+  deps = [
+    "//ios/chrome/browser/ui/qr_scanner:eg_tests",
+  ]
+}
+
+chrome_ios_eg_test("ios_chrome_ui_settings_egtests") {
+  deps = [
+    "//ios/chrome/browser/ui/settings/sync/utils:eg_tests",
+  ]
+}
+
+chrome_ios_eg_test("ios_chrome_ui_signin_interaction_egtests") {
+  deps = [
+    "//ios/chrome/browser/ui/signin_interaction:eg_tests",
+  ]
+}
+
 chrome_ios_eg_test("ios_chrome_web_egtests") {
   deps = [
     "//ios/chrome/browser/web:eg_tests",
@@ -211,10 +236,12 @@ chrome_ios_eg_test("ios_chrome_external_url_egtests") {
 chrome_ios_eg_test("ios_chrome_unified_consent_egtests") {
   deps = [
     "//ios/chrome/browser/ui/settings/google_services:unified_consent_eg_tests",
+    "//ios/chrome/browser/ui/signin_interaction:unity_eg_tests",
   ]
 }
 
 source_set("test_support") {
+  defines = [ "CHROME_EARL_GREY_1" ]
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
@@ -222,14 +249,18 @@ source_set("test_support") {
     "accessibility_util.mm",
     "chrome_actions.h",
     "chrome_actions.mm",
+    "chrome_actions_app_interface.h",
+    "chrome_actions_app_interface.mm",
     "chrome_earl_grey.h",
     "chrome_earl_grey.mm",
     "chrome_earl_grey_ui.h",
     "chrome_earl_grey_ui.mm",
+    "chrome_error_util.h",
+    "chrome_error_util.mm",
     "chrome_matchers.h",
     "chrome_matchers.mm",
-    "chrome_matchers_shorthand.h",
-    "chrome_matchers_shorthand.mm",
+    "chrome_matchers_app_interface.h",
+    "chrome_matchers_app_interface.mm",
     "chrome_test_case.h",
     "chrome_test_case.mm",
   ]
@@ -267,6 +298,7 @@ source_set("test_support") {
     "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web:earl_grey_test_support",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/http_server",
     "//ui/base",
     "//ui/base:test_support",
@@ -299,3 +331,79 @@ source_set("hooks") {
     "//ios/chrome/app:tests_hook",
   ]
 }
+
+source_set("eg_app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [
+    "chrome_actions_app_interface.h",
+    "chrome_actions_app_interface.mm",
+    "chrome_error_util.h",
+    "chrome_error_util.mm",
+    "chrome_matchers_app_interface.h",
+    "chrome_matchers_app_interface.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//components/signin/core/browser",
+    "//components/strings",
+    "//components/unified_consent",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication/cells",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui",
+    "//ios/chrome/browser/ui/location_bar:location_bar",
+    "//ios/chrome/browser/ui/omnibox:omnibox_internal",
+    "//ios/chrome/browser/ui/payments:payments_ui",
+    "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/ui/settings:settings",
+    "//ios/chrome/browser/ui/settings/cells",
+    "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/google_services",
+    "//ios/chrome/browser/ui/settings/sync",
+    "//ios/chrome/browser/ui/static_content",
+    "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/test/app:test_support",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/third_party/earl_grey2:app_framework+link",
+    "//ios/web:eg_app_support+eg2",
+    "//ios/web/public/test:element_selector",
+    "//ui/base",
+    "//ui/base:test_support",
+  ]
+}
+
+source_set("eg_test_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+
+  sources = [
+    "chrome_actions.h",
+    "chrome_actions.mm",
+    "chrome_actions_app_interface.h",
+    "chrome_error_util.h",
+    "chrome_error_util.mm",
+    "chrome_matchers.h",
+    "chrome_matchers.mm",
+    "chrome_matchers_app_interface.h",
+  ]
+
+  deps = [
+    "//base",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/public/test:element_selector",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/test/earl_grey2/BUILD.gn b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
index 35ab14ea553..61830d72c5d 100644
--- a/chromium/ios/chrome/test/earl_grey2/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
@@ -53,13 +53,6 @@ source_set("eg_app_support+eg2") {
   ]
 }
 
-group("eg_test_support+eg2") {
-  testonly = true
-  public_deps = [
-    ":shared_helper_headers",
-  ]
-}
-
 source_set("eg2_tests") {
   configs += [
     "//build/config/compiler:enable_arc",
@@ -72,7 +65,8 @@ source_set("eg2_tests") {
   ]
 
   deps = [
-    ":eg_test_support+eg2",
+    ":shared_helper_headers",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
   ]
 
diff --git a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
index b43068b215b..592eda55b3b 100644
--- a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
+++ b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
@@ -89,6 +89,7 @@ template("chrome_ios_eg2_test_app_host") {
     deps = [
       ":$_deps_group_name",
       "//ios/chrome/app:main",
+      "//ios/chrome/test/earl_grey:eg_app_support+eg2",
       "//ios/chrome/test/earl_grey:hooks",
       "//ios/chrome/test/earl_grey2:eg_app_support+eg2",
       "//ios/testing:http_server_bundle_data",
@@ -150,7 +151,7 @@ template("chrome_ios_eg2_test") {
     if (!defined(deps)) {
       deps = []
     }
-    deps += [ "//ios/chrome/test/earl_grey2:eg_test_support+eg2" ]
+    deps += [ "//ios/chrome/test/earl_grey:eg_test_support+eg2" ]
   }
 }
 
diff --git a/chromium/ios/chrome/test/fakes/BUILD.gn b/chromium/ios/chrome/test/fakes/BUILD.gn
index 5eec4dc4b4e..f3210934d97 100644
--- a/chromium/ios/chrome/test/fakes/BUILD.gn
+++ b/chromium/ios/chrome/test/fakes/BUILD.gn
@@ -19,23 +19,28 @@ source_set("fakes") {
     "fake_download_manager_tab_helper_delegate.mm",
     "fake_java_script_console_tab_helper_delegate.cc",
     "fake_java_script_console_tab_helper_delegate.h",
+    "fake_language_detection_tab_helper_observer.h",
+    "fake_language_detection_tab_helper_observer.mm",
+    "fake_overscroll_actions_controller_delegate.h",
+    "fake_overscroll_actions_controller_delegate.mm",
     "fake_pass_kit_tab_helper_delegate.h",
     "fake_pass_kit_tab_helper_delegate.mm",
     "fake_store_kit_launcher.h",
     "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",
+    "//components/language/ios/browser",
+    "//components/translate/core/common",
     "//ios/chrome/browser/download",
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/download",
+    "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/web:web_internal",
     "//ios/web/public",
diff --git a/chromium/ios/public/provider/chrome/browser/BUILD.gn b/chromium/ios/public/provider/chrome/browser/BUILD.gn
index d2f177e255a..f7340a082d0 100644
--- a/chromium/ios/public/provider/chrome/browser/BUILD.gn
+++ b/chromium/ios/public/provider/chrome/browser/BUILD.gn
@@ -13,6 +13,8 @@ source_set("browser") {
     "chrome_browser_provider.mm",
     "geolocation_updater_provider.h",
     "geolocation_updater_provider.mm",
+    "overrides_provider.h",
+    "overrides_provider.mm",
   ]
   deps = [
     "//base",
@@ -43,6 +45,7 @@ source_set("test_support") {
     "//ios/public/provider/chrome/browser/spotlight:test_support",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/public/provider/chrome/browser/ui:test_support",
+    "//ios/public/provider/chrome/browser/user:test_support",
     "//ios/public/provider/chrome/browser/user_feedback:test_support",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/public/provider/chrome/browser/voice:test_support",
diff --git a/chromium/ios/public/provider/chrome/browser/user/BUILD.gn b/chromium/ios/public/provider/chrome/browser/user/BUILD.gn
new file mode 100644
index 00000000000..cf8026039f5
--- /dev/null
+++ b/chromium/ios/public/provider/chrome/browser/user/BUILD.gn
@@ -0,0 +1,29 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("user") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "special_user_prefs.h",
+    "special_user_prefs.mm",
+    "special_user_provider.h",
+    "special_user_provider.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
+source_set("test_support") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "test_special_user_provider.h",
+    "test_special_user_provider.mm",
+  ]
+  deps = [
+    ":user",
+    "//base",
+  ]
+}
diff --git a/chromium/ios/showcase/BUILD.gn b/chromium/ios/showcase/BUILD.gn
index 88fa4d66795..a77327a92da 100644
--- a/chromium/ios/showcase/BUILD.gn
+++ b/chromium/ios/showcase/BUILD.gn
@@ -24,6 +24,8 @@ group("features") {
   deps = [
     "//ios/showcase/bubble",
     "//ios/showcase/content_suggestions",
+    "//ios/showcase/infobars",
+    "//ios/showcase/omnibox_popup",
     "//ios/showcase/payments",
     "//ios/showcase/recent_tabs",
     "//ios/showcase/settings",
@@ -52,6 +54,7 @@ ios_eg_test("ios_showcase_egtests") {
     "//ios/showcase/bubble:eg_tests",
     "//ios/showcase/content_suggestions:eg_tests",
     "//ios/showcase/core:eg_tests",
+    "//ios/showcase/infobars:eg_tests",
     "//ios/showcase/payments:eg_tests",
     "//ios/showcase/text_badge_view:eg_tests",
   ]
diff --git a/chromium/ios/showcase/core/BUILD.gn b/chromium/ios/showcase/core/BUILD.gn
index f5c39a2146c..7b42a0f14d7 100644
--- a/chromium/ios/showcase/core/BUILD.gn
+++ b/chromium/ios/showcase/core/BUILD.gn
@@ -31,13 +31,14 @@ source_set("main") {
   deps = [
     ":core",
     "//base",
+    "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/toolbar/keyboard_assist",
 
     # Needed to disable the tests hooks.
     "//ios/chrome/app:tests_fake_hook",
 
     # Needed for including ios/chrome/browser/ui.
     "//ios/chrome/browser/tabs:tabs_internal",
-    "//ios/chrome/browser/ui:ui_internal",
   ]
   libs = [ "UIKit.framework" ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/showcase/infobars/BUILD.gn b/chromium/ios/showcase/infobars/BUILD.gn
new file mode 100644
index 00000000000..c00194d8887
--- /dev/null
+++ b/chromium/ios/showcase/infobars/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2019 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("infobars") {
+  sources = [
+    "sc_infobar_banner_coordinator.h",
+    "sc_infobar_banner_coordinator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/infobars/banners",
+    "//ios/chrome/browser/ui/infobars/coordinators",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/infobars/presentation",
+    "//ios/showcase/common",
+  ]
+  libs = [ "UIKit.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("eg_tests") {
+  testonly = true
+  sources = [
+    "sc_infobar_banner_coordinator_egtest.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/infobars/banners:public",
+    "//ios/chrome/browser/ui/infobars/modals:public",
+    "//ios/chrome/test/earl_grey:test_support",
+    "//ios/showcase/infobars",
+    "//ios/showcase/test",
+  ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/showcase/omnibox_popup/BUILD.gn b/chromium/ios/showcase/omnibox_popup/BUILD.gn
new file mode 100644
index 00000000000..3837df8ea4c
--- /dev/null
+++ b/chromium/ios/showcase/omnibox_popup/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("omnibox_popup") {
+  sources = [
+    "fake_autocomplete_suggestion.h",
+    "fake_autocomplete_suggestion.mm",
+    "sc_omnibox_popup_container_view_controller.h",
+    "sc_omnibox_popup_container_view_controller.mm",
+    "sc_omnibox_popup_coordinator.h",
+    "sc_omnibox_popup_coordinator.mm",
+    "sc_omnibox_popup_mediator.h",
+    "sc_omnibox_popup_mediator.mm",
+  ]
+  deps = [
+    "//ios/chrome/browser/ui/omnibox/popup:popup_ui",
+    "//ios/chrome/browser/ui/toolbar/buttons",
+    "//ios/chrome/common/ui_util",
+    "//ios/showcase/common",
+    "//url",
+  ]
+  libs = [ "UIKit.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/testing/BUILD.gn b/chromium/ios/testing/BUILD.gn
index 614c1ab6a6a..8962a84518c 100644
--- a/chromium/ios/testing/BUILD.gn
+++ b/chromium/ios/testing/BUILD.gn
@@ -72,6 +72,7 @@ bundle_data("http_server_bundle_data") {
     "data/http_server_files/chromium_logo_page.html",
     "data/http_server_files/console.html",
     "data/http_server_files/console_with_iframe.html",
+    "data/http_server_files/context_menu.html",
     "data/http_server_files/destination.html",
     "data/http_server_files/fullscreen.html",
     "data/http_server_files/generic.pkpass",
@@ -95,6 +96,7 @@ bundle_data("http_server_bundle_data") {
     "data/http_server_files/single_page_wide.pdf",
     "data/http_server_files/state_operations.html",
     "data/http_server_files/state_operations.js",
+    "data/http_server_files/tall_page.html",
     "data/http_server_files/testpage.pdf",
     "data/http_server_files/two_pages.pdf",
     "data/http_server_files/user_agent_test_page.html",
diff --git a/chromium/ios/testing/earl_grey/BUILD.gn b/chromium/ios/testing/earl_grey/BUILD.gn
index 1818cd25871..1ff40c95963 100644
--- a/chromium/ios/testing/earl_grey/BUILD.gn
+++ b/chromium/ios/testing/earl_grey/BUILD.gn
@@ -10,11 +10,15 @@ source_set("earl_grey_support") {
   deps = [
     "//base/test:test_support",
     "//ios/third_party/earl_grey:earl_grey+link",
+    "//testing/gtest:gtest",
   ]
 
   sources = [
+    "coverage_utils.h",
+    "coverage_utils.mm",
     "disabled_test_macros.h",
     "earl_grey_app.h",
+    "earl_grey_app.mm",
     "earl_grey_test.h",
     "matchers.h",
     "matchers.mm",
@@ -29,25 +33,36 @@ source_set("eg_app_support+eg2") {
   deps = [
     "//base/test:test_support",
     "//ios/third_party/earl_grey2:app_framework+link",
+    "//testing/gtest:gtest",
   ]
 
   sources = [
+    "coverage_utils.h",
+    "coverage_utils.mm",
     "earl_grey_app.h",
-    "matchers.h",
-    "matchers.mm",
+    "earl_grey_app.mm",
   ]
 }
 
 source_set("eg_test_support+eg2") {
-  configs += [ "//build/config/compiler:enable_arc" ]
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
   testonly = true
 
   sources = [
+    "coverage_utils.h",
+    "coverage_utils_stub.mm",
     "disabled_test_macros.h",
     "earl_grey_test.h",
+    "matchers.h",
+    "matchers.mm",
   ]
 
   deps = [
     "//ios/third_party/earl_grey2:test_lib",
+    "//testing/gtest:gtest",
   ]
 }
diff --git a/chromium/ios/third_party/edo/BUILD.gn b/chromium/ios/third_party/edo/BUILD.gn
index 3c136d42bcc..ea2663b68c3 100644
--- a/chromium/ios/third_party/edo/BUILD.gn
+++ b/chromium/ios/third_party/edo/BUILD.gn
@@ -13,25 +13,48 @@ source_set("edo") {
 
   sources = [
     "src/Channel/Sources/EDOChannel.h",
+    "src/Channel/Sources/EDOChannelPool.h",
+    "src/Channel/Sources/EDOChannelPool.m",
+    "src/Channel/Sources/EDOChannelUtil.h",
+    "src/Channel/Sources/EDOChannelUtil.m",
+    "src/Channel/Sources/EDOHostPort.h",
+    "src/Channel/Sources/EDOHostPort.m",
     "src/Channel/Sources/EDOListenSocket.h",
     "src/Channel/Sources/EDOListenSocket.m",
     "src/Channel/Sources/EDOSocket.h",
     "src/Channel/Sources/EDOSocket.m",
     "src/Channel/Sources/EDOSocketChannel.h",
     "src/Channel/Sources/EDOSocketChannel.m",
-    "src/Channel/Sources/EDOSocketChannelPool.h",
-    "src/Channel/Sources/EDOSocketChannelPool.m",
     "src/Channel/Sources/EDOSocketPort.h",
     "src/Channel/Sources/EDOSocketPort.m",
+    "src/Device/Sources/EDODeviceChannel.h",
+    "src/Device/Sources/EDODeviceChannel.m",
+    "src/Device/Sources/EDODeviceConnector.h",
+    "src/Device/Sources/EDODeviceConnector.m",
+    "src/Device/Sources/EDODeviceDetector.h",
+    "src/Device/Sources/EDODeviceDetector.m",
+    "src/Device/Sources/EDOUSBMuxUtil.h",
+    "src/Device/Sources/EDOUSBMuxUtil.m",
+    "src/Measure/Sources/EDONumericMeasure.h",
+    "src/Measure/Sources/EDONumericMeasure.m",
     "src/Service/Sources/EDOBlockObject.h",
     "src/Service/Sources/EDOBlockObject.m",
     "src/Service/Sources/EDOClassMessage.h",
     "src/Service/Sources/EDOClassMessage.m",
+    "src/Service/Sources/EDOClientService+Device.h",
     "src/Service/Sources/EDOClientService+Private.h",
     "src/Service/Sources/EDOClientService.h",
     "src/Service/Sources/EDOClientService.m",
+    "src/Service/Sources/EDOClientServiceStatsCollector.h",
+    "src/Service/Sources/EDOClientServiceStatsCollector.m",
     "src/Service/Sources/EDOExecutor.h",
     "src/Service/Sources/EDOExecutor.m",
+    "src/Service/Sources/EDOExecutorMessage.h",
+    "src/Service/Sources/EDOExecutorMessage.m",
+    "src/Service/Sources/EDOHostNamingService+Private.h",
+    "src/Service/Sources/EDOHostNamingService.h",
+    "src/Service/Sources/EDOHostNamingService.m",
+    "src/Service/Sources/EDOHostService+Device.h",
     "src/Service/Sources/EDOHostService+Handlers.h",
     "src/Service/Sources/EDOHostService+Handlers.m",
     "src/Service/Sources/EDOHostService+Private.h",
@@ -66,11 +89,17 @@ source_set("edo") {
     "src/Service/Sources/EDOServicePort.m",
     "src/Service/Sources/EDOServiceRequest.h",
     "src/Service/Sources/EDOServiceRequest.m",
+    "src/Service/Sources/EDOTimingFunctions.h",
+    "src/Service/Sources/EDOTimingFunctions.m",
     "src/Service/Sources/EDOValueObject+EDOParameter.m",
     "src/Service/Sources/EDOValueObject.h",
     "src/Service/Sources/EDOValueObject.m",
     "src/Service/Sources/EDOValueType.m",
     "src/Service/Sources/NSBlock+EDOInvocation.m",
+    "src/Service/Sources/NSKeyedArchiver+EDOAdditions.h",
+    "src/Service/Sources/NSKeyedArchiver+EDOAdditions.m",
+    "src/Service/Sources/NSKeyedUnarchiver+EDOAdditions.h",
+    "src/Service/Sources/NSKeyedUnarchiver+EDOAdditions.m",
     "src/Service/Sources/NSObject+EDOParameter.h",
     "src/Service/Sources/NSObject+EDOParameter.m",
     "src/Service/Sources/NSObject+EDOValue.h",
diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn
index 1ed62261fe0..7f9453d0389 100644
--- a/chromium/ios/third_party/material_components_ios/BUILD.gn
+++ b/chromium/ios/third_party/material_components_ios/BUILD.gn
@@ -14,8 +14,10 @@ copy("mdc_components_ios_public_headers") {
     "src/components/Buttons/src/MaterialButtons.h",
     "src/components/Buttons/src/ShapeThemer/MaterialButtons+ShapeThemer.h",
     "src/components/Buttons/src/TypographyThemer/MaterialButtons+TypographyThemer.h",
+    "src/components/Cards/src/MaterialCards.h",
     "src/components/Dialogs/src/MaterialDialogs.h",
     "src/components/ShadowElevations/src/MaterialShadowElevations.h",
+    "src/components/Typography/src/MaterialTypography.h",
     "src/components/schemes/Color/src/MaterialColorScheme.h",
     "src/components/schemes/Shape/src/MaterialShapeScheme.h",
     "src/components/schemes/Typography/src/MaterialTypographyScheme.h",
@@ -51,6 +53,7 @@ config("config") {
     "src/components/OverlayWindow/src",
     "src/components/Palettes/src",
     "src/components/ProgressView/src",
+    "src/components/Ripple/src",
     "src/components/ShadowElevations/src",
     "src/components/ShadowLayer/src",
     "src/components/Snackbar/src",
@@ -181,6 +184,8 @@ source_set("material_components_ios") {
     "src/components/Cards/src/ColorThemer/MDCCardsColorThemer.m",
     "src/components/Cards/src/MDCCard.h",
     "src/components/Cards/src/MDCCard.m",
+    "src/components/Cards/src/MDCCardCollectionCell.h",
+    "src/components/Cards/src/MDCCardCollectionCell.m",
     "src/components/CollectionCells/src/MDCCollectionViewCell.h",
     "src/components/CollectionCells/src/MDCCollectionViewCell.m",
     "src/components/CollectionCells/src/MDCCollectionViewTextCell.h",
@@ -292,32 +297,39 @@ source_set("material_components_ios") {
     "src/components/ProgressView/src/MaterialProgressView.h",
     "src/components/ProgressView/src/private/MDCProgressViewMotionSpec.h",
     "src/components/ProgressView/src/private/MDCProgressViewMotionSpec.m",
+    "src/components/Ripple/src/MDCRippleView.h",
+    "src/components/Ripple/src/MDCRippleView.m",
+    "src/components/Ripple/src/MDCStatefulRippleView.h",
+    "src/components/Ripple/src/MDCStatefulRippleView.m",
+    "src/components/Ripple/src/MaterialRipple.h",
+    "src/components/Ripple/src/private/MDCRippleLayer.h",
+    "src/components/Ripple/src/private/MDCRippleLayer.m",
     "src/components/ShadowElevations/src/MDCShadowElevations.h",
     "src/components/ShadowElevations/src/MaterialShadowElevations.h",
     "src/components/ShadowLayer/src/MDCShadowLayer.h",
     "src/components/ShadowLayer/src/MDCShadowLayer.m",
     "src/components/ShadowLayer/src/MaterialShadowLayer.h",
+    "src/components/ShapeLibrary/src/MDCCornerTreatment+CornerTypeInitalizer.h",
     "src/components/ShapeLibrary/src/MDCCornerTreatment+CornerTypeInitalizer.m",
-    "src/components/ShapeLibrary/src/MDCCornerTreatment+CornerTypeInitalizerNew.h",
+    "src/components/ShapeLibrary/src/MDCCurvedCornerTreatment.h",
     "src/components/ShapeLibrary/src/MDCCurvedCornerTreatment.m",
-    "src/components/ShapeLibrary/src/MDCCurvedCornerTreatmentNew.h",
+    "src/components/ShapeLibrary/src/MDCCutCornerTreatment.h",
     "src/components/ShapeLibrary/src/MDCCutCornerTreatment.m",
-    "src/components/ShapeLibrary/src/MDCCutCornerTreatmentNew.h",
+    "src/components/ShapeLibrary/src/MDCRoundedCornerTreatment.h",
     "src/components/ShapeLibrary/src/MDCRoundedCornerTreatment.m",
-    "src/components/ShapeLibrary/src/MDCRoundedCornerTreatmentNew.h",
+    "src/components/Shapes/src/MDCCornerTreatment.h",
     "src/components/Shapes/src/MDCCornerTreatment.m",
-    "src/components/Shapes/src/MDCCornerTreatmentNew.h",
+    "src/components/Shapes/src/MDCEdgeTreatment.h",
     "src/components/Shapes/src/MDCEdgeTreatment.m",
-    "src/components/Shapes/src/MDCEdgeTreatmentNew.h",
+    "src/components/Shapes/src/MDCPathGenerator.h",
     "src/components/Shapes/src/MDCPathGenerator.m",
-    "src/components/Shapes/src/MDCPathGeneratorNew.h",
+    "src/components/Shapes/src/MDCRectangleShapeGenerator.h",
     "src/components/Shapes/src/MDCRectangleShapeGenerator.m",
-    "src/components/Shapes/src/MDCRectangleShapeGeneratorNew.h",
+    "src/components/Shapes/src/MDCShapedShadowLayer.h",
     "src/components/Shapes/src/MDCShapedShadowLayer.m",
-    "src/components/Shapes/src/MDCShapedShadowLayerNew.h",
+    "src/components/Shapes/src/MDCShapedView.h",
     "src/components/Shapes/src/MDCShapedView.m",
-    "src/components/Shapes/src/MDCShapedViewNew.h",
-    "src/components/Shapes/src/MaterialShapesNew.h",
+    "src/components/Shapes/src/MaterialShapes.h",
     "src/components/Snackbar/src/MDCSnackbarManager.h",
     "src/components/Snackbar/src/MDCSnackbarManager.m",
     "src/components/Snackbar/src/MDCSnackbarMessage.h",
@@ -329,15 +341,23 @@ source_set("material_components_ios") {
     "src/components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h",
     "src/components/Snackbar/src/private/MDCSnackbarOverlayView.h",
     "src/components/Snackbar/src/private/MDCSnackbarOverlayView.m",
+    "src/components/Typography/src/MDCFontScaler.h",
+    "src/components/Typography/src/MDCFontScaler.m",
     "src/components/Typography/src/MDCTypography.h",
     "src/components/Typography/src/MDCTypography.m",
     "src/components/Typography/src/MaterialTypography.h",
+    "src/components/Typography/src/UIFont+MaterialScalable.h",
+    "src/components/Typography/src/UIFont+MaterialScalable.m",
+    "src/components/Typography/src/UIFont+MaterialSimpleEquality.h",
+    "src/components/Typography/src/UIFont+MaterialSimpleEquality.m",
     "src/components/Typography/src/UIFont+MaterialTypography.h",
     "src/components/Typography/src/UIFont+MaterialTypography.m",
     "src/components/Typography/src/UIFontDescriptor+MaterialTypography.h",
     "src/components/Typography/src/UIFontDescriptor+MaterialTypography.m",
     "src/components/Typography/src/private/MDCFontTraits.h",
     "src/components/Typography/src/private/MDCFontTraits.m",
+    "src/components/Typography/src/private/MDCTypographyUtilities.h",
+    "src/components/Typography/src/private/MDCTypographyUtilities.m",
     "src/components/Typography/src/private/UIFont+MaterialTypographyPrivate.h",
     "src/components/Typography/src/private/UIFont+MaterialTypographyPrivate.m",
     "src/components/private/Application/src/MaterialApplication.h",
diff --git a/chromium/ios/third_party/webkit/BUILD.gn b/chromium/ios/third_party/webkit/BUILD.gn
index adda10749bc..b3ccc59487d 100644
--- a/chromium/ios/third_party/webkit/BUILD.gn
+++ b/chromium/ios/third_party/webkit/BUILD.gn
@@ -38,9 +38,17 @@ if (checkout_ios_webkit) {
       "$target_out_dir/Debug-iphonesimulator/WebKitLegacy.framework/WebKitLegacy",
     ]
 
+    # TODO(crbug.com/934252): "-j 4" restricts xcodebuild to four simultaneous
+    # jobs. This is intended to prevent overloading the machine, because ninja
+    # will already be spawning a large number of jobs in parallel with
+    # xcodebuild, but it causes the webkit build to run very slowly. Find a way
+    # to increase the parallelism here.
     args = [
       "--output_dir",
       rebase_path("$target_out_dir"),
+      "-j",
+      "4",
+      "-quiet",
     ]
   }
 }
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 3e5db15c675..5fd32e6c9d9 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -39,6 +39,7 @@ source_set("web") {
     ":resources",
     ":service_names",
     "//base",
+    "//ios/web/common",
     "//ios/web/download",
     "//ios/web/interstitials",
     "//ios/web/navigation",
@@ -60,14 +61,12 @@ source_set("web") {
     "browser_url_rewriter_impl.h",
     "browser_url_rewriter_impl.mm",
     "crw_navigation_item_storage.mm",
-    "features.mm",
     "network_context_owner.cc",
     "service_manager_connection_impl.cc",
     "service_manager_connection_impl.h",
     "service_manager_context.h",
     "service_manager_context.mm",
     "url_scheme_util.mm",
-    "url_util.cc",
     "web_browser_manifest.h",
     "web_browser_manifest.mm",
     "web_client.mm",
@@ -105,6 +104,7 @@ source_set("core") {
 }
 
 source_set("earl_grey_test_support") {
+  defines = [ "CHROME_EARL_GREY_1" ]
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
 
@@ -116,6 +116,33 @@ source_set("earl_grey_test_support") {
     "//ios/third_party/earl_grey:earl_grey+link",
     "//ios/web/interstitials",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
+    "//net",
+  ]
+
+  sources = [
+    "public/test/earl_grey/js_test_util.h",
+    "public/test/earl_grey/js_test_util.mm",
+    "public/test/earl_grey/web_view_actions.h",
+    "public/test/earl_grey/web_view_actions.mm",
+    "public/test/earl_grey/web_view_matchers.h",
+    "public/test/earl_grey/web_view_matchers.mm",
+  ]
+}
+
+source_set("eg_app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  deps = [
+    ":web",
+    "//base",
+    "//base/test:test_support",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/third_party/earl_grey2:app_framework+link",
+    "//ios/web/interstitials",
+    "//ios/web/public/test",
     "//net",
   ]
 
@@ -175,6 +202,7 @@ test("ios_web_unittests") {
     ":ios_web_webui_unittests",
     "//ios/testing:http_server_bundle_data",
     "//ios/web/browsing_data:browsing_data_unittests",
+    "//ios/web/common:unittests",
     "//ios/web/download:download_unittests",
     "//ios/web/find_in_page:find_in_page_unittests",
     "//ios/web/interstitials:interstitials_unittests",
@@ -216,7 +244,6 @@ source_set("ios_web_general_unittests") {
     "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
     "url_scheme_util_unittest.mm",
-    "url_util_unittest.cc",
     "web_client_unittest.mm",
     "web_thread_unittest.cc",
   ]
@@ -233,6 +260,7 @@ source_set("ios_web_navigation_unittests") {
     "//components/url_formatter",
     "//ios/net",
     "//ios/testing:ocmock_support",
+    "//ios/web/common",
     "//ios/web/navigation",
     "//ios/web/navigation:core",
     "//ios/web/navigation:navigation_manager_util",
@@ -283,6 +311,7 @@ source_set("ios_web_net_unittests") {
     "//ios/net",
     "//ios/net:test_support",
     "//ios/testing:ocmock_support",
+    "//ios/web/common",
     "//ios/web/navigation",
     "//ios/web/net/cookies",
     "//ios/web/public",
@@ -304,6 +333,7 @@ source_set("ios_web_net_unittests") {
   sources = [
     "net/cert_host_pair_unittest.cc",
     "net/cert_policy_unittest.cc",
+    "net/cookies/crw_wk_http_cookie_store_unittest.mm",
     "net/cookies/system_cookie_store_util_unittest.mm",
     "net/cookies/wk_cookie_util_unittest.mm",
     "net/cookies/wk_http_system_cookie_store_unittest.mm",
@@ -359,7 +389,6 @@ source_set("ios_web_public_unittests") {
   sources = [
     "public/crw_session_certificate_policy_cache_storage_unittest.mm",
     "public/origin_util_unittest.mm",
-    "public/referrer_util_unittest.cc",
     "public/serializable_user_data_manager_unittest.mm",
     "public/ssl_status_unittest.cc",
     "public/user_agent_unittest.mm",
@@ -380,6 +409,7 @@ source_set("ios_web_web_state_unittests") {
     "//ios/net",
     "//ios/testing:ocmock_support",
     "//ios/web",
+    "//ios/web/common",
     "//ios/web/find_in_page",
     "//ios/web/interstitials",
     "//ios/web/navigation",
@@ -464,7 +494,6 @@ source_set("ios_web_web_state_js_unittests") {
     "web_state/js/common_js_unittest.mm",
     "web_state/js/context_menu_js_unittest.mm",
     "web_state/js/crw_js_injection_manager_unittest.mm",
-    "web_state/js/crw_js_post_request_loader_unittest.mm",
     "web_state/js/crw_js_window_id_manager_unittest.mm",
     "web_state/js/find_in_page_js_unittest.mm",
     "web_state/js/message_js_unittest.mm",
@@ -483,6 +512,7 @@ source_set("ios_web_web_state_ui_unittests") {
     "//components/url_formatter",
     "//ios/net",
     "//ios/testing:ocmock_support",
+    "//ios/web/common",
     "//ios/web/navigation",
     "//ios/web/navigation:core",
     "//ios/web/public",
@@ -570,11 +600,13 @@ test("ios_web_inttests") {
     "//ios/testing:embedded_test_server_support",
     "//ios/testing:http_server_bundle_data",
     "//ios/web:resources_grit",
+    "//ios/web/common",
     "//ios/web/download:download_inttests",
     "//ios/web/navigation:core",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public/find_in_page",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/fakes",
     "//ios/web/public/test/http_server",
     "//ios/web/test:mojo_bindings",
@@ -590,6 +622,7 @@ test("ios_web_inttests") {
     "//services/service_manager/public/cpp",
     "//testing/gtest",
     "//ui/base:test_support",
+    "//ui/resources",
   ]
   sources = [
     "browser_state_web_view_partition_inttest.mm",
@@ -605,6 +638,7 @@ test("ios_web_inttests") {
     "web_state/error_page_inttest.mm",
     "web_state/favicon_callbacks_inttest.mm",
     "web_state/http_auth_inttest.mm",
+    "web_state/keep_render_process_alive_inttest.mm",
     "web_state/web_frame_impl_inttest.mm",
     "web_state/web_frame_web_state_observer_inttest.mm",
     "web_state/web_frames_manager_inttest.mm",
@@ -686,7 +720,6 @@ js_compile_checked("js_resources") {
   ]
 
   sources = [
-    "web_state/js/resources/post_request.js",
     "web_state/js/resources/window_id.js",
   ]
 }
diff --git a/chromium/ios/web/browsing_data/BUILD.gn b/chromium/ios/web/browsing_data/BUILD.gn
index b187e9eabdb..1e90f4d6f64 100644
--- a/chromium/ios/web/browsing_data/BUILD.gn
+++ b/chromium/ios/web/browsing_data/BUILD.gn
@@ -11,7 +11,9 @@ source_set("browsing_data") {
   ]
 
   deps = [
+    "//base",
     "//ios/web/public",
+    "//ios/web/web_state/ui:wk_web_view_configuration_provider",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -22,6 +24,7 @@ source_set("browsing_data_unittests") {
   testonly = true
   deps = [
     ":browsing_data",
+    "//base/test:test_support",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn
new file mode 100644
index 00000000000..536f97b0c90
--- /dev/null
+++ b/chromium/ios/web/common/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ios/build/config.gni")
+
+source_set("common") {
+  sources = [
+    "crw_content_view.h",
+    "crw_web_view_content_view.h",
+    "crw_web_view_content_view.mm",
+    "features.h",
+    "features.mm",
+    "referrer_util.cc",
+    "referrer_util.h",
+    "url_util.cc",
+    "url_util.h",
+  ]
+
+  deps = [
+    "//base",
+    "//ios/web/public:referrer",
+    "//net",
+    "//url",
+  ]
+
+  libs = [ "UIKit.framework" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unittests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  deps = [
+    ":common",
+    "//base",
+    "//ios/web/public:referrer",
+    "//net",
+    "//testing/gtest",
+    "//url",
+  ]
+
+  sources = [
+    "referrer_util_unittest.cc",
+    "url_util_unittest.cc",
+  ]
+}
diff --git a/chromium/ios/web/find_in_page/BUILD.gn b/chromium/ios/web/find_in_page/BUILD.gn
index a0721c2c1d1..caa3e3a3afe 100644
--- a/chromium/ios/web/find_in_page/BUILD.gn
+++ b/chromium/ios/web/find_in_page/BUILD.gn
@@ -14,6 +14,7 @@ source_set("find_in_page") {
   sources = [
     "find_in_page_constants.h",
     "find_in_page_constants.mm",
+    "find_in_page_manager_delegate_bridge.mm",
     "find_in_page_manager_impl.h",
     "find_in_page_manager_impl.mm",
   ]
@@ -28,12 +29,14 @@ source_set("find_in_page_unittests") {
     "//base",
     "//base/test:test_support",
     "//ios/web/public",
+    "//ios/web/public/find_in_page",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
 
   sources = [
+    "find_in_page_manager_delegate_bridge_unittest.mm",
     "find_in_page_manger_impl_unittest.mm",
   ]
 
diff --git a/chromium/ios/web/interstitials/BUILD.gn b/chromium/ios/web/interstitials/BUILD.gn
index 2e38042f203..684ad44a65f 100644
--- a/chromium/ios/web/interstitials/BUILD.gn
+++ b/chromium/ios/web/interstitials/BUILD.gn
@@ -7,6 +7,7 @@ import("//ios/build/config.gni")
 source_set("interstitials") {
   deps = [
     "//base",
+    "//ios/web/common",
     "//ios/web/navigation:core",
     "//ios/web/public",
     "//ios/web/web_state:web_state_impl_header",
diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn
index 9caf1738c18..571b67eacf2 100644
--- a/chromium/ios/web/navigation/BUILD.gn
+++ b/chromium/ios/web/navigation/BUILD.gn
@@ -9,6 +9,7 @@ source_set("navigation") {
     ":core",
     "//base",
     "//ios/web:core",
+    "//ios/web/common",
     "//ios/web/navigation:wk_navigation_util",
     "//ios/web/public",
     "//ios/web/web_state:session_certificate_policy_cache",
@@ -70,6 +71,7 @@ source_set("core") {
 source_set("wk_navigation_util") {
   deps = [
     "//base",
+    "//ios/web/common",
     "//ios/web/public",
     "//url",
   ]
diff --git a/chromium/ios/web/net/BUILD.gn b/chromium/ios/web/net/BUILD.gn
index 825526a6e0e..a5c74b691aa 100644
--- a/chromium/ios/web/net/BUILD.gn
+++ b/chromium/ios/web/net/BUILD.gn
@@ -9,6 +9,7 @@ source_set("net") {
     "//base",
     "//ios/net",
     "//ios/web:core",
+    "//ios/web/common",
     "//ios/web/navigation:core",
     "//ios/web/navigation:navigation_manager_util",
     "//ios/web/navigation:wk_navigation_util",
diff --git a/chromium/ios/web/net/cookies/BUILD.gn b/chromium/ios/web/net/cookies/BUILD.gn
index 4c2d484fd54..33c391ad491 100644
--- a/chromium/ios/web/net/cookies/BUILD.gn
+++ b/chromium/ios/web/net/cookies/BUILD.gn
@@ -6,13 +6,16 @@ import("//ios/build/config.gni")
 
 source_set("cookies") {
   deps = [
-    "//base:base",
+    "//base",
     "//ios/net",
-    "//ios/web/public:public",
+    "//ios/web/common",
+    "//ios/web/public",
     "//ios/web/web_state/ui:wk_web_view_configuration_provider",
   ]
 
   sources = [
+    "crw_wk_http_cookie_store.h",
+    "crw_wk_http_cookie_store.mm",
     "system_cookie_store_util.mm",
     "wk_cookie_util.h",
     "wk_cookie_util.mm",
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index 1c60fae3154..1b894afe16b 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -6,6 +6,7 @@ import("//ios/build/config.gni")
 
 source_set("public") {
   public_deps = [
+    ":referrer",
     ":user_agent",
     "//net",
     "//services/network/public/cpp",
@@ -13,12 +14,12 @@ source_set("public") {
   ]
 
   deps = [
+    "//ios/web/common",
     "//services/service_manager/public/cpp",
     "//ui/base",
   ]
 
   sources = [
-    "block_types.h",
     "browser_state.h",
     "browser_url_rewriter.h",
     "browsing_data_removing_util.h",
@@ -33,7 +34,6 @@ source_set("public") {
     "favicon_status.h",
     "favicon_url.cc",
     "favicon_url.h",
-    "features.h",
     "interstitials/web_interstitial.h",
     "interstitials/web_interstitial_delegate.h",
     "java_script_dialog_callback.h",
@@ -45,9 +45,6 @@ source_set("public") {
     "navigation_manager.h",
     "origin_util.h",
     "origin_util.mm",
-    "referrer.h",
-    "referrer_util.cc",
-    "referrer_util.h",
     "reload_type.h",
     "security_style.h",
     "serializable_user_data_manager.h",
@@ -59,7 +56,6 @@ source_set("public") {
     "url_scheme_util.h",
     "url_schemes.h",
     "url_schemes.mm",
-    "url_util.h",
     "web_client.h",
     "web_state/context_menu_params.h",
     "web_state/global_web_state_observer.h",
@@ -70,11 +66,9 @@ source_set("public") {
     "web_state/page_display_state.h",
     "web_state/page_display_state.mm",
     "web_state/session_certificate_policy_cache.h",
-    "web_state/ui/crw_content_view.h",
     "web_state/ui/crw_context_menu_delegate.h",
     "web_state/ui/crw_native_content.h",
     "web_state/ui/crw_native_content_provider.h",
-    "web_state/ui/crw_web_view_content_view.h",
     "web_state/ui/crw_web_view_proxy.h",
     "web_state/ui/crw_web_view_scroll_view_proxy.h",
     "web_state/url_verification_constants.h",
@@ -124,3 +118,16 @@ source_set("user_agent") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
+
+source_set("referrer") {
+  deps = [
+    "//base",
+    "//url",
+  ]
+
+  sources = [
+    "referrer.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/ios/web/public/app/BUILD.gn b/chromium/ios/web/public/app/BUILD.gn
index 059e3f64b57..ea886b39af9 100644
--- a/chromium/ios/web/public/app/BUILD.gn
+++ b/chromium/ios/web/public/app/BUILD.gn
@@ -4,7 +4,7 @@
 
 source_set("app") {
   sources = [
-    "task_scheduler_init_params_callback.h",
+    "thread_pool_init_params_callback.h",
     "web_main.h",
     "web_main_delegate.h",
     "web_main_parts.h",
diff --git a/chromium/ios/web/public/find_in_page/BUILD.gn b/chromium/ios/web/public/find_in_page/BUILD.gn
index 0cf31df4c7c..86d60f796bc 100644
--- a/chromium/ios/web/public/find_in_page/BUILD.gn
+++ b/chromium/ios/web/public/find_in_page/BUILD.gn
@@ -11,6 +11,7 @@ source_set("find_in_page") {
   sources = [
     "find_in_page_manager.h",
     "find_in_page_manager_delegate.h",
+    "find_in_page_manager_delegate_bridge.h",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 8a0ff4427a2..e5d54f0427f 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -41,11 +41,26 @@ source_set("test") {
   ]
 }
 
+source_set("element_selector") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+
+  sources = [
+    "element_selector.h",
+    "element_selector.mm",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("util") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
 
   deps = [
+    ":element_selector",
     "//base",
     "//base/test:test_support",
     "//ios/web/public:public",
@@ -56,9 +71,13 @@ source_set("util") {
     "//testing/gtest",
   ]
 
+  # TODO(crbug.com/922813): Remove this once internal targets depend directly
+  # on ":element_selector".
+  public_deps = [
+    "//ios/web/public/test:element_selector",
+  ]
+
   sources = [
-    "element_selector.h",
-    "element_selector.mm",
     "error_test_util.h",
     "error_test_util.mm",
     "js_test_util.h",
diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn
index 0bb0e8315e3..99083ecaded 100644
--- a/chromium/ios/web/public/test/fakes/BUILD.gn
+++ b/chromium/ios/web/public/test/fakes/BUILD.gn
@@ -8,6 +8,7 @@ source_set("fakes") {
 
   deps = [
     "//base",
+    "//ios/web/common",
     "//ios/web/public/download",
     "//ios/web/public/find_in_page",
     "//ios/web/test:test_constants",
@@ -26,6 +27,8 @@ source_set("fakes") {
   ]
 
   sources = [
+    "crw_fake_find_in_page_manager_delegate.h",
+    "crw_fake_find_in_page_manager_delegate.mm",
     "crw_fake_web_state_policy_decider.h",
     "crw_fake_web_state_policy_decider.mm",
     "crw_test_js_injection_receiver.h",
diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn
index a52d68dc48c..c39e89880c8 100644
--- a/chromium/ios/web/shell/test/BUILD.gn
+++ b/chromium/ios/web/shell/test/BUILD.gn
@@ -16,6 +16,7 @@ group("all_tests") {
 }
 
 ios_eg_test("ios_web_shell_egtests") {
+  defines = [ "CHROME_EARL_GREY_1" ]
   info_plist = "//ios/web/shell/Info.plist"
   sources = [
     "context_menu_egtest.mm",
@@ -27,23 +28,22 @@ ios_eg_test("ios_web_shell_egtests") {
     ":earl_grey_test_support",
     "//base",
     "//base/test:test_support",
+    "//ios/testing:http_server_bundle_data",
     "//ios/testing/earl_grey:earl_grey_support",
     "//ios/web",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
+    "//ios/web/public/test:element_selector",
     "//ios/web/public/test/fakes",
-    "//ios/web/public/test/http_server",
     "//ios/web/shell",
     "//ios/web/shell:shell_interfaces",
-    "//net",
+    "//net:test_support",
     "//services/service_manager/public/cpp",
     "//services/test/echo/public/mojom",
     "//services/test/user_id/public/mojom",
     "//url",
   ]
 
-  bundle_deps = [ ":bundle" ]
-
   configs += [ "//build/config/compiler:enable_arc" ]
 
   assert_no_deps = ios_assert_no_deps
@@ -61,7 +61,7 @@ source_set("earl_grey_test_support") {
     "//ios/web",
     "//ios/web:earl_grey_test_support",
     "//ios/web/public/test",
-    "//ios/web/public/test/http_server",
+    "//ios/web/public/test:element_selector",
     "//ios/web/shell",
     "//testing/gtest:gtest",
     "//url",
@@ -80,12 +80,16 @@ source_set("earl_grey_test_support") {
     "app/web_view_interaction_test_util.mm",
     "earl_grey/shell_actions.h",
     "earl_grey/shell_actions.mm",
+    "earl_grey/shell_actions_app_interface.h",
+    "earl_grey/shell_actions_app_interface.mm",
     "earl_grey/shell_earl_grey.h",
     "earl_grey/shell_earl_grey.mm",
+    "earl_grey/shell_earl_grey_app_interface.h",
+    "earl_grey/shell_earl_grey_app_interface.mm",
     "earl_grey/shell_matchers.h",
     "earl_grey/shell_matchers.mm",
-    "earl_grey/shell_matchers_shorthand.h",
-    "earl_grey/shell_matchers_shorthand.mm",
+    "earl_grey/shell_matchers_app_interface.h",
+    "earl_grey/shell_matchers_app_interface.mm",
     "earl_grey/web_shell_test_case.h",
     "earl_grey/web_shell_test_case.mm",
   ]
@@ -93,22 +97,44 @@ source_set("earl_grey_test_support") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-bundle_data("bundle") {
-  visibility = [ ":*" ]
-  sources = [
-    "http_server_files/tall_page.html",
-  ]
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" +
-        "{{source_file_part}}",
-  ]
-}
-
 ################################
 # EG2 targets.
 
-group("eg_app_support+eg2") {
+source_set("eg_app_support+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
   testonly = true
+
+  sources = [
+    "app/navigation_test_util.h",
+    "app/navigation_test_util.mm",
+    "app/web_shell_test_util.h",
+    "app/web_shell_test_util.mm",
+    "app/web_view_interaction_test_util.h",
+    "app/web_view_interaction_test_util.mm",
+    "earl_grey/shell_actions_app_interface.h",
+    "earl_grey/shell_actions_app_interface.mm",
+    "earl_grey/shell_earl_grey_app_interface.h",
+    "earl_grey/shell_earl_grey_app_interface.mm",
+    "earl_grey/shell_matchers_app_interface.h",
+    "earl_grey/shell_matchers_app_interface.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//ios/testing/earl_grey:eg_app_support+eg2",
+    "//ios/third_party/earl_grey2:app_framework+link",
+    "//ios/web",
+    "//ios/web:eg_app_support+eg2",
+    "//ios/web/public/test",
+    "//ios/web/public/test/http_server",
+    "//ios/web/shell",
+    "//url",
+  ]
 }
 
 source_set("eg_test_support+eg2") {
@@ -120,18 +146,31 @@ source_set("eg_test_support+eg2") {
   testonly = true
 
   sources = [
+    "earl_grey/shell_actions.h",
+    "earl_grey/shell_actions.mm",
+    "earl_grey/shell_actions_app_interface.h",
+    "earl_grey/shell_earl_grey.h",
+    "earl_grey/shell_earl_grey.mm",
+    "earl_grey/shell_earl_grey_app_interface.h",
+    "earl_grey/shell_matchers.h",
+    "earl_grey/shell_matchers.mm",
+    "earl_grey/shell_matchers_app_interface.h",
     "earl_grey/web_shell_test_case.h",
     "earl_grey/web_shell_test_case.mm",
   ]
 
   deps = [
+    "//base",
+    "//base/test:test_support",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
-    "//ios/web/public/test/http_server",
+    "//ios/web/public/test:element_selector",
+    "//url",
   ]
 }
 
 source_set("eg_tests+eg2") {
+  defines = [ "CHROME_EARL_GREY_2" ]
   configs += [
     "//build/config/compiler:enable_arc",
     "//build/config/ios:xctest_config",
@@ -139,12 +178,18 @@ source_set("eg_tests+eg2") {
   testonly = true
 
   sources = [
-    "web_shell_sample_egtest.mm",
+    "context_menu_egtest.mm",
+    "page_state_egtest.mm",
   ]
 
   deps = [
     ":eg_test_support+eg2",
+    "//base",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/public/test:element_selector",
+    "//ios/web/public/test/http_server",
+    "//net:test_support",
   ]
 
   libs = [ "UIKit.framework" ]
@@ -170,5 +215,5 @@ ios_eg2_test("ios_web_shell_eg2tests") {
     ":eg_tests+eg2",
   ]
 
-  bundle_deps = [ ":bundle" ]
+  bundle_deps = [ "//ios/testing:http_server_bundle_data" ]
 }
diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn
index 20a20ef4332..e4270f5f033 100644
--- a/chromium/ios/web/test/BUILD.gn
+++ b/chromium/ios/web/test/BUILD.gn
@@ -17,10 +17,12 @@ repack("packed_resources") {
   sources = [
     "$root_gen_dir/ios/web/ios_web_resources.pak",
     "$root_gen_dir/ios/web/test/test_resources.pak",
+    "$root_gen_dir/ui/resources/webui_resources.pak",
   ]
   deps = [
     ":resources",
     "//ios/web:resources",
+    "//ui/resources",
   ]
   output = "$target_gen_dir/resources.pak"
   copy_data_to_bundle = true
diff --git a/chromium/ios/web/test/fakes/BUILD.gn b/chromium/ios/web/test/fakes/BUILD.gn
index 10bc6fdbda7..569ea755382 100644
--- a/chromium/ios/web/test/fakes/BUILD.gn
+++ b/chromium/ios/web/test/fakes/BUILD.gn
@@ -12,6 +12,7 @@ source_set("fakes") {
     "//ios/web/navigation:core",
     "//ios/web/public:public",
     "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
+    "//ios/web/web_state/ui:wk_web_view_configuration_provider",
     "//testing/gmock",
     "//third_party/ocmock:ocmock",
   ]
@@ -31,6 +32,8 @@ source_set("fakes") {
     "crw_fake_wk_navigation_response.mm",
     "fake_navigation_manager_delegate.h",
     "fake_navigation_manager_delegate.mm",
+    "fake_wk_configuration_provider_observer.h",
+    "fake_wk_configuration_provider_observer.mm",
     "mock_interstitial_delegate.h",
     "mock_interstitial_delegate.mm",
   ]
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index 2ce39203262..ebfd098096e 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -12,6 +12,7 @@ source_set("web_state") {
     ":web_state_impl_header",
     ":wk_web_view_security_util",
     "//base",
+    "//ios/web/common",
     "//ios/web/interstitials",
     "//ios/web/navigation",
     "//ios/web/navigation:core",
@@ -152,6 +153,7 @@ source_set("context_menu") {
   deps = [
     "//base",
     "//components/url_formatter",
+    "//ios/web/common",
     "//ios/web/public",
   ]
 
diff --git a/chromium/ios/web/web_state/js/BUILD.gn b/chromium/ios/web/web_state/js/BUILD.gn
index de76bc5b850..28b6271f737 100644
--- a/chromium/ios/web/web_state/js/BUILD.gn
+++ b/chromium/ios/web/web_state/js/BUILD.gn
@@ -9,14 +9,11 @@ source_set("js") {
     ":script_util",
     "//base",
     "//ios/web/public",
-    "//ios/web/web_state/ui:crw_wk_script_message_router",
   ]
 
   sources = [
     "crw_js_injection_manager.mm",
     "crw_js_injection_receiver.mm",
-    "crw_js_post_request_loader.h",
-    "crw_js_post_request_loader.mm",
     "crw_js_window_id_manager.h",
     "crw_js_window_id_manager.mm",
   ]
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index 2657aa75850..14cb032f9f2 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -23,6 +23,7 @@ source_set("ui") {
     "//ios/net",
     "//ios/web:core",
     "//ios/web/browsing_data",
+    "//ios/web/common",
     "//ios/web/find_in_page",
     "//ios/web/interstitials",
     "//ios/web/navigation",
@@ -57,7 +58,6 @@ source_set("ui") {
     "crw_web_controller.mm",
     "crw_web_controller_container_view.h",
     "crw_web_controller_container_view.mm",
-    "crw_web_view_content_view.mm",
     "crw_web_view_proxy_impl.h",
     "crw_web_view_proxy_impl.mm",
     "crw_web_view_scroll_view_proxy.mm",
@@ -131,6 +131,7 @@ source_set("wk_web_view_configuration_provider") {
   deps = [
     ":crw_wk_script_message_router",
     "//base",
+    "//ios/web/common",
     "//ios/web/public",
     "//ios/web/web_state/js",
     "//ios/web/web_state/js:script_util",
@@ -140,6 +141,7 @@ source_set("wk_web_view_configuration_provider") {
   sources = [
     "wk_web_view_configuration_provider.h",
     "wk_web_view_configuration_provider.mm",
+    "wk_web_view_configuration_provider_observer.h",
   ]
 
   libs = [ "WebKit.framework" ]
diff --git a/chromium/ios/web/webui/BUILD.gn b/chromium/ios/web/webui/BUILD.gn
index 9947ca2c08f..6f7a42fc43b 100644
--- a/chromium/ios/web/webui/BUILD.gn
+++ b/chromium/ios/web/webui/BUILD.gn
@@ -38,8 +38,8 @@ source_set("webui") {
     "url_data_source_ios_impl.h",
     "url_fetcher_block_adapter.h",
     "url_fetcher_block_adapter.mm",
-    "web_ui_ios_controller_factory_registry.cc",
     "web_ui_ios_controller_factory_registry.h",
+    "web_ui_ios_controller_factory_registry.mm",
     "web_ui_ios_data_source_impl.h",
     "web_ui_ios_data_source_impl.mm",
     "web_ui_ios_impl.h",
diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn
index bb6772ac195..af9e161d8d7 100644
--- a/chromium/ios/web_view/BUILD.gn
+++ b/chromium/ios/web_view/BUILD.gn
@@ -162,24 +162,16 @@ ios_web_view_sources = [
   "internal/pref_names.mm",
   "internal/signin/ios_web_view_signin_client.h",
   "internal/signin/ios_web_view_signin_client.mm",
-  "internal/signin/web_view_account_fetcher_service_factory.h",
-  "internal/signin/web_view_account_fetcher_service_factory.mm",
   "internal/signin/web_view_account_tracker_service_factory.h",
   "internal/signin/web_view_account_tracker_service_factory.mm",
-  "internal/signin/web_view_gaia_cookie_manager_service_factory.h",
-  "internal/signin/web_view_gaia_cookie_manager_service_factory.mm",
   "internal/signin/web_view_identity_manager_factory.h",
   "internal/signin/web_view_identity_manager_factory.mm",
-  "internal/signin/web_view_oauth2_token_service_factory.h",
-  "internal/signin/web_view_oauth2_token_service_factory.mm",
   "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.h",
   "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.mm",
   "internal/signin/web_view_signin_client_factory.h",
   "internal/signin/web_view_signin_client_factory.mm",
   "internal/signin/web_view_signin_error_controller_factory.h",
   "internal/signin/web_view_signin_error_controller_factory.mm",
-  "internal/signin/web_view_signin_manager_factory.h",
-  "internal/signin/web_view_signin_manager_factory.mm",
   "internal/sync/web_view_device_info_sync_service_factory.h",
   "internal/sync/web_view_device_info_sync_service_factory.mm",
   "internal/sync/web_view_model_type_store_service_factory.h",
@@ -298,10 +290,14 @@ ios_web_view_deps = [
   "//components/signin/ios/browser:active_state_manager",
   "//components/strings:components_strings_grit",
   "//components/sync",
+  "//components/sync:device_info",
+  "//components/sync:user_events",
+  "//components/language/ios/browser",
   "//components/sync_sessions",
   "//components/translate/core/browser",
   "//components/translate/core/common",
   "//components/translate/ios/browser",
+  "//components/variations/net",
   "//components/version_info",
   "//components/version_info:version_string",
   "//components/web_resource",
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2019-05-24 11:40:17 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2019-05-24 12:42:11 +0000
commit	5d87695f37678f96492b258bbab36486c59866b4 (patch)
tree	be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/ios
parent	6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
download	qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz