BASELINE: Update Chromium to 104.0.5112.120

Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

21 files changed, 214 insertions, 199 deletions

diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index 2eb087f8a73..3f38d3522d6 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -39,6 +39,8 @@ android_library("autofill_assistant_java_test_support") {
     ":test_support_jni_headers",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//base:jni_java",
+    "//build/android:build_java",
     "//components/autofill_assistant/android:java",
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/test/android:content_java_test_support",
@@ -159,5 +161,8 @@ android_library("test_java") {
     "//url:gurl_java",
   ]
 
+  # Add tests from "guided_browsing" sub-component.
+  deps += [ "guided_browsing:test_java" ]
+
   data = [ "//components/test/data/autofill_assistant/" ]
 }
diff --git a/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn
new file mode 100644
index 00000000000..ef86dbd3e07
--- /dev/null
+++ b/chromium/chrome/android/features/autofill_assistant/guided_browsing/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2022 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/android/rules.gni")
+
+android_library("test_java") {
+  resources_package =
+      "org.chromium.components.autofill_assistant.guided_browsing"
+
+  testonly = true
+
+  sources = [ "javatests/src/org/chromium/chrome/browser/autofill_assistant/guided_browsing/AssistantQrCodeTest.java" ]
+
+  deps = [
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/android:chrome_test_java",
+    "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//components/autofill_assistant/guided_browsing/android:java",
+    "//components/autofill_assistant/guided_browsing/android:java_resources",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:espresso_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_test_runner_java",
+    "//third_party/hamcrest:hamcrest_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+  ]
+}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index c610598b745..2370e7a6699 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -19,12 +19,15 @@ android_library("java") {
     "$google_play_services_package:google_play_services_base_java",
     "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java",
+    "//base:jni_java",
+    "//build/android:build_java",
     "//chrome/browser/webauthn/android:java_resources",
     "//components/webauthn/android:java",
     "//content/public/android:content_java",
     "//mojo/public/mojom/base:base_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_fragment_fragment_java",
+    "//third_party/androidx:androidx_vectordrawable_vectordrawable_animated_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_full_java",
   ]
diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn
index 2edf36e8118..eec4bfb267d 100644
--- a/chromium/chrome/android/features/dev_ui/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/BUILD.gn
@@ -14,10 +14,7 @@ buildflag_header("buildflags") {
 }
 
 android_library("java") {
-  deps = [
-    "//base:base_java",
-    "//chrome/android/features/dev_ui/public:java",
-  ]
+  deps = [ "//chrome/android/features/dev_ui/public:java" ]
   sources =
       [ "internal/java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
 }
diff --git a/chromium/chrome/android/features/dev_ui/public/BUILD.gn b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
index 779293eb7ec..ff498f1f45c 100644
--- a/chromium/chrome/android/features/dev_ui/public/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
@@ -6,7 +6,6 @@ import("//build/config/android/rules.gni")
 
 android_library("java") {
   deps = [
-    "//base:base_java",
     "//components/module_installer/android:module_installer_java",
     "//components/module_installer/android:module_interface_java",
   ]
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index 0590ad49ec9..b45bf8479e9 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -122,6 +122,7 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
+    "//chrome/browser/back_press/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_manager/android:java",
     "//chrome/browser/tab:java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index e0686b1a042..2e8b31a2ec2 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -11,11 +11,14 @@ android_library("internal_java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
+    "//build/android:build_java",
     "//components/favicon/android:java",
 
     # TODO(crbug/951695): Cyclic dependency. Depend on public only when ready.
     "//chrome/android:chrome_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
+    "//chrome/browser/back_press/android:java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/fullscreen/android:java",
@@ -35,10 +38,11 @@ android_library("internal_java") {
     "//components/image_fetcher:java",
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_core_core_java",
     "//third_party/androidx:androidx_recyclerview_recyclerview_java",
     "//third_party/androidx:androidx_viewpager_viewpager_java",
     "//ui/android:ui_java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
index d78110e4d43..3988527c9ac 100644
--- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -7,8 +7,11 @@ import("//build/config/android/rules.gni")
 android_library("public_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
+    "//chrome/browser/back_press/android:java",
     "//components/autofill/android:autofill_java",
     "//components/browser_ui/bottomsheet/android:java",
+    "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
diff --git a/chromium/chrome/android/features/start_surface/BUILD.gn b/chromium/chrome/android/features/start_surface/BUILD.gn
index bc6e8e4d535..ae5b59d51b2 100644
--- a/chromium/chrome/android/features/start_surface/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/BUILD.gn
@@ -4,37 +4,99 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/browser/buildflags.gni")
+import("//chrome/common/features.gni")
+import("//components/feed/features.gni")
+import("//tools/grit/grit_rule.gni")
+
+java_strings_grd("java_strings_grd") {
+  defines = chrome_grit_defines
+  grd_file = "java/strings/android_chrome_start_surface_strings.grd"
+  outputs = [ "values/android_chrome_start_surface_strings.xml" ] + process_file_template(
+                android_bundle_locales_as_resources,
+                [ "values-{{source_name_part}}/android_chrome_start_surface_strings.xml" ])
+}
+
+android_resources("java_resources") {
+  sources = [
+    "java/res/drawable-hdpi/ic_explore.png",
+    "java/res/drawable-hdpi/ic_home.png",
+    "java/res/drawable-mdpi/ic_explore.png",
+    "java/res/drawable-mdpi/ic_home.png",
+    "java/res/drawable-xhdpi/ic_explore.png",
+    "java/res/drawable-xhdpi/ic_home.png",
+    "java/res/drawable-xxhdpi/ic_explore.png",
+    "java/res/drawable-xxhdpi/ic_home.png",
+    "java/res/drawable-xxxhdpi/ic_explore.png",
+    "java/res/drawable-xxxhdpi/ic_home.png",
+    "java/res/drawable/single_tab_background.xml",
+    "java/res/layout/query_tiles_layout.xml",
+    "java/res/layout/single_tab_view_layout.xml",
+    "java/res/layout/ss_bottom_bar_layout.xml",
+    "java/res/layout/ss_explore_button.xml",
+    "java/res/layout/ss_home_button.xml",
+    "java/res/layout/tasks_surface_search_box_layout.xml",
+    "java/res/layout/tasks_view_layout.xml",
+    "java/res/values/dimens.xml",
+    "java/res/values/ids.xml",
+  ]
+  deps = [
+    ":java_strings_grd",
+    "//chrome/android:chrome_app_java_resources",
+    "//chrome/android/features/tab_ui:java_resources",
+  ]
+}
 
 android_library("public_java") {
   sources = [
-    "public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java",
-    "public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceState.java",
-    "public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceUserData.java",
+    "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
+    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java",
+    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceState.java",
+    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceUserData.java",
+    "java/src/org/chromium/chrome/features/tasks/SingleTabView.java",
+    "java/src/org/chromium/chrome/features/tasks/SingleTabViewBinder.java",
+    "java/src/org/chromium/chrome/features/tasks/SingleTabViewProperties.java",
   ]
 
   deps = [
+    ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
+    "//build/android:build_java",
+    "//chrome/android:chrome_app_java_resources",
+    "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/share:java",
     "//chrome/browser/tab:java",
+    "//chrome/browser/tabmodel:java",
     "//chrome/browser/ui/android/layouts:java",
+    "//chrome/browser/ui/android/omnibox:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
+    "//components/browser_ui/widget/android:java",
+    "//components/content_settings/android:content_settings_enums_java",
     "//components/prefs/android:java",
     "//components/user_prefs/android:java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/metrics_proto:metrics_proto_java",
+    "//ui/android:ui_no_recycler_view_java",
     "//url:gurl_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  resources_package = "org.chromium.chrome.start_surface"
 }
 
 generate_jni("jni_headers") {
-  sources = [ "public/java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java" ]
+  sources = [ "java/src/org/chromium/chrome/features/start_surface/StartSurfaceConfiguration.java" ]
 }
 
 android_library("test_support_java") {
-  sources = [ "internal/javatests/src/org/chromium/chrome/features/start_surface/ViewIds.java" ]
-  deps = [ "//chrome/android/features/start_surface/internal:java" ]
+  sources = [
+    "javatests/src/org/chromium/chrome/features/start_surface/ViewIds.java",
+  ]
+  deps = [ "//chrome/android:chrome_java" ]
 }
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
deleted file mode 100644
index b436f2f936c..00000000000
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ /dev/null
@@ -1,112 +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/android/rules.gni")
-import("//build/config/locales.gni")
-import("//chrome/common/features.gni")
-import("//components/feed/features.gni")
-import("//tools/grit/grit_rule.gni")
-
-java_strings_grd("java_strings_grd") {
-  defines = chrome_grit_defines
-  grd_file = "java/strings/android_chrome_start_surface_strings.grd"
-  outputs = [ "values/android_chrome_start_surface_strings.xml" ] + process_file_template(
-                android_bundle_locales_as_resources,
-                [ "values-{{source_name_part}}/android_chrome_start_surface_strings.xml" ])
-}
-
-android_resources("java_resources") {
-  sources = [
-    "java/res/drawable-hdpi/ic_explore.png",
-    "java/res/drawable-hdpi/ic_home.png",
-    "java/res/drawable-mdpi/ic_explore.png",
-    "java/res/drawable-mdpi/ic_home.png",
-    "java/res/drawable-xhdpi/ic_explore.png",
-    "java/res/drawable-xhdpi/ic_home.png",
-    "java/res/drawable-xxhdpi/ic_explore.png",
-    "java/res/drawable-xxhdpi/ic_home.png",
-    "java/res/drawable-xxxhdpi/ic_explore.png",
-    "java/res/drawable-xxxhdpi/ic_home.png",
-    "java/res/layout/ss_bottom_bar_layout.xml",
-    "java/res/layout/ss_explore_button.xml",
-    "java/res/layout/ss_home_button.xml",
-    "java/res/values/dimens.xml",
-    "java/res/values/ids.xml",
-  ]
-  deps = [
-    ":java_strings_grd",
-    "//chrome/android:chrome_app_java_resources",
-    "//chrome/android/features/tab_ui:java_resources",
-  ]
-}
-
-android_library("java") {
-  sources = [
-    "java/src/org/chromium/chrome/features/start_surface/BackgroundTabAnimation.java",
-    "java/src/org/chromium/chrome/features/start_surface/BottomBarCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/BottomBarView.java",
-    "java/src/org/chromium/chrome/features/start_surface/BottomBarViewBinder.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinatorFactory.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceFeedLifecycleManager.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java",
-    "java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
-    "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
-    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceDelegate.java",
-    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java",
-    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
-    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
-    "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
-  ]
-
-  deps = [
-    ":java_resources",
-    "//base:base_java",
-    "//chrome/android:chrome_java",
-    "//chrome/android/features/start_surface:public_java",
-    "//chrome/android/feed:chrome_feed_java_resources",
-    "//chrome/browser/android/lifecycle:java",
-    "//chrome/browser/browser_controls/android:java",
-    "//chrome/browser/feed/android:java",
-    "//chrome/browser/flags:java",
-    "//chrome/browser/lens:java",
-    "//chrome/browser/preferences:java",
-    "//chrome/browser/profiles/android:java",
-    "//chrome/browser/tab:java",
-    "//chrome/browser/tabmodel:java",
-    "//chrome/browser/ui/android/layouts:java",
-    "//chrome/browser/ui/android/layouts/third_party/float_property:java",
-    "//chrome/browser/ui/android/omnibox:java",
-    "//chrome/browser/ui/android/toolbar:java",
-    "//chrome/browser/ui/messages/android:java",
-    "//chrome/browser/util:java",
-    "//chrome/browser/xsurface:java",
-    "//components/browser_ui/bottomsheet/android:java",
-    "//components/browser_ui/styles/android:java",
-    "//components/browser_ui/widget/android:java",
-    "//components/embedder_support/android:util_java",
-    "//components/prefs/android:java",
-    "//components/user_prefs/android:java",
-    "//components/version_info/android:version_constants_java",
-    "//content/public/android:content_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:material_design_java",
-    "//third_party/androidx:androidx_annotation_annotation_java",
-    "//third_party/androidx:androidx_browser_browser_java",
-    "//ui/android:ui_full_java",
-    "//ui/android:ui_utils_java",
-    "//ui/base/mojom:mojom_java",
-  ]
-
-  if (!is_java_debug) {
-    if (!defined(proguard_configs)) {
-      proguard_configs = []
-    }
-    proguard_configs += [ "proguard.flags" ]
-  }
-  resources_package = "org.chromium.chrome.start_surface"
-}
diff --git a/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni b/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni
deleted file mode 100644
index c8326b00904..00000000000
--- a/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni
+++ /dev/null
@@ -1,24 +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.
-
-start_surface_test_java_sources = [
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartFeedTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartNewTabFromLauncherTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartToolbarTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceBackButtonTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceFinaleTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutPerfTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceMVTilesTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceNoTabsTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTabSwitcherTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTestUtils.java",
-  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java",
-]
diff --git a/chromium/chrome/android/features/start_surface/internal/junit/start_surface_junit_java_sources.gni b/chromium/chrome/android/features/start_surface/internal/junit/start_surface_junit_java_sources.gni
deleted file mode 100644
index 3ec881733ba..00000000000
--- a/chromium/chrome/android/features/start_surface/internal/junit/start_surface_junit_java_sources.gni
+++ /dev/null
@@ -1,5 +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.
-
-start_surface_junit_java_sources = [ "//chrome/android/features/start_surface/internal/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java" ]
diff --git a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd b/chromium/chrome/android/features/start_surface/java/strings/android_chrome_start_surface_strings.grd
index 919013f7267..919013f7267 100644
--- a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
+++ b/chromium/chrome/android/features/start_surface/java/strings/android_chrome_start_surface_strings.grd
diff --git a/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni b/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni
new file mode 100644
index 00000000000..4e9923761fe
--- /dev/null
+++ b/chromium/chrome/android/features/start_surface/javatests/start_surface_test_java_sources.gni
@@ -0,0 +1,26 @@
+# 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.
+
+start_surface_test_java_sources = [
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartFeedTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartNewTabFromLauncherTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartToolbarTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceBackButtonTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceFinaleTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceMVTilesTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceNoTabsTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTabSwitcherTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTestUtils.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/TabSwitcherAndStartSurfaceLayoutPerfTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/TabSwitcherAndStartSurfaceLayoutTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinderTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/tasks/SingleTabViewBinderTest.java",
+  "//chrome/android/features/start_surface/javatests/src/org/chromium/chrome/features/tasks/TasksViewBinderTest.java",
+]
diff --git a/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni b/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni
new file mode 100644
index 00000000000..622e98cb05e
--- /dev/null
+++ b/chromium/chrome/android/features/start_surface/junit/start_surface_junit_java_sources.gni
@@ -0,0 +1,9 @@
+# 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.
+
+start_surface_junit_java_sources = [
+  "//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java",
+  "//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/tasks/SingleTabSwitcherMediatorUnitTest.java",
+  "//chrome/android/features/start_surface/junit/src/org/chromium/chrome/features/tasks/TasksSurfaceMediatorUnitTest.java",
+]
diff --git a/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni b/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni
deleted file mode 100644
index 16e70d9a540..00000000000
--- a/chromium/chrome/android/features/start_surface/public/start_surface_public_java_sources.gni
+++ /dev/null
@@ -1,6 +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.
-
-# TODO: Move this to the target public_java too.
-start_surface_public_java_sources = [ "//chrome/android/features/start_surface/public/java/src/org/chromium/chrome/features/start_surface/StartSurface.java" ]
diff --git a/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni b/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni
new file mode 100644
index 00000000000..dc747ea00a0
--- /dev/null
+++ b/chromium/chrome/android/features/start_surface/start_surface_java_sources.gni
@@ -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.
+
+# TODO: Move this to the target public_java too.
+start_surface_java_sources = [
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/BackgroundTabAnimation.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/BottomBarCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/BottomBarView.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/BottomBarViewBinder.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinatorFactory.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceFeedLifecycleManager.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurface.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceDelegate.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceHomeLayout.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/TabSwitcherAndStartSurfaceLayout.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/SingleTabSwitcherCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/SingleTabSwitcherMediator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurface.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurfaceCoordinator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurfaceMediator.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurfaceProperties.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksView.java",
+  "//chrome/android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksViewBinder.java",
+]
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index 614df94d29b..50b3d8c4139 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -45,7 +45,6 @@ android_resources("java_resources") {
     "java/res/drawable/price_card_scrim.xml",
     "java/res/drawable/selected_tab_background.xml",
     "java/res/drawable/selected_tab_background_incognito.xml",
-    "java/res/drawable/single_tab_background.xml",
     "java/res/drawable/tab_grid_card_background.xml",
     "java/res/drawable/tab_grid_dialog_background.xml",
     "java/res/drawable/tab_grid_selection_list_icon.xml",
@@ -66,10 +65,8 @@ android_resources("java_resources") {
     "java/res/layout/new_tab_tile_card_item.xml",
     "java/res/layout/price_card.xml",
     "java/res/layout/price_tracking_dialog_layout.xml",
-    "java/res/layout/query_tiles_layout.xml",
     "java/res/layout/selectable_tab_grid_card_item.xml",
     "java/res/layout/selectable_tab_list_card_item.xml",
-    "java/res/layout/single_tab_view_layout.xml",
     "java/res/layout/store_hours_card.xml",
     "java/res/layout/tab_grid_card_item.xml",
     "java/res/layout/tab_grid_dialog_layout.xml",
@@ -79,8 +76,6 @@ android_resources("java_resources") {
     "java/res/layout/tab_selection_editor_layout.xml",
     "java/res/layout/tab_selection_editor_toolbar.xml",
     "java/res/layout/tab_strip_item.xml",
-    "java/res/layout/tasks_surface_search_box_layout.xml",
-    "java/res/layout/tasks_view_layout.xml",
     "java/res/values/attrs.xml",
     "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
@@ -96,15 +91,6 @@ android_resources("java_resources") {
 
 android_library("java") {
   sources = [
-    "java/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/SingleTabView.java",
-    "java/src/org/chromium/chrome/browser/tasks/SingleTabViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/SingleTabViewProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksView.java",
-    "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageCardViewModel.java",
@@ -152,7 +138,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListModel.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java",
@@ -171,7 +156,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageService.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/BaselineTabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java",
@@ -191,14 +175,15 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/android:ui_locale_string_resources",
     "//chrome/android/features/start_surface:public_java",
-    "//chrome/android/features/start_surface/internal:java",
+    "//chrome/android/features/tab_ui/public:java",
     "//chrome/app:java_strings_grd",
     "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/back_press/android:java",
     "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/commerce/price_tracking/android:java",
     "//chrome/browser/endpoint_fetcher:java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/feed/android:java",
-    "//chrome/browser/feedback/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/lens:java",
     "//chrome/browser/preferences:java",
@@ -210,6 +195,7 @@ android_library("java") {
     "//chrome/browser/tab_group:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/ui/android/favicon:java",
+    "//chrome/browser/ui/android/layouts:java",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/night_mode:java",
     "//chrome/browser/ui/android/omnibox:java",
@@ -222,7 +208,6 @@ android_library("java") {
     "//components/browser_ui/share/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
-    "//components/content_settings/android:content_settings_enums_java",
     "//components/embedder_support/android:util_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/favicon/android:java",
@@ -235,16 +220,14 @@ android_library("java") {
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
     "//net/android:net_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
-    "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/androidx:androidx_core_core_java",
-    "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
-    "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+    "//third_party/androidx:androidx_vectordrawable_vectordrawable_animated_java",
     "//ui/android:ui_java",
     "//ui/base/mojom:mojom_java",
     "//url:gurl_java",
diff --git a/chromium/chrome/android/features/tab_ui/public/BUILD.gn b/chromium/chrome/android/features/tab_ui/public/BUILD.gn
new file mode 100644
index 00000000000..1f34c92ad7a
--- /dev/null
+++ b/chromium/chrome/android/features/tab_ui/public/BUILD.gn
@@ -0,0 +1,12 @@
+# 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/android/rules.gni")
+
+# This should ideally hold all the files in public_tab_management_java_sources, which is defined in the tab_management_java_sources.gni module.
+android_library("java") {
+  sources = [ "android/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCustomViewManager.java" ]
+
+  deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
+}
diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
index ce79765fcf6..70e7efc5a32 100644
--- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -2,23 +2,21 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import(
-    "//chrome/android/features/start_surface/public/start_surface_public_java_sources.gni")
-
 public_tab_management_java_sources = [
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurface.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/mv_tiles/MostVisitedTileNavigationDelegate.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialog.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/StoreTrackingUtilities.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProvider.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleProvider.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcher.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherBackPressHandler.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherLayout.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiThemeProvider.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestion.java",
@@ -27,11 +25,7 @@ public_tab_management_java_sources = [
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsObserver.java",
 ]
 
-public_tab_management_java_sources += start_surface_public_java_sources
-
 tab_management_test_java_sources = [
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialogTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinderTest.java",
@@ -40,7 +34,6 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceCardViewTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingDialogTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilitiesTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/RecyclerViewMatcherUtils.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridAccessibilityHelperTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java",
@@ -63,8 +56,6 @@ tab_management_test_java_sources = [
 ]
 
 tab_management_junit_java_sources = [
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediatorUnitTest.java",
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTabUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCacheUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtilsUnitTest.java",
@@ -80,6 +71,7 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProviderUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageServiceUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCustomViewManagerUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilitiesUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUnitTestUtils.java",
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index 8961852f56e..863a86a2d10 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -70,6 +70,8 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
+    "//build/android:build_java",
     "//cc:cc_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/feedback/android:java",
@@ -94,11 +96,8 @@ android_library("java") {
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
-    "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
-    "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/gvr-android-keyboard:kb_java",
     "//third_party/gvr-android-sdk:gvr_common_java",
     "//ui/android:ui_full_java",