BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

50 files changed, 582 insertions, 115 deletions

diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn
index 49ec6232695..5a2e59c8486 100644
--- a/chromium/ios/chrome/browser/ui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/BUILD.gn
@@ -99,7 +99,6 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "browser_container_view_unittest.mm",
     "browser_view_controller_helper_unittest.mm",
     "browser_view_controller_unittest.mm",
     "chrome_web_view_factory_unittest.mm",
@@ -150,6 +149,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
+    "//ios/net",
     "//ios/testing:ocmock_support",
     "//ios/web",
     "//ios/web/public/test",
@@ -263,8 +263,6 @@ source_set("external_files") {
 source_set("ui_internal") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "browser_container_view.h",
-    "browser_container_view.mm",
     "browser_view_controller.h",
     "browser_view_controller.mm",
     "browser_view_controller_dependency_factory.h",
@@ -277,8 +275,6 @@ source_set("ui_internal") {
     "fade_truncated_label.mm",
     "key_commands_provider.h",
     "key_commands_provider.mm",
-    "new_foreground_tab_fullscreen_disabler.h",
-    "new_foreground_tab_fullscreen_disabler.mm",
     "open_in_controller.h",
     "open_in_controller.mm",
     "open_in_controller_testing.h",
@@ -346,12 +342,15 @@ source_set("ui_internal") {
     "//ios/chrome/browser/store_kit",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/translate",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services:coordinator",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/app_launcher",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/browser_container",
+    "//ios/chrome/browser/ui/browser_container:ui",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
@@ -488,26 +487,6 @@ bundle_data("resources_unit_tests") {
   ]
 }
 
-# These tests use external URLs and hit network.  They will fail if the network
-# is unavailable. Reference to crbug.com/694662.
-source_set("external_url_eg_tests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  testonly = true
-  sources = [
-    "external_url_error_page_egtest.mm",
-  ]
-  deps = [
-    "//components/strings",
-    "//ios/chrome/test/app:test_support",
-    "//ios/chrome/test/earl_grey:test_support",
-    "//ios/web:earl_grey_test_support",
-    "//ios/web/public/test",
-    "//ios/web/public/test/http_server",
-    "//ui/base",
-  ]
-  libs = [ "XCTest.framework" ]
-}
-
 source_set("eg_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -523,7 +502,9 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/ntp:ntp_controller",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/testing:ios_test_support",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
index 2ba9b4407b9..8c9528b2809 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn
@@ -11,6 +11,8 @@ source_set("activity_services") {
     "activity_type_util.mm",
     "appex_constants.h",
     "appex_constants.mm",
+    "bookmark_activity.h",
+    "bookmark_activity.mm",
     "canonical_url_retriever.h",
     "canonical_url_retriever.mm",
     "chrome_activity_item_source.h",
@@ -28,12 +30,16 @@ source_set("activity_services") {
     "share_to_data_builder.mm",
   ]
   deps = [
+    "resources:activity_services_add_bookmark",
+    "resources:activity_services_edit_bookmark",
     "resources:activity_services_print",
-    "resources:activity_services_reading_list",
+    "resources:activity_services_read_later",
     "//base",
+    "//components/bookmarks/browser",
     "//components/ui_metrics",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/snapshots",
@@ -89,12 +95,17 @@ source_set("unit_tests") {
     ":activity_services",
     "//base",
     "//base/test:test_support",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/test",
     "//components/ui_metrics",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
     "//ios/testing:ios_test_support",
diff --git a/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
index 1475c664935..ef9b775e724 100644
--- a/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/activity_services/resources/BUILD.gn
@@ -4,6 +4,24 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
+imageset("activity_services_add_bookmark") {
+  sources = [
+    "activity_services_add_bookmark.imageset/Contents.json",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-60@2x.png",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-60@3x.png",
+    "activity_services_add_bookmark.imageset/activity_services_add_bookmark-76@2x.png",
+  ]
+}
+
+imageset("activity_services_edit_bookmark") {
+  sources = [
+    "activity_services_edit_bookmark.imageset/Contents.json",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-60@2x.png",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-60@3x.png",
+    "activity_services_edit_bookmark.imageset/activity_services_edit_bookmark-76@2x.png",
+  ]
+}
+
 imageset("activity_services_print") {
   sources = [
     "activity_services_print.imageset/Contents.json",
@@ -14,11 +32,11 @@ imageset("activity_services_print") {
   ]
 }
 
-imageset("activity_services_reading_list") {
+imageset("activity_services_read_later") {
   sources = [
-    "activity_services_reading_list.imageset/Contents.json",
-    "activity_services_reading_list.imageset/activity_services_reading_list.png",
-    "activity_services_reading_list.imageset/activity_services_reading_list@2x.png",
-    "activity_services_reading_list.imageset/activity_services_reading_list@3x.png",
+    "activity_services_read_later.imageset/Contents.json",
+    "activity_services_read_later.imageset/activity_services_read_later-60@2x.png",
+    "activity_services_read_later.imageset/activity_services_read_later-60@3x.png",
+    "activity_services_read_later.imageset/activity_services_read_later-76@2x.png",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
index f1d89bed5ee..f14f7c1172e 100644
--- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn
@@ -31,9 +31,9 @@ source_set("authentication") {
   ]
   deps = [
     ":authentication_ui",
-    "resources:identity_picker_view_arrow_down",
     "resources:signin_confirmation_more",
     "resources:signin_promo_close_gray",
+    "unified_consent",
     "//base",
     "//components/consent_auditor",
     "//components/google/core/browser",
@@ -44,10 +44,8 @@ source_set("authentication") {
     "//components/strings",
     "//google_apis",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/browsing_data",
     "//ios/chrome/browser/consent_auditor",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/signin",
@@ -65,7 +63,6 @@ source_set("authentication") {
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
     "//ios/third_party/material_components_ios",
-    "//ios/third_party/material_roboto_font_loader_ios",
     "//ui/base",
     "//ui/gfx",
     "//url",
diff --git a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
index b5c7d333a87..02a9899ea9b 100644
--- a/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/authentication/resources/BUILD.gn
@@ -4,14 +4,6 @@
 
 import("//build/config/ios/asset_catalog.gni")
 
-imageset("identity_picker_view_arrow_down") {
-  sources = [
-    "identity_picker_view_arrow_down.imageset/Contents.json",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down.png",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@2x.png",
-    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@3x.png",
-  ]
-}
 imageset("signin_confirmation_more") {
   sources = [
     "signin_confirmation_more.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
new file mode 100644
index 00000000000..a7ddafbd05c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+source_set("unified_consent") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "unified_consent_coordinator.h",
+    "unified_consent_coordinator.mm",
+    "unified_consent_mediator.h",
+    "unified_consent_mediator.mm",
+  ]
+  deps = [
+    ":unified_consent_ui",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
+    "//ios/public/provider/chrome/browser/signin",
+  ]
+}
+
+source_set("unified_consent_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_picker_view.h",
+    "identity_picker_view.mm",
+    "unified_consent_view_controller.h",
+    "unified_consent_view_controller.mm",
+  ]
+  deps = [
+    "resources:identity_picker_view_arrow_down",
+    "//base",
+    "//components/google/core/browser",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
new file mode 100644
index 00000000000..1d314d84bea
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+
+source_set("identity_chooser") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_chooser_coordinator.h",
+    "identity_chooser_coordinator.mm",
+    "identity_chooser_mediator.h",
+    "identity_chooser_mediator.mm",
+  ]
+  deps = [
+    ":identity_chooser_ui",
+    "//base",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/signin",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/public/provider/chrome/browser/signin",
+  ]
+}
+
+source_set("identity_chooser_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "identity_chooser_add_account_item.h",
+    "identity_chooser_add_account_item.mm",
+    "identity_chooser_cell.h",
+    "identity_chooser_cell.mm",
+    "identity_chooser_header_item.h",
+    "identity_chooser_header_item.mm",
+    "identity_chooser_item.h",
+    "identity_chooser_item.mm",
+    "identity_chooser_view_controller.h",
+    "identity_chooser_view_controller.mm",
+    "identity_chooser_view_controller_presentation_delegate.h",
+    "identity_chooser_view_controller_selection_delegate.h",
+    "identity_view.h",
+    "identity_view.mm",
+  ]
+  deps = [
+    "resources:identity_chooser_add_account",
+    "//base",
+    "//components/google/core/browser",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ui/base",
+  ]
+  public_deps = [
+    "//ios/chrome/browser/ui/table_view",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn
new file mode 100644
index 00000000000..89ae677d1d6
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/resources/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("identity_chooser_add_account") {
+  sources = [
+    "identity_chooser_add_account.imageset/Contents.json",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account.png",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account@2x.png",
+    "identity_chooser_add_account.imageset/identity_chooser_add_account@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn
new file mode 100644
index 00000000000..c5475c10235
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/resources/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("identity_picker_view_arrow_down") {
+  sources = [
+    "identity_picker_view_arrow_down.imageset/Contents.json",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down.png",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@2x.png",
+    "identity_picker_view_arrow_down.imageset/identity_picker_view_arrow_down@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
index 2e8ba2ce44e..3ed0954cc8b 100644
--- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -5,7 +5,6 @@
 source_set("autofill") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "autofill_save_card_infobar.mm",
     "autofill_ui_type_util.h",
     "autofill_ui_type_util.mm",
     "card_unmask_prompt_view_bridge.h",
@@ -57,13 +56,32 @@ source_set("autofill_ui") {
     "autofill_edit_accessory_view.h",
     "autofill_edit_accessory_view.mm",
     "autofill_ui_type.h",
+    "save_card_infobar_controller.h",
+    "save_card_infobar_controller.mm",
+    "save_card_infobar_view.h",
+    "save_card_infobar_view.mm",
+    "save_card_infobar_view_delegate.h",
   ]
   deps = [
     "//base",
+    "//base:i18n",
+    "//components/autofill/core/browser",
     "//components/strings:components_strings_grit",
+    "//ios/chrome/app/theme",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/infobars",
+    "//ios/chrome/browser/ui/infobars/resources:infobar_close",
+    "//ios/chrome/browser/ui/infobars/resources:infobar_shadow",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/common",
+    "//ios/third_party/material_components_ios",
+    "//ios/third_party/material_roboto_font_loader_ios",
     "//ui/base:base",
+    "//url:url",
   ]
   libs = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
index 5835553c610..3236c0a440e 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -7,16 +7,17 @@ source_set("bookmarks") {
   sources = [
     "bookmark_edit_view_controller.h",
     "bookmark_edit_view_controller.mm",
-    "bookmark_elevated_toolbar.h",
-    "bookmark_elevated_toolbar.mm",
     "bookmark_empty_background.h",
     "bookmark_empty_background.mm",
     "bookmark_folder_editor_view_controller.h",
     "bookmark_folder_editor_view_controller.mm",
-    "bookmark_folder_table_view_cell.h",
-    "bookmark_folder_table_view_cell.mm",
     "bookmark_folder_view_controller.h",
     "bookmark_folder_view_controller.mm",
+    "bookmark_home_consumer.h",
+    "bookmark_home_mediator.h",
+    "bookmark_home_mediator.mm",
+    "bookmark_home_shared_state.h",
+    "bookmark_home_shared_state.mm",
     "bookmark_home_view_controller.h",
     "bookmark_home_view_controller.mm",
     "bookmark_home_waiting_view.h",
@@ -33,8 +34,8 @@ source_set("bookmarks") {
     "bookmark_path_cache.mm",
     "bookmark_promo_controller.h",
     "bookmark_promo_controller.mm",
-    "bookmark_table_view.h",
-    "bookmark_table_view.mm",
+    "bookmark_transitioning_delegate.h",
+    "bookmark_transitioning_delegate.mm",
     "bookmark_utils_ios.h",
     "bookmark_utils_ios.mm",
     "undo_manager_bridge_observer.h",
@@ -43,6 +44,7 @@ source_set("bookmarks") {
     "undo_manager_wrapper.mm",
   ]
   deps = [
+    ":bookmarks_ui",
     "resources:bookmark_bar_innershadow",
     "resources:bookmark_bar_shadow",
     "resources:bookmark_black_delete",
@@ -51,6 +53,7 @@ source_set("bookmarks") {
     "resources:bookmark_black_select",
     "resources:bookmark_blue_check",
     "resources:bookmark_blue_folder",
+    "resources:bookmark_blue_new_folder",
     "resources:bookmark_gray_back",
     "resources:bookmark_gray_check",
     "resources:bookmark_gray_close",
@@ -93,24 +96,24 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
-    "//ios/chrome/browser/ui/bookmarks/bars",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/collection_view",
-    "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/main:feature_flags",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/signin_interaction/public",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:presentation",
+    "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/undo",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
-    "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
     "//ios/web",
     "//skia",
@@ -118,10 +121,7 @@ source_set("bookmarks") {
     "//ui/gfx",
     "//url",
   ]
-  allow_circular_includes_from = [
-    "//ios/chrome/browser/ui/bookmarks/bars",
-    "//ios/chrome/browser/ui/bookmarks/cells",
-  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
   libs = [
     "CoreGraphics.framework",
     "QuartzCore.framework",
@@ -129,6 +129,15 @@ source_set("bookmarks") {
   ]
 }
 
+source_set("bookmarks_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_ui_constants.h",
+    "bookmark_ui_constants.mm",
+  ]
+  deps = []
+}
+
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
@@ -161,6 +170,7 @@ source_set("eg_tests") {
     "bookmarks_egtest.mm",
   ]
   deps = [
+    ":bookmarks_ui",
     "//base",
     "//components/bookmarks/browser",
     "//components/prefs",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
deleted file mode 100644
index 1f78781479f..00000000000
--- a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("bars") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "bookmark_context_bar.h",
-    "bookmark_context_bar.mm",
-  ]
-  deps = [
-    "//base",
-    "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui",
-    "//ios/chrome/browser/ui/colors",
-    "//ios/third_party/material_components_ios",
-    "//ui/base",
-  ]
-  libs = [ "UIKit.framework" ]
-}
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
index 9fc312927e4..5e2d5892658 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -4,6 +4,12 @@
 
 source_set("cells") {
   sources = [
+    "bookmark_folder_item.h",
+    "bookmark_folder_item.mm",
+    "bookmark_home_node_item.h",
+    "bookmark_home_node_item.mm",
+    "bookmark_home_promo_item.h",
+    "bookmark_home_promo_item.mm",
     "bookmark_parent_folder_item.h",
     "bookmark_parent_folder_item.mm",
     "bookmark_table_cell.h",
@@ -18,11 +24,15 @@ source_set("cells") {
     "//base",
     "//components/bookmarks/browser:browser",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
-    "//ios/chrome/browser/ui/collection_view/cells",
+    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/ui",
     "//ios/third_party/material_components_ios",
@@ -43,6 +53,7 @@ source_set("unit_tests") {
   deps = [
     ":cells",
     "//ios/chrome/browser/ui/collection_view/cells",
+    "//ios/chrome/browser/ui/table_view:styler",
     "//ios/third_party/material_components_ios",
     "//testing/gtest",
     "//third_party/ocmock",
diff --git a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
index 811b52b25e4..0e7fe2fde98 100644
--- a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn
@@ -76,6 +76,15 @@ imageset("bookmark_blue_folder") {
   ]
 }
 
+imageset("bookmark_blue_new_folder") {
+  sources = [
+    "bookmark_blue_new_folder.imageset/Contents.json",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder.png",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder@2x.png",
+    "bookmark_blue_new_folder.imageset/bookmark_blue_new_folder@3x.png",
+  ]
+}
+
 imageset("bookmark_gray_back") {
   sources = [
     "bookmark_gray_back.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
new file mode 100644
index 00000000000..ee2534b862d
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("browser_container") {
+  sources = [
+    "browser_container_coordinator.h",
+    "browser_container_coordinator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":ui",
+    "//base",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+  ]
+}
+
+source_set("ui") {
+  sources = [
+    "browser_container_view_controller.h",
+    "browser_container_view_controller.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/browser/ui/fullscreen:ui",
+    "//ios/chrome/browser/ui/util",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "browser_container_view_controller_unittest.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":ui",
+    "//base",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
index 54e7a7b2fec..ead731b115d 100644
--- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn
@@ -131,6 +131,7 @@ source_set("content_suggestions_ui") {
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons:buttons",
     "//ios/chrome/browser/ui/util:util",
+    "//ios/web/public",
     "//ui/base",
   ]
   public_deps = [
@@ -158,6 +159,7 @@ source_set("content_suggestions_ui_util") {
   deps = [
     ":content_suggestions_constant",
     "//base",
+    "//base:i18n",
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
@@ -167,7 +169,6 @@ source_set("content_suggestions_ui_util") {
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/third_party/material_components_ios",
-    "//mojo/common:common_custom_types",
     "//ui/base",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
index 03a44e332fc..f06e253edd7 100644
--- a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn
@@ -55,6 +55,7 @@ source_set("contextual_search") {
     "//base",
     "//components/google/core/browser",
     "//components/prefs",
+    "//components/prefs/ios",
     "//components/search_engines",
     "//components/variations",
     "//components/variations/net",
@@ -62,7 +63,6 @@ source_set("contextual_search") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/tabs",
diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
index 79e5b7289cc..21f8b2f8af6 100644
--- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn
@@ -55,6 +55,7 @@ source_set("eg_tests") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/find_in_page",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/earl_grey:test_support",
diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
index d15dcc65a80..73bad64b4f6 100644
--- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn
@@ -39,6 +39,7 @@ source_set("features") {
 
   deps = [
     "//base",
+    "//components/flags_ui",
   ]
 }
 
@@ -91,8 +92,11 @@ source_set("internal") {
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/browser_list",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",
+    "//ios/chrome/common:timing",
     "//ios/web",
+    "//ui/gfx/geometry",
   ]
 }
 
@@ -100,12 +104,6 @@ source_set("ui") {
   sources = [
     "fullscreen_animator.h",
     "fullscreen_animator.mm",
-    "fullscreen_foreground_animator.h",
-    "fullscreen_foreground_animator.mm",
-    "fullscreen_scroll_end_animator.h",
-    "fullscreen_scroll_end_animator.mm",
-    "fullscreen_scroll_to_top_animator.h",
-    "fullscreen_scroll_to_top_animator.mm",
     "fullscreen_ui_element.h",
   ]
 
@@ -135,6 +133,8 @@ source_set("unit_tests") {
     ":fullscreen",
     ":internal",
     ":ui",
+    "//base/test:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/fullscreen/test",
diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn
index 9d3da6d5b75..127fdfc3a13 100644
--- a/chromium/ios/chrome/browser/ui/history/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn
@@ -97,12 +97,13 @@ source_set("history_ui") {
     "history_entry_item.mm",
     "history_entry_item_delegate.h",
     "history_entry_item_interface.h",
-    "history_table_container_view_controller.h",
-    "history_table_container_view_controller.mm",
-    "history_table_updater_delegate.h",
+    "history_local_commands.h",
     "history_table_view_controller.h",
     "history_table_view_controller.mm",
-    "history_table_view_controller_delegate.h",
+    "history_transitioning_delegate.h",
+    "history_transitioning_delegate.mm",
+    "history_ui_constants.h",
+    "history_ui_constants.mm",
     "history_util.h",
     "history_util.mm",
   ]
@@ -113,18 +114,20 @@ source_set("history_ui") {
     "//components/history/core/browser",
     "//components/strings",
     "//components/url_formatter",
+    "//components/url_formatter",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/metrics:metrics_internal",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/collection_view/cells",
-    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/context_menu",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ios/chrome/browser/ui/util",
     "//ui/base",
   ]
 }
@@ -174,6 +177,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/sync:sync",
     "//ios/chrome/browser/sync:test_support",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/collection_view",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/util",
@@ -214,6 +218,7 @@ source_set("eg_tests") {
   ]
   deps = [
     ":history",
+    ":history_ui",
     "//base",
     "//components/browsing_data/core",
     "//components/prefs",
@@ -226,6 +231,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/authentication:authentication_ui",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/tools_menu",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/browser/ui/util",
diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
index 8d3618aa3e8..210a51c1734 100644
--- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -5,9 +5,10 @@
 source_set("infobars") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "infobar_view.h",
-    "infobar_view.mm",
-    "infobar_view_delegate.h",
+    "confirm_infobar_view.h",
+    "confirm_infobar_view.mm",
+    "infobar_view_sizing.h",
+    "infobar_view_sizing_delegate.h",
   ]
   deps = [
     "resources:infobar_close",
@@ -18,6 +19,8 @@ source_set("infobars") {
     "//base",
     "//base:i18n",
     "//components/strings",
+    "//ios/chrome/app/theme:theme",
+    "//ios/chrome/app/theme:theme_grit",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/fancy_ui",
@@ -39,7 +42,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "infobar_view_unittest.mm",
+    "confirm_infobar_view_unittest.mm",
   ]
   deps = [
     ":infobars",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
index c0abd89c842..4b2b31fdde3 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -5,11 +5,11 @@
 source_set("location_bar") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "extended_touch_target_button.h",
+    "extended_touch_target_button.mm",
     "location_bar_consumer.h",
     "location_bar_coordinator.h",
     "location_bar_coordinator.mm",
-    "location_bar_edit_view.h",
-    "location_bar_edit_view.mm",
     "location_bar_generic_coordinator.h",
     "location_bar_legacy_consumer.h",
     "location_bar_legacy_coordinator.h",
@@ -28,6 +28,8 @@ source_set("location_bar") {
   ]
   deps = [
     ":constants",
+    "resources:location_bar_share",
+    "resources:location_bar_voice",
     "//base",
     "//components/google/core/browser",
     "//components/google/core/browser",
@@ -35,6 +37,7 @@ source_set("location_bar") {
     "//components/search_engines",
     "//components/strings",
     "//components/toolbar",
+    "//components/variations/net",
     "//ios/chrome/app/strings",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser",
@@ -44,6 +47,8 @@ source_set("location_bar") {
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/fullscreen",
+    "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/omnibox:omnibox",
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox:omnibox_util",
@@ -53,9 +58,11 @@ source_set("location_bar") {
     "//ios/chrome/browser/ui/toolbar/keyboard_assist:keyboard_assist",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/toolbar/public:toolbar_base_feature",
+    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/common:timing",
+    "//ios/public/provider/chrome/browser:browser",
     "//ios/public/provider/chrome/browser/voice",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
@@ -102,13 +109,18 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/toolbar:test_support",
+    "//components/variations",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
+    "//ios/chrome/browser/autocomplete",
     "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/search_engines",
+    "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
     "//ios/chrome/browser/ui/toolbar/test",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
+    "//ios/chrome/test/fakes",
     "//ios/web/public",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
index 10a7ce86f75..19ab2362e37 100644
--- a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn
@@ -48,3 +48,21 @@ imageset("omnibox_voice") {
     "omnibox_voice.imageset/omnibox_voice@3x.png",
   ]
 }
+
+imageset("location_bar_share") {
+  sources = [
+    "location_bar_share.imageset/Contents.json",
+    "location_bar_share.imageset/location_bar_share.png",
+    "location_bar_share.imageset/location_bar_share@2x.png",
+    "location_bar_share.imageset/location_bar_share@3x.png",
+  ]
+}
+
+imageset("location_bar_voice") {
+  sources = [
+    "location_bar_voice.imageset/Contents.json",
+    "location_bar_voice.imageset/location_bar_voice.png",
+    "location_bar_voice.imageset/location_bar_voice@2x.png",
+    "location_bar_voice.imageset/location_bar_voice@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
index 9dcc8af9da9..718e9cf2aef 100644
--- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn
@@ -78,6 +78,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/sync:test_support",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/ntp:ntp_internal",
     "//ios/chrome/test:test_support",
     "//ios/web/public/test",
@@ -98,6 +99,7 @@ source_set("eg_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
+    "//ios/chrome/browser/ui/history:history_ui",
     "//ios/chrome/browser/ui/ntp/recent_tabs",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
index e10ecf53a32..05582c84656 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -9,6 +9,7 @@ source_set("omnibox") {
     "location_bar_controller.cc",
     "location_bar_controller.h",
     "location_bar_delegate.h",
+    "omnibox_left_image_consumer.h",
     "web_omnibox_edit_controller.cc",
     "web_omnibox_edit_controller.h",
   ]
@@ -67,13 +68,20 @@ source_set("omnibox_internal") {
     "image_retriever.h",
     "location_bar_controller_impl.h",
     "location_bar_controller_impl.mm",
+    "omnibox_consumer.h",
+    "omnibox_container_view.h",
+    "omnibox_container_view.mm",
     "omnibox_coordinator.h",
     "omnibox_coordinator.mm",
+    "omnibox_mediator.h",
+    "omnibox_mediator.mm",
     "omnibox_text_field_delegate.h",
     "omnibox_text_field_ios.h",
     "omnibox_text_field_ios.mm",
     "omnibox_text_field_paste_delegate.h",
     "omnibox_text_field_paste_delegate.mm",
+    "omnibox_view_controller.h",
+    "omnibox_view_controller.mm",
     "omnibox_view_ios.h",
     "omnibox_view_ios.mm",
     "web_omnibox_edit_controller_impl.h",
diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
index 2fa2ec002aa..3c231e34cd7 100644
--- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn
@@ -17,7 +17,6 @@ source_set("popup") {
     "omnibox_popup_view_ios.h",
     "omnibox_popup_view_ios.mm",
     "omnibox_popup_view_suggestions_delegate.h",
-    "table_view_owning.h",
   ]
   deps = [
     ":popup_internal",
@@ -45,6 +44,8 @@ source_set("popup_internal") {
   sources = [
     "omnibox_popup_row.h",
     "omnibox_popup_row.mm",
+    "self_sizing_table_view.h",
+    "self_sizing_table_view.mm",
   ]
   deps = [
     "//base",
diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
index 0cbbc1b633d..c5369590d32 100644
--- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn
@@ -20,8 +20,11 @@ source_set("overscroll_actions") {
     "resources:ptr_reload",
     "resources:ptr_reload_active",
     "//base",
+    "//ios/chrome/app/strings:ios_chromium_strings_grit",
+    "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/app/theme",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui:notifications",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/fullscreen",
@@ -34,6 +37,7 @@ source_set("overscroll_actions") {
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/web",
+    "//ui/base",
     "//ui/gfx",
   ]
   allow_circular_includes_from = [ "//ios/chrome/browser/ui/static_content" ]
diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
index 7097bce3e68..6438aa78e12 100644
--- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn
@@ -260,9 +260,11 @@ source_set("eg_tests") {
     "//components/image_fetcher/core",
     "//components/payments/core",
     "//components/payments/mojom",
+    "//components/prefs",
     "//components/strings",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/browser/autofill",
+    "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/payments",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/payments/cells",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
index 63a7258051c..832672cdbbd 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -25,9 +25,11 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/activity_services",
     "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/tools_menu/public",
@@ -50,6 +52,7 @@ source_set("popup_menu_ui") {
     "popup_menu_presenter.mm",
     "popup_menu_table_view_controller.h",
     "popup_menu_table_view_controller.mm",
+    "popup_menu_table_view_controller_commands.h",
     "popup_menu_view.h",
     "popup_menu_view.mm",
     "popup_menu_view_controller.h",
@@ -61,6 +64,8 @@ source_set("popup_menu_ui") {
     "resources:popup_background",
     "resources:popup_menu_add_bookmark",
     "resources:popup_menu_bookmarks",
+    "resources:popup_menu_close_tab",
+    "resources:popup_menu_edit_bookmark",
     "resources:popup_menu_find_in_page",
     "resources:popup_menu_help",
     "resources:popup_menu_history",
@@ -82,6 +87,7 @@ source_set("popup_menu_ui") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/popup_menu/cells",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/resources:menu_shadow",
     "//ios/chrome/browser/ui/table_view",
@@ -122,7 +128,9 @@ source_set("unit_tests") {
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
+    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser:test_support",
+    "//ios/public/provider/chrome/browser/user_feedback",
     "//ios/web",
     "//ios/web/public/test",
     "//ios/web/public/test/fakes",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
index 9aeb4a3bbb3..121d381dd21 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn
@@ -16,6 +16,7 @@ source_set("cells") {
   deps = [
     "//base",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/reading_list:reading_list_ui",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view/cells",
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
new file mode 100644
index 00000000000..50b9d336ab5
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn
@@ -0,0 +1,14 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("public") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "popup_menu_ui_updating.h",
+  ]
+  deps = [
+    "//base",
+  ]
+  libs = [ "UIKit.framework" ]
+}
diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
index c5d3c1814fb..89490646b7c 100644
--- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn
@@ -13,6 +13,15 @@ imageset("popup_menu_read_later") {
   ]
 }
 
+imageset("popup_menu_edit_bookmark") {
+  sources = [
+    "popup_menu_edit_bookmark.imageset/Contents.json",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark.png",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark@2x.png",
+    "popup_menu_edit_bookmark.imageset/popup_menu_edit_bookmark@3x.png",
+  ]
+}
+
 imageset("popup_menu_add_bookmark") {
   sources = [
     "popup_menu_add_bookmark.imageset/Contents.json",
@@ -22,6 +31,15 @@ imageset("popup_menu_add_bookmark") {
   ]
 }
 
+imageset("popup_menu_close_tab") {
+  sources = [
+    "popup_menu_close_tab.imageset/Contents.json",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab.png",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab@2x.png",
+    "popup_menu_close_tab.imageset/popup_menu_close_tab@3x.png",
+  ]
+}
+
 imageset("popup_menu_site_information") {
   sources = [
     "popup_menu_site_information.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
index 1f22a14b006..5059d943d50 100644
--- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn
@@ -49,6 +49,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/qr_scanner/requirements",
+    "//ios/chrome/browser/ui/toolbar/public",
   ]
 }
 
diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
index b726b95caef..60a7b372f7b 100644
--- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn
@@ -138,6 +138,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/static_content",
+    "//ios/chrome/test/fakes",
     "//ios/web",
     "//ios/web/public/test",
     "//testing/gtest",
diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
index 61f6b999d00..8c9fffc9f65 100644
--- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn
@@ -19,6 +19,7 @@ source_set("recent_tabs") {
     "//components/sync",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/favicon:favicon",
     "//ios/chrome/browser/sessions",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
@@ -34,6 +35,7 @@ source_set("recent_tabs") {
 source_set("recent_tabs_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "recent_tabs_image_data_source.h",
     "recent_tabs_table_view_controller.h",
     "recent_tabs_table_view_controller.mm",
     "recent_tabs_transitioning_delegate.h",
diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
index 2a592c7a918..d1b5238da93 100644
--- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn
@@ -38,6 +38,7 @@ source_set("eg_tests") {
     "//base",
     "//ios/chrome/app:app_internal",
     "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/main",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/base",
diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index ad2f11f430b..9cdf879e5a4 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -26,6 +26,10 @@ source_set("settings") {
     "block_popups_collection_view_controller.mm",
     "clear_browsing_data_collection_view_controller.h",
     "clear_browsing_data_collection_view_controller.mm",
+    "clear_browsing_data_coordinator.h",
+    "clear_browsing_data_coordinator.mm",
+    "clear_browsing_data_table_view_controller.h",
+    "clear_browsing_data_table_view_controller.mm",
     "compose_email_handler_collection_view_controller.h",
     "compose_email_handler_collection_view_controller.mm",
     "content_settings_collection_view_controller.h",
@@ -105,6 +109,8 @@ source_set("settings") {
     "//components/metrics",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
+    "//components/payments/core",
+    "//components/prefs/ios",
     "//components/resources",
     "//components/search_engines",
     "//components/signin/core/browser",
@@ -127,7 +133,6 @@ source_set("settings") {
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/mailto:features",
     "//ios/chrome/browser/passwords",
-    "//ios/chrome/browser/prefs",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/sync",
@@ -144,6 +149,7 @@ source_set("settings") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/content_suggestions/cells",
     "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/material_components",
@@ -265,6 +271,7 @@ source_set("unit_tests") {
     "//components/handoff",
     "//components/password_manager/core/browser:test_support",
     "//components/password_manager/core/common",
+    "//components/payments/core",
     "//components/pref_registry",
     "//components/prefs:test_support",
     "//components/search_engines",
diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
index f31af8add49..ab33b2f985a 100644
--- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn
@@ -28,6 +28,7 @@ source_set("side_swipe") {
     "//ios/chrome/browser/snapshots",
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/tabs/requirements",
diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
index 85eaace534b..c0bd81956aa 100644
--- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn
@@ -28,6 +28,8 @@ source_set("tab_grid") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/main",
+    "//ios/chrome/browser/ui/recent_tabs",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_switcher",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web_state_list",
@@ -70,6 +72,7 @@ source_set("tab_grid_ui") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui:ui_util",
+    "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
     "//ios/chrome/browser/ui/tab_grid/transitions",
     "//ios/chrome/browser/ui/util:constraints_ui",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
index 8a06d34c16d..72a2cbaeb47 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn
@@ -54,6 +54,8 @@ source_set("tab_switcher") {
     "resources:tabswitcher_phone",
     "resources:tabswitcher_recently_closed",
     "resources:tabswitcher_tab_switcher_button",
+    "resources:tabswitcher_tab_switcher_count_button",
+    "resources:tabswitcher_tab_switcher_count_button_pressed",
     "resources:tabswitcher_tablet",
     "//base",
     "//components/browser_sync",
diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
index 911c6a9648e..62c0b85d0ea 100644
--- a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn
@@ -112,6 +112,22 @@ imageset("tabswitcher_tab_switcher_button") {
   ]
 }
 
+imageset("tabswitcher_tab_switcher_count_button") {
+  sources = [
+    "tabswitcher_tab_switcher_count_button.imageset/Contents.json",
+    "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button.png",
+    "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button@2x.png",
+  ]
+}
+
+imageset("tabswitcher_tab_switcher_count_button_pressed") {
+  sources = [
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/Contents.json",
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed.png",
+    "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed@2x.png",
+  ]
+}
+
 imageset("tabswitcher_tablet") {
   sources = [
     "tabswitcher_tablet.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
index 183389277b7..67ed7b59b45 100644
--- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn
@@ -5,23 +5,22 @@
 source_set("table_view") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "chrome_table_view_consumer.h",
     "chrome_table_view_controller.h",
     "chrome_table_view_controller.mm",
-    "table_container_bottom_toolbar.h",
-    "table_container_bottom_toolbar.mm",
-    "table_container_constants.h",
-    "table_container_constants.mm",
-    "table_container_view_controller.h",
-    "table_container_view_controller.mm",
     "table_view_model.h",
     "table_view_model.mm",
+    "table_view_navigation_controller.h",
+    "table_view_navigation_controller.mm",
+    "table_view_navigation_controller_constants.h",
+    "table_view_navigation_controller_constants.mm",
   ]
   deps = [
     ":styler",
     "//base",
-    "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/list_model",
-    "//ui/base",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/third_party/material_components_ios",
   ]
   public_deps = [
     "//ios/chrome/browser/ui/table_view/cells",
@@ -57,7 +56,6 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "chrome_table_view_controller_unittest.mm",
-    "table_container_bottom_toolbar_unittest.mm",
     "table_view_model_unittest.mm",
   ]
   deps = [
diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
index 066b1aaff7a..3927a150bb7 100644
--- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -4,6 +4,10 @@
 
 source_set("cells") {
   sources = [
+    "table_view_accessory_item.h",
+    "table_view_accessory_item.mm",
+    "table_view_activity_indicator_header_footer_item.h",
+    "table_view_activity_indicator_header_footer_item.mm",
     "table_view_cells_constants.h",
     "table_view_cells_constants.mm",
     "table_view_disclosure_header_footer_item.h",
@@ -14,6 +18,8 @@ source_set("cells") {
     "table_view_item.mm",
     "table_view_signin_promo_item.h",
     "table_view_signin_promo_item.mm",
+    "table_view_text_button_item.h",
+    "table_view_text_button_item.mm",
     "table_view_text_header_footer_item.h",
     "table_view_text_header_footer_item.mm",
     "table_view_text_item.h",
@@ -24,12 +30,17 @@ source_set("cells") {
 
   deps = [
     "resources:table_view_cell_chevron",
+    "resources:table_view_cell_favicon_background",
     "//base",
     "//ios/chrome/browser/ui:ui_util",
     "//ios/chrome/browser/ui/authentication:authentication_ui",
+    "//ios/chrome/browser/ui/colors:colors",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/chrome/browser/ui/util:constraints_ui",
+    "//ios/third_party/material_components_ios:material_components_ios",
+    "//url:url",
   ]
   configs += [ "//build/config/compiler:enable_arc" ]
 }
@@ -37,8 +48,10 @@ source_set("cells") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "table_view_accessory_item_unittest.mm",
     "table_view_header_footer_item_unittest.mm",
     "table_view_item_unittest.mm",
+    "table_view_text_button_item_unittest.mm",
     "table_view_text_header_footer_item_unittest.mm",
     "table_view_text_item_unittest.mm",
     "table_view_url_item_unittest.mm",
@@ -48,7 +61,9 @@ source_set("unit_tests") {
     ":cells",
     "//base",
     "//ios/chrome/browser/ui/table_view:styler",
+    "//net:net",
     "//testing/gtest",
+    "//third_party/ocmock:ocmock",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
index 854202dd281..82a321f0f5a 100644
--- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn
@@ -23,17 +23,29 @@ source_set("tabs") {
   ]
   deps = [
     "resources:tabstrip_background_tab",
+    "resources:tabstrip_background_tab_legacy",
     "resources:tabstrip_foreground_tab",
+    "resources:tabstrip_foreground_tab_legacy",
     "resources:tabstrip_incognito_background_tab",
+    "resources:tabstrip_incognito_background_tab_legacy",
     "resources:tabstrip_incognito_foreground_tab",
+    "resources:tabstrip_incognito_foreground_tab_legacy",
     "resources:tabstrip_new_tab",
     "resources:tabstrip_new_tab_incognito",
+    "resources:tabstrip_new_tab_incognito_legacy",
     "resources:tabstrip_new_tab_incognito_pressed",
+    "resources:tabstrip_new_tab_incognito_pressed_legacy",
+    "resources:tabstrip_new_tab_legacy",
     "resources:tabstrip_new_tab_pressed",
+    "resources:tabstrip_new_tab_pressed_legacy",
     "resources:tabstrip_tab_close",
     "resources:tabstrip_tab_close_incognito",
+    "resources:tabstrip_tab_close_incognito_legacy",
     "resources:tabstrip_tab_close_incognito_pressed",
+    "resources:tabstrip_tab_close_incognito_pressed_legacy",
+    "resources:tabstrip_tab_close_legacy",
     "resources:tabstrip_tab_close_pressed",
+    "resources:tabstrip_tab_close_pressed_legacy",
     "resources:tabstrip_toggle_button_gradient",
     "//base",
     "//base:i18n",
diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
index 02ed68d6d9e..12ffc96d457 100644
--- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn
@@ -36,6 +36,38 @@ imageset("tabstrip_incognito_foreground_tab") {
   ]
 }
 
+imageset("tabstrip_background_tab_legacy") {
+  sources = [
+    "tabstrip_background_tab_legacy.imageset/Contents.json",
+    "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy@2x~ipad.png",
+    "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_foreground_tab_legacy") {
+  sources = [
+    "tabstrip_foreground_tab_legacy.imageset/Contents.json",
+    "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy@2x~ipad.png",
+    "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_incognito_background_tab_legacy") {
+  sources = [
+    "tabstrip_incognito_background_tab_legacy.imageset/Contents.json",
+    "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy@2x~ipad.png",
+    "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_incognito_foreground_tab_legacy") {
+  sources = [
+    "tabstrip_incognito_foreground_tab_legacy.imageset/Contents.json",
+    "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy@2x~ipad.png",
+    "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_new_tab") {
   sources = [
     "tabstrip_new_tab.imageset/Contents.json",
@@ -68,6 +100,38 @@ imageset("tabstrip_new_tab_pressed") {
   ]
 }
 
+imageset("tabstrip_new_tab_legacy") {
+  sources = [
+    "tabstrip_new_tab_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy@2x~ipad.png",
+    "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_incognito_legacy") {
+  sources = [
+    "tabstrip_new_tab_incognito_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy@2x~ipad.png",
+    "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_incognito_pressed_legacy") {
+  sources = [
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy@2x~ipad.png",
+    "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_new_tab_pressed_legacy") {
+  sources = [
+    "tabstrip_new_tab_pressed_legacy.imageset/Contents.json",
+    "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy@2x~ipad.png",
+    "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_tab_close") {
   sources = [
     "tabstrip_tab_close.imageset/Contents.json",
@@ -100,6 +164,38 @@ imageset("tabstrip_tab_close_pressed") {
   ]
 }
 
+imageset("tabstrip_tab_close_legacy") {
+  sources = [
+    "tabstrip_tab_close_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy@2x~ipad.png",
+    "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_incognito_legacy") {
+  sources = [
+    "tabstrip_tab_close_incognito_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy@2x~ipad.png",
+    "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_incognito_pressed_legacy") {
+  sources = [
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy@2x~ipad.png",
+    "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy~ipad.png",
+  ]
+}
+
+imageset("tabstrip_tab_close_pressed_legacy") {
+  sources = [
+    "tabstrip_tab_close_pressed_legacy.imageset/Contents.json",
+    "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy@2x~ipad.png",
+    "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy~ipad.png",
+  ]
+}
+
 imageset("tabstrip_toggle_button_gradient") {
   sources = [
     "tabstrip_toggle_button_gradient.imageset/Contents.json",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
index f42f1dd6630..fb086f66a68 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn
@@ -141,6 +141,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
     "//ios/chrome/browser/ui/omnibox/popup:popup_internal",
+    "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/legacy",
     "//ios/chrome/browser/ui/tools_menu/public",
diff --git a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
index 78d5c1ef44d..016d002d141 100644
--- a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn
@@ -27,7 +27,6 @@ source_set("adaptive") {
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/fullscreen",
-    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/location_bar",
     "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/ntp:util",
@@ -35,6 +34,7 @@ source_set("adaptive") {
     "//ios/chrome/browser/ui/omnibox:omnibox_internal",
     "//ios/chrome/browser/ui/omnibox/popup",
     "//ios/chrome/browser/ui/orchestrator",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar",
@@ -71,10 +71,10 @@ source_set("adaptive_ui") {
     "//ios/chrome/browser/ui/activity_services/requirements",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/fullscreen:ui",
-    "//ios/chrome/browser/ui/history_popup/requirements",
     "//ios/chrome/browser/ui/ntp:ntp",
     "//ios/chrome/browser/ui/orchestrator",
     "//ios/chrome/browser/ui/popup_menu:flags",
+    "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/public",
diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
index 4404360903c..8d7e67ee630 100644
--- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn
@@ -104,6 +104,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser:browser",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui:ui_internal",
+    "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/tools_menu/public",
     "//ios/chrome/test/earl_grey:test_support",
     "//ios/third_party/earl_grey:earl_grey+link",
diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
index 1d3e9bb7df0..f64a8f23d27 100644
--- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn
@@ -37,8 +37,6 @@ source_set("webui") {
     "//components/metrics_services_manager",
     "//components/ntp_tiles",
     "//components/password_manager/core/browser",
-    "//components/physical_web/data_source",
-    "//components/physical_web/webui",
     "//components/prefs",
     "//components/resources",
     "//components/strings",
diff --git a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
index 42d40dacb16..12db2649c51 100644
--- a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn
@@ -13,7 +13,7 @@ source_set("gcm") {
     "//components/resources",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/services/gcm",
+    "//ios/chrome/browser/gcm",
     "//ios/web",
   ]
 }