BASELINE: Update Chromium to 98.0.4758.90

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

10 files changed, 61 insertions, 407 deletions

diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index eba85c93fdb..a928f6e50ad 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -9,31 +9,9 @@ import("//build/config/zip.gni")
 import("//chrome/common/features.gni")
 import("//tools/grit/grit_rule.gni")
 
-# The animated_poodle_java target is overridden downstream and used
-# instead of this one if the enable_chrome_android_internal flag is
-# enabled.
-android_library("animated_poodle_java") {
-  deps = [
-    ":animated_poodle_resources",
-    "//base:base_java",
-    "//chrome/android:chrome_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
-  ]
-
-  sources = [ "java/src/org/chromium/chrome/browser/" +
-              "autofill_assistant/header/AnimatedPoodle.java" ]
-  resources_package = "org.chromium.chrome.autofill_assistant.poodle"
-}
-
-android_resources("animated_poodle_resources") {
-  sources = [ "java/res_poodle/drawable/ic_autofill_assistant_24dp.xml" ]
-}
-
 android_library("java") {
   resources_package = "org.chromium.chrome.autofill_assistant"
   deps = [
-    ":java_resources",
     "//base:base_java",
     "//chrome/android:base_module_java",
     "//chrome/android:chrome_java",
@@ -43,15 +21,16 @@ android_library("java") {
     "//chrome/browser/settings:java",
     "//chrome/browser/signin/services/android:java",
     "//chrome/browser/tab:java",
-    "//chrome/browser/ui/android/favicon: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:java_resources",
     "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/settings/android:java",
+    "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",
     "//components/favicon/android:java",
@@ -80,9 +59,15 @@ android_library("java") {
   ]
 
   if (enable_chrome_android_internal) {
-    deps += [ "//clank/features/autofill_assistant:animated_poodle_java" ]
+    deps += [
+      "//clank/components/autofill_assistant:gms_integrator_java",
+      "//clank/features/autofill_assistant:animated_poodle_java",
+    ]
   } else {
-    deps += [ ":animated_poodle_java" ]
+    deps += [
+      "//components/autofill_assistant/android:animated_poodle_java",
+      "//components/autofill_assistant/android:gms_integrator_java",
+    ]
   }
 
   sources = [
@@ -93,21 +78,24 @@ 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/AssistantDependenciesImpl.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",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.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/AssistantSnackbar.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",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDependencyInjector.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantModuleEntryImpl.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantServiceInjector.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetUtils.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/FeedbackContext.java",
@@ -147,7 +135,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewEvents.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewFactory.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/generic_ui/AssistantViewInteractions.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AnimatedProgressBar.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
@@ -202,13 +189,13 @@ android_library("java") {
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarNativeDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesImpl.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/AssistantModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingHelperImpl.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDependencyInjector.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionImpl.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantServiceInjector.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChip.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
@@ -242,7 +229,10 @@ generate_jni("jni_headers") {
 }
 
 generate_jni("jni_headers_public") {
-  sources = [ "public/java/src/org/chromium/chrome/browser/autofill_assistant/Starter.java" ]
+  sources = [
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantFeatures.java",
+    "public/java/src/org/chromium/chrome/browser/autofill_assistant/Starter.java",
+  ]
 }
 
 generate_jni("test_support_jni_headers") {
@@ -251,6 +241,7 @@ generate_jni("test_support_jni_headers") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestEndpointService.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestServiceRequestSender.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestTtsController.java",
   ]
 }
 
@@ -263,6 +254,7 @@ android_library("autofill_assistant_java_test_support") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestScript.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestServiceRequestSender.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestTtsController.java",
   ]
 
   deps = [
@@ -283,7 +275,7 @@ android_library("test_java") {
   testonly = true
 
   sources = [
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependenciesTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingHelperTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantAccessibilityIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionsCarouselUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantAutostartTest.java",
@@ -347,7 +339,6 @@ android_library("test_java") {
     "//chrome/browser/first_run/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_manager/android:java",
-    "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/signin/services/android:java",
@@ -383,116 +374,3 @@ android_library("test_java") {
 
   data = [ "//components/test/data/autofill_assistant/" ]
 }
-
-android_resources("java_resources") {
-  sources = [
-    "java/res/drawable/autofill_assistant_actions_gradient.xml",
-    "java/res/drawable/autofill_assistant_circle_background.xml",
-    "java/res/drawable/autofill_assistant_default_details.xml",
-    "java/res/drawable/autofill_assistant_details_bg.xml",
-    "java/res/drawable/autofill_assistant_details_list_divider.xml",
-    "java/res/drawable/autofill_assistant_lightblue_rect_bg.xml",
-    "java/res/drawable/autofill_assistant_rounded_corner_background.xml",
-    "java/res/drawable/autofill_assistant_swipe_indicator.xml",
-    "java/res/drawable/ic_add_outline_white_24dp.xml",
-    "java/res/drawable/ic_airline_seat_recline_normal_black_24dp.xml",
-    "java/res/drawable/ic_autofill_assistant_add_circle_24dp.xml",
-    "java/res/drawable/ic_autofill_assistant_default_progress_start_black_24dp.xml",
-    "java/res/drawable/ic_check_circle_black_24dp.xml",
-    "java/res/drawable/ic_clear_black_chrome_24dp.xml",
-    "java/res/drawable/ic_confirmation_number_black_24dp.xml",
-    "java/res/drawable/ic_directions_car_black_24dp.xml",
-    "java/res/drawable/ic_done_black_24dp.xml",
-    "java/res/drawable/ic_fastfood_black_24dp.xml",
-    "java/res/drawable/ic_grocery_black_24dp.xml",
-    "java/res/drawable/ic_local_dining_black_24dp.xml",
-    "java/res/drawable/ic_overflow_black_24dp.xml",
-    "java/res/drawable/ic_payment_black_24dp.xml",
-    "java/res/drawable/ic_refresh_black_24dp.xml",
-    "java/res/drawable/ic_remove_outline_white_24dp.xml",
-    "java/res/drawable/ic_settings_black_24dp.xml",
-    "java/res/drawable/ic_shopping_basket_black_24dp.xml",
-    "java/res/drawable/ic_shopping_basket_black_24dp.xml",
-    "java/res/drawable/ic_vpn_key_black_24dp.xml",
-    "java/res/layout/autofill_assistant_address_full.xml",
-    "java/res/layout/autofill_assistant_address_summary.xml",
-    "java/res/layout/autofill_assistant_base_onboarding.xml",
-    "java/res/layout/autofill_assistant_bottom_sheet_content.xml",
-    "java/res/layout/autofill_assistant_bottom_sheet_toolbar.xml",
-    "java/res/layout/autofill_assistant_button_assistive.xml",
-    "java/res/layout/autofill_assistant_button_filled.xml",
-    "java/res/layout/autofill_assistant_button_hairline.xml",
-    "java/res/layout/autofill_assistant_contact_full.xml",
-    "java/res/layout/autofill_assistant_contact_summary.xml",
-    "java/res/layout/autofill_assistant_datetime.xml",
-    "java/res/layout/autofill_assistant_details.xml",
-    "java/res/layout/autofill_assistant_form_checkbox.xml",
-    "java/res/layout/autofill_assistant_form_counter.xml",
-    "java/res/layout/autofill_assistant_form_counter_input.xml",
-    "java/res/layout/autofill_assistant_form_information.xml",
-    "java/res/layout/autofill_assistant_form_radiobutton.xml",
-    "java/res/layout/autofill_assistant_form_selection_input.xml",
-    "java/res/layout/autofill_assistant_header.xml",
-    "java/res/layout/autofill_assistant_info_box.xml",
-    "java/res/layout/autofill_assistant_login.xml",
-    "java/res/layout/autofill_assistant_onboarding_no_button.xml",
-    "java/res/layout/autofill_assistant_onboarding_yes_button.xml",
-    "java/res/layout/autofill_assistant_payment_method_full.xml",
-    "java/res/layout/autofill_assistant_payment_method_summary.xml",
-    "java/res/layout/autofill_assistant_payment_request_section_divider.xml",
-    "java/res/layout/autofill_assistant_payment_request_section_title.xml",
-    "java/res/layout/autofill_assistant_payment_request_terms_and_conditions.xml",
-    "java/res/layout/autofill_assistant_popup_list_section.xml",
-    "java/res/layout/autofill_assistant_static_text_section.xml",
-    "java/res/menu/profile_icon_menu.xml",
-    "java/res/values-night-v17/colors.xml",
-    "java/res/values-v17/attrs.xml",
-    "java/res/values-v17/colors.xml",
-    "java/res/values-v17/dimens.xml",
-    "java/res/values-v17/styles.xml",
-  ]
-  deps = [
-    ":java_strings_grd",
-    "//chrome/android:chrome_app_java_resources",
-    "//components/browser_ui/styles/android:java_resources",
-  ]
-}
-
-java_strings_grd("java_strings_grd") {
-  defines = chrome_grit_defines
-  grd_file = "java/strings/android_chrome_autofill_assistant_strings.grd"
-  outputs = [ "values/android_chrome_autofill_assistant_strings.xml" ] + process_file_template(
-                android_bundle_locales_as_resources,
-                [ "values-{{source_name_part}}/android_chrome_autofill_assistant_strings.xml" ])
-}
-
-if (!incremental_install) {
-  zip("password_change_tests_runner") {
-    testonly = true
-    inputs = [
-      "$root_build_dir/test_runner/ChromePublicTest.apk",
-      "$root_build_dir/test_runner/ChromiumNetTestSupport.apk",
-      "$root_build_dir/test_runner/config_example.cfg",
-      "$root_build_dir/test_runner/parse_logs.py",
-      "$root_build_dir/test_runner/runner.py",
-    ]
-    output = "$root_build_dir/test_runner/password_change_tests_runner.zip"
-    deps = [ ":copy_password_change_tests_runner" ]
-  }
-
-  copy("copy_password_change_tests_runner") {
-    testonly = true
-    sources = [
-      "$root_build_dir/apks/ChromePublicTest.apk",
-      "$root_build_dir/apks/ChromiumNetTestSupport.apk",
-      "tools/password_change_tests_runner/config_example.cfg",
-      "tools/password_change_tests_runner/parse_logs.py",
-      "tools/password_change_tests_runner/runner.py",
-    ]
-    outputs = [ "$root_out_dir/test_runner/{{source_file_part}}" ]
-    deps = [
-      "//chrome/android:chrome_public_test_apk__test_apk__create",
-      "//net/android:net_test_support_apk__create",
-    ]
-  }
-}
diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
deleted file mode 100644
index 71f0199bc52..00000000000
--- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- android_chrome_strings.grd contains strings for VR DFM of Chrome for Android. -->
-<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
-  <outputs>
-    <output filename="values-af/android_chrome_autofill_assistant_strings.xml" lang="af" type="android" />
-    <output filename="values-am/android_chrome_autofill_assistant_strings.xml" lang="am" type="android" />
-    <output filename="values-ar/android_chrome_autofill_assistant_strings.xml" lang="ar" type="android" />
-    <output filename="values-as/android_chrome_autofill_assistant_strings.xml" lang="as" type="android" />
-    <output filename="values-az/android_chrome_autofill_assistant_strings.xml" lang="az" type="android" />
-    <output filename="values-be/android_chrome_autofill_assistant_strings.xml" lang="be" type="android" />
-    <output filename="values-bg/android_chrome_autofill_assistant_strings.xml" lang="bg" type="android" />
-    <output filename="values-bn/android_chrome_autofill_assistant_strings.xml" lang="bn" type="android" />
-    <output filename="values-bs/android_chrome_autofill_assistant_strings.xml" lang="bs" type="android" />
-    <output filename="values-ca/android_chrome_autofill_assistant_strings.xml" lang="ca" type="android" />
-    <output filename="values-cs/android_chrome_autofill_assistant_strings.xml" lang="cs" type="android" />
-    <output filename="values-da/android_chrome_autofill_assistant_strings.xml" lang="da" type="android" />
-    <output filename="values-de/android_chrome_autofill_assistant_strings.xml" lang="de" type="android" />
-    <output filename="values-el/android_chrome_autofill_assistant_strings.xml" lang="el" type="android" />
-    <output filename="values/android_chrome_autofill_assistant_strings.xml" lang="en" type="android" />
-    <output filename="values-en-rGB/android_chrome_autofill_assistant_strings.xml" lang="en-GB" type="android" />
-    <output filename="values-es/android_chrome_autofill_assistant_strings.xml" lang="es" type="android" />
-    <output filename="values-es-rUS/android_chrome_autofill_assistant_strings.xml" lang="es-419" type="android" />
-    <output filename="values-et/android_chrome_autofill_assistant_strings.xml" lang="et" type="android" />
-    <output filename="values-eu/android_chrome_autofill_assistant_strings.xml" lang="eu" type="android" />
-    <output filename="values-fa/android_chrome_autofill_assistant_strings.xml" lang="fa" type="android" />
-    <output filename="values-fi/android_chrome_autofill_assistant_strings.xml" lang="fi" type="android" />
-    <output filename="values-tl/android_chrome_autofill_assistant_strings.xml" lang="fil" type="android" />
-    <output filename="values-fr/android_chrome_autofill_assistant_strings.xml" lang="fr" type="android" />
-    <output filename="values-fr-rCA/android_chrome_autofill_assistant_strings.xml" lang="fr-CA" type="android" />
-    <output filename="values-gl/android_chrome_autofill_assistant_strings.xml" lang="gl" type="android" />
-    <output filename="values-gu/android_chrome_autofill_assistant_strings.xml" lang="gu" type="android" />
-    <output filename="values-hi/android_chrome_autofill_assistant_strings.xml" lang="hi" type="android" />
-    <output filename="values-hr/android_chrome_autofill_assistant_strings.xml" lang="hr" type="android" />
-    <output filename="values-hu/android_chrome_autofill_assistant_strings.xml" lang="hu" type="android" />
-    <output filename="values-hy/android_chrome_autofill_assistant_strings.xml" lang="hy" type="android" />
-    <output filename="values-in/android_chrome_autofill_assistant_strings.xml" lang="id" type="android" />
-    <output filename="values-is/android_chrome_autofill_assistant_strings.xml" lang="is" type="android" />
-    <output filename="values-it/android_chrome_autofill_assistant_strings.xml" lang="it" type="android" />
-    <output filename="values-iw/android_chrome_autofill_assistant_strings.xml" lang="iw" type="android" />
-    <output filename="values-ja/android_chrome_autofill_assistant_strings.xml" lang="ja" type="android" />
-    <output filename="values-ka/android_chrome_autofill_assistant_strings.xml" lang="ka" type="android" />
-    <output filename="values-kk/android_chrome_autofill_assistant_strings.xml" lang="kk" type="android" />
-    <output filename="values-km/android_chrome_autofill_assistant_strings.xml" lang="km" type="android" />
-    <output filename="values-kn/android_chrome_autofill_assistant_strings.xml" lang="kn" type="android" />
-    <output filename="values-ko/android_chrome_autofill_assistant_strings.xml" lang="ko" type="android" />
-    <output filename="values-ky/android_chrome_autofill_assistant_strings.xml" lang="ky" type="android" />
-    <output filename="values-lo/android_chrome_autofill_assistant_strings.xml" lang="lo" type="android" />
-    <output filename="values-lt/android_chrome_autofill_assistant_strings.xml" lang="lt" type="android" />
-    <output filename="values-lv/android_chrome_autofill_assistant_strings.xml" lang="lv" type="android" />
-    <output filename="values-mk/android_chrome_autofill_assistant_strings.xml" lang="mk" type="android" />
-    <output filename="values-ml/android_chrome_autofill_assistant_strings.xml" lang="ml" type="android" />
-    <output filename="values-mn/android_chrome_autofill_assistant_strings.xml" lang="mn" type="android" />
-    <output filename="values-mr/android_chrome_autofill_assistant_strings.xml" lang="mr" type="android" />
-    <output filename="values-ms/android_chrome_autofill_assistant_strings.xml" lang="ms" type="android" />
-    <output filename="values-my/android_chrome_autofill_assistant_strings.xml" lang="my" type="android" />
-    <output filename="values-ne/android_chrome_autofill_assistant_strings.xml" lang="ne" type="android" />
-    <output filename="values-nl/android_chrome_autofill_assistant_strings.xml" lang="nl" type="android" />
-    <output filename="values-nb/android_chrome_autofill_assistant_strings.xml" lang="no" type="android" />
-    <output filename="values-or/android_chrome_autofill_assistant_strings.xml" lang="or" type="android" />
-    <output filename="values-pa/android_chrome_autofill_assistant_strings.xml" lang="pa" type="android" />
-    <output filename="values-pl/android_chrome_autofill_assistant_strings.xml" lang="pl" type="android" />
-    <output filename="values-pt-rBR/android_chrome_autofill_assistant_strings.xml" lang="pt-BR" type="android" />
-    <output filename="values-pt-rPT/android_chrome_autofill_assistant_strings.xml" lang="pt-PT" type="android" />
-    <output filename="values-ro/android_chrome_autofill_assistant_strings.xml" lang="ro" type="android" />
-    <output filename="values-ru/android_chrome_autofill_assistant_strings.xml" lang="ru" type="android" />
-    <output filename="values-si/android_chrome_autofill_assistant_strings.xml" lang="si" type="android" />
-    <output filename="values-sk/android_chrome_autofill_assistant_strings.xml" lang="sk" type="android" />
-    <output filename="values-sl/android_chrome_autofill_assistant_strings.xml" lang="sl" type="android" />
-    <output filename="values-sq/android_chrome_autofill_assistant_strings.xml" lang="sq" type="android" />
-    <output filename="values-sr/android_chrome_autofill_assistant_strings.xml" lang="sr" type="android" />
-    <output filename="values-b+sr+Latn/android_chrome_autofill_assistant_strings.xml" lang="sr-Latn" type="android" />
-    <output filename="values-sv/android_chrome_autofill_assistant_strings.xml" lang="sv" type="android" />
-    <output filename="values-sw/android_chrome_autofill_assistant_strings.xml" lang="sw" type="android" />
-    <output filename="values-ta/android_chrome_autofill_assistant_strings.xml" lang="ta" type="android" />
-    <output filename="values-te/android_chrome_autofill_assistant_strings.xml" lang="te" type="android" />
-    <output filename="values-th/android_chrome_autofill_assistant_strings.xml" lang="th" type="android" />
-    <output filename="values-tr/android_chrome_autofill_assistant_strings.xml" lang="tr" type="android" />
-    <output filename="values-uk/android_chrome_autofill_assistant_strings.xml" lang="uk" type="android" />
-    <output filename="values-ur/android_chrome_autofill_assistant_strings.xml" lang="ur" type="android" />
-    <output filename="values-uz/android_chrome_autofill_assistant_strings.xml" lang="uz" type="android" />
-    <output filename="values-vi/android_chrome_autofill_assistant_strings.xml" lang="vi" type="android" />
-    <output filename="values-zh-rCN/android_chrome_autofill_assistant_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rHK/android_chrome_autofill_assistant_strings.xml" lang="zh-HK" type="android" />
-    <output filename="values-zh-rTW/android_chrome_autofill_assistant_strings.xml" lang="zh-TW" type="android" />
-    <output filename="values-zu/android_chrome_autofill_assistant_strings.xml" lang="zu" type="android" />
-  </outputs>
-  <translations>
-    <file path="translations/android_chrome_autofill_assistant_strings_af.xtb" lang="af" />
-    <file path="translations/android_chrome_autofill_assistant_strings_am.xtb" lang="am" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ar.xtb" lang="ar" />
-    <file path="translations/android_chrome_autofill_assistant_strings_as.xtb" lang="as" />
-    <file path="translations/android_chrome_autofill_assistant_strings_az.xtb" lang="az" />
-    <file path="translations/android_chrome_autofill_assistant_strings_be.xtb" lang="be" />
-    <file path="translations/android_chrome_autofill_assistant_strings_bg.xtb" lang="bg" />
-    <file path="translations/android_chrome_autofill_assistant_strings_bn.xtb" lang="bn" />
-    <file path="translations/android_chrome_autofill_assistant_strings_bs.xtb" lang="bs" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ca.xtb" lang="ca" />
-    <file path="translations/android_chrome_autofill_assistant_strings_cs.xtb" lang="cs" />
-    <file path="translations/android_chrome_autofill_assistant_strings_da.xtb" lang="da" />
-    <file path="translations/android_chrome_autofill_assistant_strings_de.xtb" lang="de" />
-    <file path="translations/android_chrome_autofill_assistant_strings_el.xtb" lang="el" />
-    <file path="translations/android_chrome_autofill_assistant_strings_en-GB.xtb" lang="en-GB" />
-    <file path="translations/android_chrome_autofill_assistant_strings_es.xtb" lang="es" />
-    <file path="translations/android_chrome_autofill_assistant_strings_es-419.xtb" lang="es-419" />
-    <file path="translations/android_chrome_autofill_assistant_strings_et.xtb" lang="et" />
-    <file path="translations/android_chrome_autofill_assistant_strings_eu.xtb" lang="eu" />
-    <file path="translations/android_chrome_autofill_assistant_strings_fa.xtb" lang="fa" />
-    <file path="translations/android_chrome_autofill_assistant_strings_fi.xtb" lang="fi" />
-    <file path="translations/android_chrome_autofill_assistant_strings_fil.xtb" lang="fil" />
-    <file path="translations/android_chrome_autofill_assistant_strings_fr.xtb" lang="fr" />
-    <file path="translations/android_chrome_autofill_assistant_strings_fr-CA.xtb" lang="fr-CA" />
-    <file path="translations/android_chrome_autofill_assistant_strings_gl.xtb" lang="gl" />
-    <file path="translations/android_chrome_autofill_assistant_strings_gu.xtb" lang="gu" />
-    <file path="translations/android_chrome_autofill_assistant_strings_hi.xtb" lang="hi" />
-    <file path="translations/android_chrome_autofill_assistant_strings_hr.xtb" lang="hr" />
-    <file path="translations/android_chrome_autofill_assistant_strings_hu.xtb" lang="hu" />
-    <file path="translations/android_chrome_autofill_assistant_strings_hy.xtb" lang="hy" />
-    <file path="translations/android_chrome_autofill_assistant_strings_id.xtb" lang="id" />
-    <file path="translations/android_chrome_autofill_assistant_strings_is.xtb" lang="is" />
-    <file path="translations/android_chrome_autofill_assistant_strings_it.xtb" lang="it" />
-    <file path="translations/android_chrome_autofill_assistant_strings_iw.xtb" lang="iw" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ja.xtb" lang="ja" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ka.xtb" lang="ka" />
-    <file path="translations/android_chrome_autofill_assistant_strings_kk.xtb" lang="kk" />
-    <file path="translations/android_chrome_autofill_assistant_strings_km.xtb" lang="km" />
-    <file path="translations/android_chrome_autofill_assistant_strings_kn.xtb" lang="kn" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ko.xtb" lang="ko" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ky.xtb" lang="ky" />
-    <file path="translations/android_chrome_autofill_assistant_strings_lo.xtb" lang="lo" />
-    <file path="translations/android_chrome_autofill_assistant_strings_lt.xtb" lang="lt" />
-    <file path="translations/android_chrome_autofill_assistant_strings_lv.xtb" lang="lv" />
-    <file path="translations/android_chrome_autofill_assistant_strings_mk.xtb" lang="mk" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ml.xtb" lang="ml" />
-    <file path="translations/android_chrome_autofill_assistant_strings_mn.xtb" lang="mn" />
-    <file path="translations/android_chrome_autofill_assistant_strings_mr.xtb" lang="mr" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ms.xtb" lang="ms" />
-    <file path="translations/android_chrome_autofill_assistant_strings_my.xtb" lang="my" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ne.xtb" lang="ne" />
-    <file path="translations/android_chrome_autofill_assistant_strings_nl.xtb" lang="nl" />
-    <file path="translations/android_chrome_autofill_assistant_strings_no.xtb" lang="no" />
-    <file path="translations/android_chrome_autofill_assistant_strings_or.xtb" lang="or" />
-    <file path="translations/android_chrome_autofill_assistant_strings_pa.xtb" lang="pa" />
-    <file path="translations/android_chrome_autofill_assistant_strings_pl.xtb" lang="pl" />
-    <file path="translations/android_chrome_autofill_assistant_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="translations/android_chrome_autofill_assistant_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ro.xtb" lang="ro" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ru.xtb" lang="ru" />
-    <file path="translations/android_chrome_autofill_assistant_strings_si.xtb" lang="si" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sk.xtb" lang="sk" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sl.xtb" lang="sl" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sq.xtb" lang="sq" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sr.xtb" lang="sr" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sr-Latn.xtb" lang="sr-Latn" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sv.xtb" lang="sv" />
-    <file path="translations/android_chrome_autofill_assistant_strings_sw.xtb" lang="sw" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ta.xtb" lang="ta" />
-    <file path="translations/android_chrome_autofill_assistant_strings_te.xtb" lang="te" />
-    <file path="translations/android_chrome_autofill_assistant_strings_th.xtb" lang="th" />
-    <file path="translations/android_chrome_autofill_assistant_strings_tr.xtb" lang="tr" />
-    <file path="translations/android_chrome_autofill_assistant_strings_uk.xtb" lang="uk" />
-    <file path="translations/android_chrome_autofill_assistant_strings_ur.xtb" lang="ur" />
-    <file path="translations/android_chrome_autofill_assistant_strings_uz.xtb" lang="uz" />
-    <file path="translations/android_chrome_autofill_assistant_strings_vi.xtb" lang="vi" />
-    <file path="translations/android_chrome_autofill_assistant_strings_zh-CN.xtb" lang="zh-CN" />
-    <file path="translations/android_chrome_autofill_assistant_strings_zh-HK.xtb" lang="zh-HK" />
-    <file path="translations/android_chrome_autofill_assistant_strings_zh-TW.xtb" lang="zh-TW" />
-    <file path="translations/android_chrome_autofill_assistant_strings_zu.xtb" lang="zu" />
-  </translations>
-  <release seq="1">
-    <messages fallback_to_english="true">
-      <message name="IDS_INIT_OK" desc="Init screen confirmation text.">
-        I agree
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_TITLE" desc="The title of the onboarding screen.">
-        Try Google Assistant\nin Chrome
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_RENT_CAR" desc="Onboarding message describing autofill assistant's capability for car rentals.">
-        Rent a car\nin just a few taps
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_PASSWORD_CHANGE" desc="Onboarding message describing autofill assistant's capability for password change.">
-        Let Google Assistant help you\nchange your password
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_BUY_MOVIE_TICKETS" desc="Onboarding message describing autofill assistant's capability for movie tickets.">
-        Buy movie tickets\nin just a few taps
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FOOD_ORDERING" desc="Onboarding message describing autofill assistant's capability for food ordering.">
-        Order food\nin just a few taps
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FLIGHTS_CHECKIN" desc="Onboarding message describing autofill assistant's capability for flights.">
-        Check in to your flight\nin just a few taps
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_VOICE_SEARCH" desc="Onboarding message describing autofill assistant's capability for voice search.">
-        Try voice actions\non websites
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_SHOPPING" desc="Onboarding message describing autofill assistant's capability for shopping.">
-        Fast checkout\nin just a few taps
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE" desc="Onboarding message describing autofill assistant's capability.">
-        Google Assistant saves you time by helping you complete actions on the web, like search and checkout.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_SHORT" desc="Short onboarding message describing autofill assistant's capability.">
-        Google Assistant in Chrome can complete actions across websites for you
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_DESCRIPTION" desc="Message linking to the Google terms and conditions for Google Assistant in Chrome.">
-        To help you complete tasks, Google will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Google account. You can turn off Assistant in Chrome settings. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn&#xA0;more<ph name="END_LINK">&lt;/link&gt;</ph>
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_URL" desc="URL for Google Autofill Assistant Terms of Service" translateable="false">
-        http://support.google.com/assistant?p=fast_checkout
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_GIVE_UP"
-               desc="Text label that is shown when autofill assistant cannot help anymore, because of a user action."
-               internal_comment="TODO(wnwen): Remove duplication in components/autofill_assistant_strings.grdp">
-        Sorry I'm not able to help, please continue on your own.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_PAYMENT_INFORMATION_MISSING" desc="Text label that is shown when a payment request entry (e.g., contact details or payment method) is incomplete.">
-        Information missing
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_VIEW_ORIGINAL_IMAGE_DESC" desc="Description of view image dialog.">
-        Open external link?
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_VIEW_ORIGINAL_IMAGE_VIEW" desc="Text on the button to view original image.">
-        View
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_VIEW_ORIGINAL_IMAGE_CANCEL" desc="Text on the button to dismiss view image dialog.">
-        Cancel
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_SHEET_CONTENT_DESCRIPTION" desc="Content description for the Autofill Assistant sheet.">
-        Google Assistant in Chrome.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_SHEET_HALF_HEIGHT" desc="Text announced when the Autofill Assistant sheet is opened at half height.">
-        Google Assistant in Chrome opened at half height.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_SHEET_FULL_HEIGHT" desc="Text announced when the Autofill Assistant sheet is opened at full height.">
-        Google Assistant in Chrome opened at full height.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_SHEET_CLOSED" desc="Text announced when the Autofill Assistant sheet is closed.">
-        Google Assistant in Chrome closed.
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_SEND_FEEDBACK" desc="Option shown in the menu when clicking the Autofill Assistant profile icon. Clicking this option will open a feedback sharing dialog.">
-        Send feedback
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_INCREASE_VALUE" desc="Text announced when the '+' button of a counter is highlighted by TalkBack.">
-        Increase value
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_DECREASE_VALUE" desc="Text announced when the '-' button of a counter is highlighted by TalkBack.">
-        Decrease value
-      </message>
-      <message name="IDS_AUTOFILL_ASSISTANT_OVERFLOW_OPTIONS" desc="Content description for the overflow icon displayed in the first prompt, which will open a popup menu with additional options.">
-        Preferences
-      </message>
-    </messages>
-  </release>
-</grit>
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 a4db6da36e0..d7ad13e51a7 100644
--- a/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
+++ b/chromium/chrome/android/features/autofill_assistant/public/java_sources.gni
@@ -4,6 +4,12 @@
 
 public_autofill_assistant_java_sources = [
   "//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/AssistantFeatures.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/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/AssistantStaticDependencies.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 c7613ff9cbd..237bb8da515 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -15,6 +15,7 @@ android_library("java") {
 
   deps = [
     ":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",
@@ -32,6 +33,10 @@ android_library("java") {
   resources_package = "org.chromium.chrome.browser.webauth.authenticator"
 }
 
+android_library("logging_java") {
+  sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableEventLogger.java" ]
+}
+
 generate_jni("jni_headers") {
   sources = [
     "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEAdvert.java",
@@ -44,7 +49,9 @@ generate_jni("jni_headers") {
 android_resources("java_resources") {
   sources = [
     "java/res/drawable-night/ble.xml",
+    "java/res/drawable-night/cable_qr_code.xml",
     "java/res/drawable/ble.xml",
+    "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/cablev2_ble_enable.xml",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index f92f90bdf32..e0686b1a042 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -28,6 +28,7 @@ android_library("internal_java") {
     "//components/autofill/android:autofill_java",
     "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",
     "//components/feature_engagement/public:public_java",
diff --git a/chromium/chrome/android/features/start_surface/BUILD.gn b/chromium/chrome/android/features/start_surface/BUILD.gn
index cfd95248a49..bc6e8e4d535 100644
--- a/chromium/chrome/android/features/start_surface/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/BUILD.gn
@@ -33,3 +33,8 @@ android_library("public_java") {
 generate_jni("jni_headers") {
   sources = [ "public/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" ]
+}
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index 97a2622fb64..67549829ea8 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -42,10 +42,12 @@ android_resources("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",
@@ -84,6 +86,7 @@ android_library("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/prefs/android:java",
     "//components/user_prefs/android:java",
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index 7eb4997474b..314a3fe3cfa 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -203,6 +203,7 @@ android_library("java") {
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/lens:java",
+    "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/search_engines/android:java",
     "//chrome/browser/share:java",
@@ -247,6 +248,7 @@ android_library("java") {
     "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/androidx:androidx_recyclerview_recyclerview_java",
     "//ui/android:ui_java",
+    "//ui/base/mojom:mojom_java",
     "//url:gurl_java",
   ]
   resources_package = "org.chromium.chrome.tab_ui"
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index 77aa17ecfc1..8961852f56e 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -80,6 +80,7 @@ android_library("java") {
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/ui/android/omnibox:util_java",
+    "//chrome/browser/ui/android/page_info:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/modaldialog/android:java",
@@ -88,6 +89,7 @@ android_library("java") {
     "//components/embedder_support/android:content_view_java",
     "//components/external_intents/android:java",
     "//components/infobars/core:infobar_enums_java",
+    "//components/messages/android:java",
     "//components/page_info/android:java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
diff --git a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
index b86491ecd25..f42aa8ad69e 100644
--- a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
+++ b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
@@ -176,17 +176,20 @@
           Provide feedback
         </message>
 
-        <!-- VR services check infobar -->
-        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_INSTALL_TEXT" desc="Text to be displayed in the VR Services check infobar. When a WebVR page is loaded if the VR services that are needed to display WebVR don't exist an infobar will be shown to the user prompting them to install VR services.">
-          To view virtual reality content, install Google VR Services
+        <!-- VR services check message -->
+        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_TITLE" desc="Title to be displayed in the VR Services check message. When a WebVR page is loaded if the VR services that are needed to display WebVR don't exist a message will be shown to the user prompting them to install VR services.">
+          Install Google VR Services?
         </message>
-        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_UPDATE_TEXT" desc="Text to be displayed in the VR Services check infobar. When a WebVR page is loaded if the VR services that are needed to display WebVR are out of date an infobar will be shown to the user prompting them to update VR services.">
-          To view virtual reality content, update Google VR Services
+        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_TITLE" desc="Title to be displayed in the VR Services check message. When a WebVR page is loaded if the VR services that are needed to display WebVR are out of date a message will be shown to the user prompting them to update VR services.">
+          Update Google VR Services?
         </message>
-        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_INSTALL_BUTTON" desc="Text to be displayed in the VR Services check infobar confirm button for installing.">
+        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_DESCRIPTION" desc="Text to be displayed in the VR Services check message description.">
+          View virtual reality content
+        </message>
+        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_INSTALL_BUTTON" desc="Text to be displayed in the VR Services check message confirm button for installing.">
           Install
         </message>
-        <message name="IDS_VR_SERVICES_CHECK_INFOBAR_UPDATE_BUTTON" desc="Text to be displayed in the VR Services check infobar confirm button for updating.">
+        <message name="IDS_VR_SERVICES_CHECK_MESSAGE_UPDATE_BUTTON" desc="Text to be displayed in the VR Services check message confirm button for updating.">
           Update
         </message>
     </messages>