BASELINE: Update Chromium to 100.0.4896.167

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

10 files changed, 122 insertions, 32 deletions

diff --git a/chromium/chrome/android/features/android_library_factory/test/BUILD.gn b/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
index 59926021bdf..c10bb01e5fd 100644
--- a/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
+++ b/chromium/chrome/android/features/android_library_factory/test/BUILD.gn
@@ -19,7 +19,7 @@ android_nocompile_test_suite("android_lookup_dep_tests") {
     {
       target = "nocompile_gn:android_library_factory_missing_symbol_test_java"
       nocompile_sources = []
-      expected_compile_output_regex = "error: package org\.chromium\.chrome\.browser\.android_library_factory does not exist\nPlease add //chrome/android/features/android_library_factory/test/nocompile_gn:b_factory_java dep to //chrome/android/features/android_library_factory/test/nocompile_gn:android_library_factory_missing_symbol_test_java\."
+      expected_compile_output_regex = "error: package org\.chromium\.chrome\.browser\.android_library_factory does not exist\nHint: Add \"//chrome/android/features/android_library_factory/test/nocompile_gn:b_factory_java\" to deps of //chrome/android/features/android_library_factory/test/nocompile_gn:android_library_factory_missing_symbol_test_java"
     },
   ]
 }
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index a928f6e50ad..23880dc81e2 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -12,6 +12,7 @@ import("//tools/grit/grit_rule.gni")
 android_library("java") {
   resources_package = "org.chromium.chrome.autofill_assistant"
   deps = [
+    ":public_java",
     "//base:base_java",
     "//chrome/android:base_module_java",
     "//chrome/android:chrome_java",
@@ -24,8 +25,8 @@ android_library("java") {
     "//chrome/browser/ui/android/omnibox:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//chrome/browser/version:java",
     "//components/autofill/android:autofill_java",
+    "//components/autofill_assistant/android:autofill_assistant_public_java",
     "//components/autofill_assistant/android:java_resources",
     "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
@@ -39,6 +40,7 @@ android_library("java") {
     "//components/policy/android:policy_java",
     "//components/signin/public/android:java",
     "//components/url_formatter/android:url_formatter_java",
+    "//components/version_info/android:version_constants_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
@@ -58,18 +60,6 @@ android_library("java") {
     "//url:gurl_java",
   ]
 
-  if (enable_chrome_android_internal) {
-    deps += [
-      "//clank/components/autofill_assistant:gms_integrator_java",
-      "//clank/features/autofill_assistant:animated_poodle_java",
-    ]
-  } else {
-    deps += [
-      "//components/autofill_assistant/android:animated_poodle_java",
-      "//components/autofill_assistant/android:gms_integrator_java",
-    ]
-  }
-
   sources = [
     "java/src/org/chromium/chrome/browser/autofill_assistant/AbstractListObserver.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessibilityUtils.java",
@@ -78,8 +68,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarNativeDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomSheetContent.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantCoordinator.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesChrome.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesFactoryChrome.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDialogButton.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPopup.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantKeyboardCoordinator.java",
@@ -87,8 +75,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingHelperImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPeekHeightCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantRootViewContainer.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbarFactoryChrome.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTagsForTesting.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTextUtils.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandlerImpl.java",
@@ -146,6 +132,8 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxViewBinder.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/BaseOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/BottomSheetOnboardingCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/BottomSheetOnboardingWithPopupAndBubbleCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/BottomSheetOnboardingWithPopupCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/DialogOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/OnboardingCoordinatorFactory.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/OnboardingView.java",
@@ -165,13 +153,12 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantContactDetailsSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateChoiceOptions.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPhoneNumberSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantShippingAddressSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantTermsSection.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpander.java",
@@ -186,6 +173,35 @@ android_library("java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
+# Public dependencies of Autofill Assistant.
+# TODO(b/183478921): The java_sources.gni should eventually be dissolved and
+# added here. New entries should only be added here.
+android_library("public_java") {
+  resources_package = "org.chromium.chrome.autofill_assistant"
+
+  sources = [
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillCreditCard.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillProfile.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantContactEditorAccount.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantEditor.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantEditorFactory.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOptionModel.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPaymentInstrument.java",
+  ]
+
+  deps = [
+    "//base:base_java",
+    "//components/autofill/android:autofill_payments_java_resources",
+    "//components/autofill/android:main_autofill_java",
+    "//components/autofill_assistant/android:autofill_assistant_public_java",
+    "//components/payments/content/android:java_resources",
+    "//content/public/android:content_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//ui/android:ui_java",
+    "//url:gurl_java",
+  ]
+}
+
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarNativeDelegate.java",
@@ -230,7 +246,12 @@ generate_jni("jni_headers") {
 
 generate_jni("jni_headers_public") {
   sources = [
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillCreditCard.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillProfile.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencies.java",
     "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantFeatures.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependencies.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java",
     "public/java/src/org/chromium/chrome/browser/autofill_assistant/Starter.java",
   ]
 }
@@ -330,6 +351,7 @@ android_library("test_java") {
   deps = [
     ":autofill_assistant_java_test_support",
     ":java",
+    ":public_java",
     ":test_support_jni_headers",
     "//base:base_java",
     "//base:base_java_test_support",
diff --git a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
index d7ad13e51a7..e3b736b83ad 100644
--- a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
+++ b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
@@ -3,13 +3,43 @@
 # found in the LICENSE file.
 
 public_autofill_assistant_java_sources = [
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAddressEditorAutofill.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillUtilChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControls.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsFactory.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantContactEditorAutofill.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencies.java",
-  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesFactory.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantEditorFactoryChrome.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantFeatures.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantFeedbackUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantFeedbackUtilChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPageUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantInfoPageUtilChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantIsGsaFunction.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantIsMsbbEnabledFunction.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModuleInstallUi.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModuleInstallUiProviderChrome.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingHelper.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPaymentInstrumentEditorAutofill.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbar.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbarFactory.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbarFactoryChrome.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependencies.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabChangeObserver.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabChangeObserverChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabObscuringUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabObscuringUtilChrome.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabObserver.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabUtil.java",
+  "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTabUtilChrome.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionHandler.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectAction.java",
   "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionHandler.java",
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index 237bb8da515..c610598b745 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -17,15 +17,15 @@ android_library("java") {
     ":java_resources",
     ":logging_java",
     "$google_play_services_package:google_play_services_base_java",
-    "$google_play_services_package:google_play_services_fido_java",
     "$google_play_services_package:google_play_services_tasks_java",
-    "$google_play_services_package:google_play_services_vision_common_java",
-    "$google_play_services_package:google_play_services_vision_java",
     "//base:base_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/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_full_java",
   ]
 
@@ -54,6 +54,7 @@ android_resources("java_resources") {
     "java/res/drawable/cable_qr_code.xml",
     "java/res/drawable/usb_conn_disconnect.xml",
     "java/res/layout-sw600dp/cablev2_ble_enable.xml",
+    "java/res/layout-sw600dp/cablev2_qr.xml",
     "java/res/layout/cablev2_ble_enable.xml",
     "java/res/layout/cablev2_qr.xml",
     "java/res/layout/cablev2_usb_attached.xml",
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index 9322b9f6472..0590ad49ec9 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -68,6 +68,8 @@ android_library("test_java") {
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
+    "//chrome/browser/ui/android/layouts:java",
+    "//chrome/browser/ui/android/layouts/test:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
@@ -127,6 +129,7 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
     "//components/browser_ui/bottomsheet/android:java",
+    "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:util_java",
     "//components/feature_engagement/public:public_java",
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index 67549829ea8..b436f2f936c 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -37,6 +37,7 @@ android_resources("java_resources") {
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
+    "//chrome/android/features/tab_ui:java_resources",
   ]
 }
 
@@ -83,13 +84,14 @@ android_library("java") {
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//chrome/browser/version: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",
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
index a37f753c75a..c8326b00904 100644
--- 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
@@ -5,11 +5,19 @@
 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/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index 314a3fe3cfa..e020bd51476 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -33,9 +33,9 @@ android_resources("java_resources") {
     "java/res/drawable/chevron_right.xml",
     "java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
     "java/res/drawable/hovered_tab_grid_card_background.xml",
-    "java/res/drawable/ic_add_alert_blue.xml",
     "java/res/drawable/ic_check_googblue_20dp_animated.xml",
     "java/res/drawable/ic_group_icon_16dp.xml",
+    "java/res/drawable/ic_price_alert_blue.xml",
     "java/res/drawable/ic_rating_star_full.xml",
     "java/res/drawable/ic_rating_star_half.xml",
     "java/res/drawable/ic_rating_star_outline.xml",
@@ -64,10 +64,10 @@ android_resources("java_resources") {
     "java/res/layout/incognito_description_container_layout.xml",
     "java/res/layout/iph_drag_and_drop_dialog_layout.xml",
     "java/res/layout/large_message_card_item.xml",
-    "java/res/layout/mv_tiles_layout.xml",
     "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",
@@ -80,6 +80,7 @@ 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",
@@ -96,9 +97,6 @@ android_resources("java_resources") {
 
 android_library("java") {
   sources = [
-    "java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/MvTilesLayout.java",
     "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",
@@ -200,6 +198,7 @@ android_library("java") {
     "//chrome/browser/browser_controls/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",
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index 22414b4db3e..61a258adbad 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -443,6 +443,9 @@
       <message name="IDS_MERCHANT_VIEWER_MESSAGE_TITLE" desc="Message shown when merchant trust signals are available.">
         View store info?
       </message>
+      <message name="IDS_MERCHANT_VIEWER_MESSAGE_TITLE_SEE_REVIEWS" desc="Alternative title of the message shown when merchant trust signals are available.">
+        See store reviews?
+      </message>
       <message name="IDS_MERCHANT_VIEWER_MESSAGE_ACTION" desc="The label of the action button on the merchant viewer message.">
         View
       </message>
@@ -454,6 +457,11 @@
             =1 {(<ph name="REVIEWS_COUNT_ONE">%1$s<ex>1</ex></ph> review)}
             other {(<ph name="REVIEWS_COUNT_MANY">%1$s<ex>8</ex></ph> reviews)}}
       </message>
+      <message name="IDS_MERCHANT_VIEWER_MESSAGE_DESCRIPTION_REVIEWS_FROM_GOOGLE" desc="Alternative message description indicating that the reviews come from Google.">
+         {REVIEWS, plural,
+            =1 {<ph name="REVIEWS_COUNT_ONE">%1$s<ex>1</ex></ph> review from Google}
+            other {<ph name="REVIEWS_COUNT_MANY">%1$s<ex>8</ex></ph> reviews from Google}}
+      </message>
       <message name="IDS_MERCHANT_VIEWER_MESSAGE_RATING_NUMERICAL" desc="The rating of the merchant in numerical form.">
         <ph name="CURRENT_RATING">%1$.1f<ex>4.5</ex></ph>/<ph name="RATING_BASELINE">%2$d<ex>5</ex></ph>
       </message>
@@ -495,6 +503,20 @@
       <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_CLOSED" desc="Accessibility string read when the merchant viewer bottom sheet is closed.">
         Information about this store closed
       </message>
+
+      <!-- Close All Tabs Dialog Strings -->
+      <message name="IDS_CLOSE_ALL_TABS_DIALOG_TITLE" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the title of the dialog.">
+        Close all tabs?
+      </message>
+      <message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE" desc="When users click the menu item 'Close all tabs' in tab switcher, a dialog will pop up and this text is the message of the dialog.">
+        You can find your closed tabs in Recent tabs under the Chrome main menu
+      </message>
+      <message name="IDS_CLOSE_ALL_TABS_DIALOG_TITLE_INCOGNITO" desc="When users click the menu item 'Close all tabs' in Incognito tab switcher, a dialog will pop up and this text is the title of the dialog.">
+        Close all Incognito tabs?
+      </message>
+      <message name="IDS_CLOSE_ALL_TABS_DIALOG_MESSAGE_INCOGNITO" desc="When users click the menu item 'Close all tabs' in Incognito tab switcher, a dialog will pop up and this text is the message of the dialog.">
+        Your activity in these Incognito tabs will be cleared from this device
+      </message>
     </messages>
   </release>
 </grit>
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 bfb5226dd06..b87421794ab 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
@@ -6,11 +6,12 @@ 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/MostVisitedListProperties.java",
   "//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",
@@ -32,6 +33,7 @@ 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",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java",
@@ -53,18 +55,19 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorTestingRobot.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMultiWindowTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherTabletTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherThumbnailTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TestRecyclerViewSimpleViewBinder.java",
 ]
 
 tab_management_junit_java_sources = [
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinderUnitTest.java",
   "//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",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialogUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/ConditionalTabStripUtilsUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageServiceUnitTest.java",