BASELINE: Update Chromium to 90.0.4430.221

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

18 files changed, 170 insertions, 83 deletions

diff --git a/chromium/chrome/android/features/android_library_factory_tmpl.gni b/chromium/chrome/android/features/android_library_factory_tmpl.gni
index 51d7f8dd164..75a36b64d29 100644
--- a/chromium/chrome/android/features/android_library_factory_tmpl.gni
+++ b/chromium/chrome/android/features/android_library_factory_tmpl.gni
@@ -73,9 +73,6 @@ template("android_library_factory") {
   _base_gen_dir = "${target_gen_dir}/${target_name}"
 
   action_foreach_with_pydeps(_process_factory_target_name) {
-    # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
-    run_under_python2 = true
-
     script = "//chrome/android/features/create_stripped_java_factory.py"
     sources = invoker.sources
     outputs =
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index 7d0c4b65f4a..3e311910efe 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -17,7 +17,7 @@ android_library("animated_poodle_java") {
     "//base:base_java",
     "//chrome/android:chrome_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
   ]
 
   sources = [ "java/src/org/chromium/chrome/browser/" +
@@ -42,36 +42,37 @@ android_library("java") {
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/settings:java",
+    "//chrome/browser/signin/services/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/browser/version:java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",
     "//components/favicon/android:java",
     "//components/payments/content/android:java",
     "//components/policy/android:policy_java",
-    "//components/signin/core/browser/android:java",
     "//components/signin/public/android:java",
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
-    "//third_party/android_deps:androidx_collection_collection_java",
-    "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
-    "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_collection_collection_java",
+    "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+    "//third_party/androidx:androidx_core_core_java",
+    "//third_party/androidx:androidx_gridlayout_gridlayout_java",
+    "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+    "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
@@ -103,18 +104,12 @@ android_library("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/AutofillAssistantDirectActionImpl.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantLiteScriptCoordinator.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantLiteService.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/BaseOnboardingCoordinator.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetUtils.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/DialogOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/FeedbackContext.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/LayoutUtils.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/OnboardingCoordinatorFactory.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/ScrollToHideGestureListener.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/SizeListenableLinearLayout.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java",
@@ -125,9 +120,10 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipViewHolder.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/ButtonView.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsAdapter.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsViewBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantPlaceholdersConfiguration.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/ImageClickthroughData.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormCounter.java",
@@ -159,6 +155,11 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.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/DialogOnboardingCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/OnboardingCoordinatorFactory.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/OnboardingView.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java",
@@ -204,12 +205,11 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantDirectActionImpl.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantLiteService.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/BaseOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChip.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantPlaceholdersConfiguration.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormInput.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/form/AssistantFormModel.java",
@@ -226,6 +226,7 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBox.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/onboarding/BaseOnboardingCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/trigger_scripts/AssistantTriggerScriptBridge.java",
@@ -233,11 +234,13 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java",
   ]
+  split_name = "autofill_assistant"
 }
 
 generate_jni("test_support_jni_headers") {
   testonly = true
   sources = [
+    "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",
   ]
@@ -248,6 +251,7 @@ android_library("autofill_assistant_java_test_support") {
 
   sources = [
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantService.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestEndpointService.java",
     "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",
@@ -261,8 +265,8 @@ android_library("autofill_assistant_java_test_support") {
     "//base:jni_java",
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/test/android:content_java_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -289,6 +293,7 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInputActionIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInterruptIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantKeyboardIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantNavigationIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java",
@@ -302,6 +307,9 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetOnboardingCoordinatorTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureParameters.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureTestUtils.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/TestingAutofillAssistantModuleEntryProvider.java",
   ]
 
@@ -315,26 +323,28 @@ android_library("test_java") {
     "//chrome/android:chrome_test_util_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/image_fetcher:java",
+    "//chrome/browser/password_manager/android:java",
     "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/signin/services/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+    "//third_party/androidx:androidx_test_runner_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
@@ -353,6 +363,7 @@ android_resources("java_resources") {
     "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",
diff --git a/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni b/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
index 2d394de5ce5..382f11edbf8 100644
--- a/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
+++ b/chromium/chrome/android/features/autofill_assistant/autofill_assistant_module.gni
@@ -16,7 +16,14 @@ autofill_assistant_module_desc = {
   java_deps = [ "//chrome/android/features/autofill_assistant:java" ]
   android_manifest =
       "//chrome/android/features/autofill_assistant/java/AndroidManifest.xml"
+  uses_split = "chrome"
+}
 
-  # TODO(crbug.com/1155277): This is breaking because it has @CalledByNative.
-  # uses_split = "chrome"
+# Trichrome requires min-sdk version of 29, hence the duplicate but slightly
+# different manifests.
+autofill_assistant_module_trichrome_desc = {
+  name = "autofill_assistant"
+  java_deps = [ "//chrome/android/features/autofill_assistant:java" ]
+  android_manifest = "//chrome/android/features/autofill_assistant/java/AndroidManifestTrichrome.xml"
+  uses_split = "chrome"
 }
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
index add935b4379..af25291c622 100644
--- 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
@@ -166,7 +166,7 @@
     <file lang="zh-TW" path="translations/android_chrome_autofill_assistant_strings_zh-TW.xtb" />
     <file lang="zu" path="translations/android_chrome_autofill_assistant_strings_zu.xtb" />
   </translations>
-  <release allow_pseudo="false" seq="1">
+  <release seq="1">
     <messages fallback_to_english="true">
       <message name="IDS_INIT_OK" desc="Init screen confirmation text.">
         I agree
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index 188081b5031..0bdcce4b712 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -10,6 +10,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticator.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CameraView.java",
+    "java/src/org/chromium/chrome/browser/webauth/authenticator/PendingCloudMessage.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/QRScanDialog.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/USBHandler.java",
   ]
@@ -25,7 +26,7 @@ android_library("java") {
     "//base:jni_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
   ]
 
@@ -39,14 +40,37 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticator.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/USBHandler.java",
   ]
+  split_name = "cablev2_authenticator"
 }
 
 android_resources("java_resources") {
   sources = [
+    "java/res/anim/circle_loader_animation_interpolator_0.xml",
+    "java/res/anim/circle_loader_animation_interpolator_1.xml",
+    "java/res/anim/circle_loader_animation_interpolator_2.xml",
+    "java/res/anim/circle_loader_animation_interpolator_3.xml",
+    "java/res/anim/circle_loader_animation_interpolator_4.xml",
+    "java/res/anim/circle_loader_animation_interpolator_5.xml",
+    "java/res/anim/circle_loader_animation_interpolator_6.xml",
+    "java/res/anim/circle_loader_animation_interpolator_7.xml",
+    "java/res/anim/circle_loader_animation_interpolator_8.xml",
+    "java/res/anim/circle_loader_circleblue_animation.xml",
+    "java/res/anim/circle_loader_circlegreen_animation.xml",
+    "java/res/anim/circle_loader_circlered_animation.xml",
+    "java/res/anim/circle_loader_circleyellow_animation.xml",
+    "java/res/anim/circle_loader_ellipse_path_2_animation.xml",
+    "java/res/anim/circle_loader_ellipse_path_3_animation.xml",
+    "java/res/anim/circle_loader_ellipse_path_4_animation.xml",
+    "java/res/anim/circle_loader_ellipse_path_5_animation.xml",
+    "java/res/drawable/circle_loader.xml",
+    "java/res/drawable/circle_loader_animation.xml",
     "java/res/drawable/header.xml",
+    "java/res/drawable/ic_lock_googblue_48dp.xml",
+    "java/res/drawable/usb_conn_disconnect.xml",
     "java/res/layout/cablev2_fcm.xml",
     "java/res/layout/cablev2_qr_dialog.xml",
     "java/res/layout/cablev2_qr_scan.xml",
+    "java/res/layout/cablev2_serverlink.xml",
     "java/res/layout/cablev2_usb_attached.xml",
     "java/res/values/attrs.xml",
     "java/res/values/styles.xml",
diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
index 69ddc27406b..8c098e78143 100644
--- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
+++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
@@ -19,5 +19,4 @@ dev_ui_module_desc = {
   # DevUI DFM does not need to call Module.getImpl(), and manages loading on
   # install and on use. Therefore disable auto-load on Module.getImpl().
   load_native_on_get_impl = false
-  supports_isolated_split = true
 }
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index ce94f001862..ae87a0a1147 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -70,7 +70,7 @@ android_library("test_java") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
     "//components/autofill/core/common/mojom:mojo_types_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/browser_ui/widget/android:test_support_java",
@@ -79,12 +79,13 @@ android_library("test_java") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+    "//third_party/androidx:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
@@ -121,15 +122,15 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//chrome/browser/tabmodel:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:util_java",
     "//components/feature_engagement/public:public_java",
     "//components/module_installer/android:module_installer_java",
     "//content/public/android:content_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index de8d171bbbc..675ef22e4b3 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -25,7 +25,7 @@ android_library("internal_java") {
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",
@@ -33,11 +33,11 @@ android_library("internal_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:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:androidx_viewpager_viewpager_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+    "//third_party/androidx:androidx_viewpager_viewpager_java",
     "//ui/android:ui_java",
     "//ui/android:ui_utils_java",
     "//url:gurl_java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index b04a7662476..6b9e6aace98 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -166,7 +166,7 @@
     <file lang="zh-TW" path="translations/android_keyboard_accessory_strings_zh-TW.xtb" />
     <file lang="zu" path="translations/android_keyboard_accessory_strings_zu.xtb" />
   </translations>
-  <release allow_pseudo="false" seq="1">
+  <release seq="1">
     <messages fallback_to_english="true">
     <message name="IDS_ALL_PASSWORDS_BOTTOM_SHEET_CONTENT_DESCRIPTION" desc="Accessibility string read when the all passwords bottom sheet is opened. It describes the bottom sheet where a user can pick a credential to fill into a password form.">
         List of credentials to be filled on touch.
diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
index 5a7b7f141e3..d76bf28405e 100644
--- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -8,12 +8,13 @@ android_library("public_java") {
   deps = [
     "//base:base_java",
     "//components/autofill/android:autofill_java",
-    "//components/browser_ui/android/bottomsheet:java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//components/browser_ui/bottomsheet/android:java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
   ]
   sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentSupplier.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/KeyboardAccessoryData.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/PropertyProvider.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/data/Provider.java",
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index eaa946afaaa..a9bad033362 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -62,7 +62,6 @@ android_library("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/StartSurfaceStackLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
   ]
 
@@ -82,15 +81,15 @@ android_library("java") {
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/browser/version:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/prefs/android:java",
     "//components/user_prefs/android:java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:material_design_java",
-    "//third_party/android_sdk/androidx_browser:androidx_browser_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",
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/internal/java/strings/android_chrome_start_surface_strings.grd
index 1ddd5a6863e..c2d41d433be 100644
--- a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
+++ b/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
@@ -166,7 +166,7 @@
     <file lang="zh-TW" path="translations/android_chrome_start_surface_strings_zh-TW.xtb" />
     <file lang="zu" path="translations/android_chrome_start_surface_strings_zu.xtb" />
   </translations>
-  <release allow_pseudo="false" seq="1">
+  <release seq="1">
     <messages fallback_to_english="true">
         <message name="IDS_ACCESSIBILITY_START_SURFACE_BOTTOM_HOME_BUTTON" desc="Description for start surface home button to switch back to home surface.">
           Home
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index cad4426a618..0c3a2a878c1 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -32,8 +32,10 @@ android_resources("java_resources") {
     "java/res/drawable-v21/fake_search_box_bg_incognito.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_trending_down_blue.xml",
     "java/res/drawable/iph_drag_and_drop_animated_drawable.xml",
     "java/res/drawable/iph_drag_and_drop_drawable.xml",
     "java/res/drawable/message_card_background.xml",
@@ -62,9 +64,10 @@ android_resources("java_resources") {
     "java/res/layout/closable_tab_list_card_item.xml",
     "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/new_tab_tile_card_item.xml",
     "java/res/layout/price_card.xml",
-    "java/res/layout/price_welcome_message_card_item.xml",
+    "java/res/layout/price_tracking_dialog_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",
@@ -111,6 +114,8 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageCardViewModel.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageService.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardView.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/LargeMessageCardViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardView.java",
@@ -124,10 +129,10 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceCardView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceWelcomeMessageCardView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceWelcomeMessageCardViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceWelcomeMessageCardViewModel.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceWelcomeMessageService.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageCardViewModel.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceMessageService.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingDialogCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingDialogView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java",
@@ -199,13 +204,18 @@ android_library("java") {
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/share:java",
+    "//chrome/browser/signin/services/android:java",
     "//chrome/browser/tab:java",
+    "//chrome/browser/tab_group:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/ui/android/favicon:java",
+    "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
+    "//chrome/browser/ui/android/theme:java",
+    "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//components/browser_ui/android/bottomsheet:java",
+    "//components/browser_ui/bottomsheet/android:java",
     "//components/browser_ui/share/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
@@ -218,17 +228,18 @@ android_library("java") {
     "//components/policy/android:policy_java",
     "//components/search_engines/android:java",
     "//components/signin/public/android:java",
+    "//components/site_engagement/content/android:java",
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
-    "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
-    "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_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",
     "//ui/android:ui_java",
     "//url:gurl_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 a9977e58cfd..8ef5bcaa43a 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
@@ -166,7 +166,7 @@
     <file lang="zh-TW" path="translations/android_chrome_tab_ui_strings_zh-TW.xtb" />
     <file lang="zu" path="translations/android_chrome_tab_ui_strings_zu.xtb" />
   </translations>
-  <release allow_pseudo="false" seq="1">
+  <release seq="1">
     <messages fallback_to_english="true">
       <!-- In-Product Help strings -->
       <message name="IDS_IPH_TAB_GROUPS_QUICKLY_COMPARE_PAGES_TEXT" desc="When Chrome detects that the user is searching or comparing multiple pages (e.g. while comparison shopping), this in-product help text appears at the bottom of the screen. The text informs the user that they can longpress on a link to open it as a new tab within a tab group.">
@@ -379,11 +379,48 @@
         Price drop spotted
       </message>
       <message name="IDS_PRICE_DROP_SPOTTED_CONTENT" desc="This text shows below 'Price drop spotted'. It describes what will happen when clicking 'Show me' button.">
-        See which item in your open tabs has a better price
+        See which item in your open tabs has a lower price
       </message>
       <message name="IDS_PRICE_DROP_SPOTTED_SHOW_ME" desc="This text button shows below 'Price drop spotted'. When user clicks on the text button, it scrolls the users to the first tab that has a price drop.">
         Show me
       </message>
+      <message name="IDS_PRICE_DROP_SPOTTED_LOWER_PRICE" desc="This text shows on the blue tooltip that appears on a tab where we have detected a price drop in that tab. 'Lower' is an adjective.">
+        Lower price
+      </message>
+
+      <!-- Price Alerts Card strings -->
+      <message name="IDS_PRICE_DROP_ALERTS_CARD_TITLE" desc="This text shows on the price drop alerts message card if any item in the open tabs has a price drop. It familiarizes users with the feature getting price drop alerts.">
+        Get alerts for price drops?
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS_CARD_GET_NOTIFIED_CONTENT" desc="This text shows below 'Get alerts for price drops?'. It describes what will happen when clicking 'Get notified' button.">
+        You'll get an alert when there's a lower price in an open tab
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS_CARD_GET_NOTIFIED" desc="This text button shows below 'Get alerts for price drops?'. When user clicks on the text button, the price drop notifications feature will be turned on.">
+        Get notified
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS_CARD_GO_TO_SETTINGS_CONTENT" desc="This text shows below 'Get alerts for price drops?'. It asks users to turn on notifications in Android settings to get the price drop notifications.">
+        To get an alert when there's a lower price in an open tab, turn on notifications in Settings.
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS_CARD_GO_TO_SETTINGS" desc="This text button shows below 'Get alerts for price drops?'. When user clicks on the text button, we send them to the Android notification settings.">
+        Go to Settings
+      </message>
+
+      <!-- Price Tracking Settings Dialog strings -->
+      <message name="IDS_PRICE_TRACKING_SETTINGS" desc="When users click the menu item 'Track prices' in tab switcher, a dialog will pop up and this text is the title of the dialog.">
+        Price tracking settings
+      </message>
+      <message name="IDS_TRACK_PRICES_ON_TABS" desc="This text shows in the price tracking settings dialog. It tells users the switch on the side can be used to turn on/off the 'Track prices on tabs' feature.">
+        Track prices on tabs
+      </message>
+      <message name="IDS_TRACK_PRICES_ON_TABS_DESCRIPTION" desc="This text shows below 'Track prices on tabs'. It describes what will happen when turning on this feature.">
+        See price drops on your tabs
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS" desc="This text shows in the price tracking settings dialog. It tells users the switch on the side can be used to turn on/off the 'Price drop alerts' feature.">
+        Price drop alerts
+      </message>
+      <message name="IDS_PRICE_DROP_ALERTS_DESCRIPTION" desc="This text shows below 'Price drop alerts'. It describes what will happen when turning on this feature.">
+        Get notified when prices drop
+      </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 c64705e19ff..dc54da29689 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
@@ -11,8 +11,6 @@ public_tab_management_java_sources = [
   "//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/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_groups/EmptyTabGroupModelFilterObserver.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.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/TabGroupUi.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java",
@@ -34,9 +32,12 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TrendyTermsCoordinatorTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TrendyTermsViewBinderTest.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/ConditionalTabStripTest.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",
+  "//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/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",
@@ -64,10 +65,10 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TrendyTermsCacheUnitTest.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/TabGroupModelFilterUnitTest.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/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",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java",
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index c6b42306112..7563d18242b 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -71,6 +71,7 @@ android_library("java") {
     ":java_resources",
     "//base:base_java",
     "//base:jni_java",
+    "//cc:cc_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/flags:java",
@@ -91,10 +92,10 @@ android_library("java") {
     "//content/public/android:content_java",
     "//device/vr:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
-    "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_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",
@@ -117,4 +118,5 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java",
     "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java",
   ]
+  split_name = "vr"
 }
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 d88e733b75b..271247c6eb8 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
@@ -166,7 +166,7 @@
     <file lang="zh-TW" path="translations/android_chrome_vr_strings_zh-TW.xtb" />
     <file lang="zu" path="translations/android_chrome_vr_strings_zu.xtb" />
   </translations>
-  <release allow_pseudo="false" seq="1">
+  <release seq="1">
     <messages fallback_to_english="true">
         <!-- Chrome VR feedback infobar -->
         <message name="IDS_VR_SHELL_FEEDBACK_INFOBAR_DESCRIPTION" desc="Description for infobar prompting the user for feedback on their VR browsing experience.">
diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni
index 9aa2d838e72..8c03722cc3f 100644
--- a/chromium/chrome/android/features/vr/vr_module.gni
+++ b/chromium/chrome/android/features/vr/vr_module.gni
@@ -18,8 +18,5 @@ vr_module_desc = {
   # by native library load). Therefore disable auto-load on Module.getImpl();
   # the VR DFM manages its own loading on start-up and on install.
   load_native_on_get_impl = false
-
-  # TODO(crbug.com/1145287): Need to support @CalledByNative in isolated splits
-  # before this can be enabled.
-  # uses_split = "chrome"
+  uses_split = "chrome"
 }