BASELINE: Update Chromium to 98.0.4758.90

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

24 files changed, 285 insertions, 527 deletions

diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn
index 20e37bb1fb6..177c751cae4 100644
--- a/chromium/chrome/android/BUILD.gn
+++ b/chromium/chrome/android/BUILD.gn
@@ -208,13 +208,13 @@ android_resources("chrome_app_java_resources") {
     "//chrome/browser/lens:java_resources",
     "//chrome/browser/password_check/android:java_resources",
     "//chrome/browser/signin/services/android:java_resources",
-    "//chrome/browser/signin/ui/android:java_resources",
     "//chrome/browser/tab:java_resources",
     "//chrome/browser/ui/android/appmenu:java_resources",
     "//chrome/browser/ui/android/favicon:java_resources",
     "//chrome/browser/ui/android/management:java_resources",
     "//chrome/browser/ui/android/omnibox:java_resources",
     "//chrome/browser/ui/android/quickactionsearchwidget:java_resources",
+    "//chrome/browser/ui/android/signin:java_resources",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//chrome/browser/ui/android/theme:java_resources",
     "//chrome/browser/ui/android/toolbar:java_resources",
@@ -280,12 +280,15 @@ android_library("app_hooks_java") {
 java_group("delegate_public_impl_java") {
   deps = [
     ":app_hooks_java",
+    "//chrome/browser/feed/android:hooks_public_impl_java",
     "//chrome/browser/lens:delegate_public_impl_java",
     "//chrome/browser/locale:delegate_public_impl_java",
     "//chrome/browser/password_manager/android:backend_interface_public_impl_java",
+    "//chrome/browser/password_manager/android:settings_interface_public_impl_java",
     "//chrome/browser/policy/android:delegate_public_impl_java",
     "//chrome/browser/ui/android/theme:delegate_public_impl_java",
     "//components/externalauth/android:google_delegate_public_impl_java",
+    "//components/language/android:ulp_delegate_public_java",
   ]
 }
 
@@ -338,7 +341,9 @@ android_library("chrome_java") {
     "//chrome/browser/attribution_reporting/android:java",
     "//chrome/browser/banners/android:java",
     "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/commerce/android:java",
     "//chrome/browser/commerce/merchant_viewer/android:java",
+    "//chrome/browser/commerce/price_tracking/proto:proto_java",
     "//chrome/browser/commerce/shopping_list/android:java",
     "//chrome/browser/consent_auditor/android:java",
     "//chrome/browser/contextmenu:java",
@@ -351,6 +356,7 @@ android_library("chrome_java") {
     "//chrome/browser/download/android:java_resources",
     "//chrome/browser/enterprise/util:java",
     "//chrome/browser/feature_engagement:java",
+    "//chrome/browser/feature_guide/notifications:java",
     "//chrome/browser/feed/android:java",
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/first_run/android:java",
@@ -376,10 +382,12 @@ android_library("chrome_java") {
     "//chrome/browser/password_check:public_java",
     "//chrome/browser/password_entry_edit:public_java",
     "//chrome/browser/password_manager/android:java",
+    "//chrome/browser/password_manager/android:settings_interface_java",
     "//chrome/browser/performance_hints/android:java",
     "//chrome/browser/policy/android:java",
     "//chrome/browser/power_bookmarks:proto_java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/prefetch/android:java",
     "//chrome/browser/privacy:java",
     "//chrome/browser/privacy_review/android:java",
     "//chrome/browser/privacy_sandbox/android:java",
@@ -392,7 +400,7 @@ android_library("chrome_java") {
     "//chrome/browser/share:java",
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/signin/services/android:java",
-    "//chrome/browser/signin/ui/android:java",
+    "//chrome/browser/sync/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tab_group:java",
     "//chrome/browser/tabmodel:factory_java",
@@ -411,8 +419,10 @@ android_library("chrome_java") {
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/night_mode:java",
     "//chrome/browser/ui/android/omnibox:java",
+    "//chrome/browser/ui/android/page_info:java",
     "//chrome/browser/ui/android/quickactionsearchwidget:java",
     "//chrome/browser/ui/android/searchactivityutils:java",
+    "//chrome/browser/ui/android/signin:java",
     "//chrome/browser/ui/android/theme:java",
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/messages/android:java",
@@ -486,7 +496,7 @@ android_library("chrome_java") {
     "//components/infobars/core:infobar_enums_java",
     "//components/installedapp/android:java",
     "//components/javascript_dialogs/android:java",
-    "//components/language/android:language_bridge_java",
+    "//components/language/android:java",
     "//components/location/android:location_java",
     "//components/location/android:settings_java",
     "//components/media_router/browser/android:java",
@@ -502,6 +512,7 @@ android_library("chrome_java") {
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//components/page_info/android:java",
     "//components/page_info/android:page_info_action_enum_java",
+    "//components/page_info/core:proto_java",
     "//components/paint_preview/browser/android:java",
     "//components/paint_preview/player/android:java",
     "//components/password_manager/core/browser:password_manager_java_enums",
@@ -577,6 +588,7 @@ android_library("chrome_java") {
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:dagger_java",
+    "//third_party/android_deps:guava_android_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
@@ -778,6 +790,7 @@ group("jni_headers") {
     "//chrome/browser/android/browserservices/metrics:jni_headers",
     "//chrome/browser/android/browserservices/verification:jni_headers",
     "//chrome/browser/commerce/merchant_viewer/android:jni_headers",
+    "//chrome/browser/commerce/price_tracking/android:jni_headers",
     "//chrome/browser/commerce/subscriptions/android:jni_headers",
     "//chrome/browser/contextmenu:jni_headers",
     "//chrome/browser/download/android:jni_headers",
@@ -934,6 +947,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/browser_controls/android:junit",
     "//chrome/browser/commerce/merchant_viewer/android:junit",
+    "//chrome/browser/commerce/price_tracking/proto:proto_java",
     "//chrome/browser/contextmenu:java",
     "//chrome/browser/continuous_search:junit",
     "//chrome/browser/continuous_search/internal:junit",
@@ -957,6 +971,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/gsa:java",
     "//chrome/browser/image_descriptions:java",
     "//chrome/browser/image_editor/public:java",
+    "//chrome/browser/incognito:incognito_junit_tests",
     "//chrome/browser/incognito:java",
     "//chrome/browser/lens:delegate_public_impl_java",
     "//chrome/browser/lens:java",
@@ -972,6 +987,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/performance_hints/android:java",
     "//chrome/browser/policy/android:java",
     "//chrome/browser/policy/android:junit",
+    "//chrome/browser/power_bookmarks:proto_java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/preferences:preferences_junit_tests",
     "//chrome/browser/profiles/android:java",
@@ -981,8 +997,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/share:java",
     "//chrome/browser/signin/services/android:java",
     "//chrome/browser/signin/services/android:junit",
-    "//chrome/browser/signin/ui/android:java",
-    "//chrome/browser/signin/ui/android:junit",
+    "//chrome/browser/sync/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tab:junit",
     "//chrome/browser/tab_group:java",
@@ -1010,6 +1025,8 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/ui/android/omnibox:junit",
     "//chrome/browser/ui/android/quickactionsearchwidget:java",
     "//chrome/browser/ui/android/searchactivityutils:java",
+    "//chrome/browser/ui/android/signin:java",
+    "//chrome/browser/ui/android/signin:junit",
     "//chrome/browser/ui/android/theme:java",
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/android/toolbar:junit",
@@ -1064,6 +1081,7 @@ junit_binary("chrome_junit_tests") {
     "//components/omnibox/browser:browser_java",
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//components/page_info/android:java",
+    "//components/page_info/core:proto_java",
     "//components/paint_preview/player/android:java",
     "//components/payments/content/android:java",
     "//components/payments/content/android:service_java",
@@ -1103,6 +1121,7 @@ junit_binary("chrome_junit_tests") {
     "//third_party/android_deps:dagger_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:guava_android_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -1123,6 +1142,7 @@ junit_binary("chrome_junit_tests") {
     "//third_party/google-truth:google_truth_java",
     "//third_party/hamcrest:hamcrest_java",
     "//ui/android:ui_java",
+    "//ui/android:ui_junit_test_support",
     "//ui/base/mojom:mojom_java",
     "//url:gurl_java",
     "//url:gurl_junit_shadows",
@@ -1299,6 +1319,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/attribution_reporting/android/internal:javatests",
     "//chrome/browser/banners/android:java",
     "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/commerce/android:javatests",
     "//chrome/browser/commerce/merchant_viewer/android:java",
     "//chrome/browser/commerce/merchant_viewer/android:javatests",
     "//chrome/browser/content_creation/notes/internal/android:java",
@@ -1344,11 +1365,12 @@ android_library("chrome_test_java") {
     "//chrome/browser/password_edit_dialog/android:javatests",
     "//chrome/browser/password_entry_edit/android/internal:javatests",
     "//chrome/browser/password_manager/android:java",
-    "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/performance_hints/android:java",
     "//chrome/browser/policy/android:java",
     "//chrome/browser/power_bookmarks:proto_java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/prefetch/android:java",
+    "//chrome/browser/prefetch/android:javatests",
     "//chrome/browser/privacy_sandbox/android:java",
     "//chrome/browser/privacy_sandbox/android:javatests",
     "//chrome/browser/profiles/android:java",
@@ -1364,8 +1386,9 @@ android_library("chrome_test_java") {
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/signin/services/android:java",
     "//chrome/browser/signin/services/android:javatests",
-    "//chrome/browser/signin/ui/android:java",
-    "//chrome/browser/signin/ui/android:javatests",
+    "//chrome/browser/sync/android:java",
+    "//chrome/browser/sync/test/android:test_support_java",
+    "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java",
     "//chrome/browser/tab:critical_persisted_tab_data_proto_java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tab_group:java",
@@ -1386,10 +1409,13 @@ android_library("chrome_test_java") {
     "//chrome/browser/ui/android/night_mode:javatests",
     "//chrome/browser/ui/android/night_mode:night_mode_java_test_support",
     "//chrome/browser/ui/android/omnibox:java",
+    "//chrome/browser/ui/android/page_info:java",
     "//chrome/browser/ui/android/quickactionsearchwidget:java",
     "//chrome/browser/ui/android/quickactionsearchwidget:javatests",
     "//chrome/browser/ui/android/searchactivityutils:java",
     "//chrome/browser/ui/android/searchactivityutils:javatests",
+    "//chrome/browser/ui/android/signin:java",
+    "//chrome/browser/ui/android/signin:javatests",
     "//chrome/browser/ui/android/theme:java",
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/android/toolbar:javatests",
@@ -1463,11 +1489,15 @@ android_library("chrome_test_java") {
     "//components/infobars/core:infobar_enums_java",
     "//components/installedapp/android:javatests",
     "//components/javascript_dialogs/android:java",
+    "//components/language/android:java",
+    "//components/language/android:javatests",
     "//components/location/android:location_java",
     "//components/media_router/browser/android:java",
     "//components/media_router/browser/android:test_support_java",
     "//components/messages/android:java",
+    "//components/messages/android/internal:java",
     "//components/messages/android/internal:javatests",
+    "//components/messages/android/test:test_support_java",
     "//components/metrics:metrics_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/minidump_uploader:minidump_uploader_java_test_support",
@@ -1479,6 +1509,7 @@ android_library("chrome_test_java") {
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//components/page_info/android:java",
     "//components/page_info/android:page_info_action_enum_java",
+    "//components/page_info/core:proto_java",
     "//components/paint_preview/player/android:java",
     "//components/paint_preview/player/android:javatests",
     "//components/password_manager/core/browser:password_manager_java_enums",
@@ -1715,7 +1746,7 @@ if (enable_vr || enable_arcore) {
         "javatests/src/org/chromium/chrome/browser/vr/EmulatedVrController.java",
         "javatests/src/org/chromium/chrome/browser/vr/TestVrShellDelegate.java",
         "javatests/src/org/chromium/chrome/browser/vr/VrDaydreamReadyModuleInstallTest.java",
-        "javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java",
+        "javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateMessageTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrDeviceTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrInputTest.java",
         "javatests/src/org/chromium/chrome/browser/vr/WebXrVrPermissionTest.java",
@@ -1734,7 +1765,7 @@ if (enable_vr || enable_arcore) {
         "javatests/src/org/chromium/chrome/browser/vr/rules/WebappActivityVrTestRule.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/NativeUiUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/RenderTestUtils.java",
-        "javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java",
+        "javatests/src/org/chromium/chrome/browser/vr/util/VrMessageUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrShellDelegateUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrTestRuleUtils.java",
         "javatests/src/org/chromium/chrome/browser/vr/util/VrTransitionUtils.java",
@@ -1748,6 +1779,9 @@ if (enable_vr || enable_arcore) {
             "//components/browser_ui/site_settings/android:java",
             "//components/content_settings/android:content_settings_enums_java",
             "//components/infobars/android:java",
+            "//components/messages/android:java",
+            "//components/messages/android/internal:java",
+            "//components/messages/android/test:test_support_java",
             "//chrome/browser/profiles/android:java",
             "//chrome/browser/settings:java",
             "//chrome/browser/tabmodel:java",
@@ -1854,10 +1888,12 @@ java_group("chrome_public_non_pak_assets") {
 }
 
 java_group("chrome_public_v8_assets") {
+  deps = []
   if (use_v8_context_snapshot) {
-    deps = [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
-  } else {
-    deps = [ "//v8:v8_external_startup_data_assets" ]
+    deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
+  }
+  if (!use_v8_context_snapshot || include_both_v8_snapshots) {
+    deps += [ "//v8:v8_external_startup_data_assets" ]
   }
 }
 
@@ -1934,7 +1970,6 @@ chrome_common_shared_library("libchromefortest") {
     "//base/test:test_support",
     "//chrome:chrome_android_core",
     "//chrome/browser/android/metrics:ukm_utils_for_test",
-    "//chrome/browser/password_manager/android_test_helpers:android_wrappers",
     "//chrome/browser/subresource_filter:android_test_support",
     "//components/autofill_assistant/browser:test_support",
     "//components/crash/android:crash_android",
@@ -2272,7 +2307,6 @@ java_group("chrome_public_base_module_java_for_test") {
     ":chrome_test_util_java",
     "//chrome/android/features/autofill_assistant:autofill_assistant_java_test_support",
     "//chrome/browser/android/metrics:ukm_java_test_support",
-    "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/subresource_filter:subresource_filter_java_test_support",
     "//chrome/browser/thumbnail:thumbnail_java_test_support",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -2320,7 +2354,9 @@ android_library("browser_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
+    "//chrome/browser/prefetch/android:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/sync/android:java",
     "//chrome/browser/tab:java",
     "//components/offline_items_collection/core:core_java",
     "//components/sync/protocol:protocol_java",
@@ -2377,6 +2413,7 @@ template("chrome_public_apk_or_module_tmpl") {
   chrome_public_common_apk_or_module_tmpl(target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "apk_name",
                              "bundle_target",
                              "is_base_module",
@@ -2421,6 +2458,7 @@ chrome_public_apk_or_module_tmpl("chrome_public_apk") {
 chrome_public_apk_or_module_tmpl("chrome_modern_public_base_bundle_module") {
   target_type = "android_app_bundle_module"
   is_base_module = true
+  add_view_trace_events = true
   bundle_target = ":chrome_modern_public_bundle"
 }
 
@@ -2649,6 +2687,7 @@ template("monochrome_public_apk_or_module_tmpl") {
   monochrome_public_common_apk_or_module_tmpl(target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "apk_name",
                              "bundle_target",
                              "expected_android_manifest",
@@ -3140,6 +3179,9 @@ instrumentation_test_runner("chrome_public_smoke_test") {
   apk_under_test = ":chrome_public_apk"
   android_test_apk = ":chrome_smoke_test_apk"
   android_test_apk_name = "ChromeSmokeTest"
+  if (!is_java_debug) {
+    proguard_mapping_path = "$root_build_dir/apks/ChromePublic.apk.mapping"
+  }
   extra_args = [
     "--enable-breakpad-dump",
     "--use-apk-under-test-flags-file",
@@ -3151,8 +3193,16 @@ instrumentation_test_runner("chrome_public_smoke_test") {
 instrumentation_test_runner("monochrome_public_smoke_test") {
   if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     apk_under_test = ":monochrome_64_public_apk"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic64.apk.mapping"
+    }
   } else {
     apk_under_test = ":monochrome_public_apk"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic.apk.mapping"
+    }
   }
   android_test_apk = ":chrome_smoke_test_apk"
   android_test_apk_name = "ChromeSmokeTest"
@@ -3211,6 +3261,10 @@ instrumentation_test_runner("chrome_modern_public_bundle_smoke_test") {
   android_test_apk_name = "ChromeBundleSmokeTest"
   never_incremental = true
   modules = [ "test_dummy" ]
+  if (!is_java_debug) {
+    proguard_mapping_path =
+        "$root_build_dir/apks/ChromeModernPublic.aab.mapping"
+  }
   extra_args = _bundle_smoke_test_extra_args
 }
 
@@ -3231,6 +3285,10 @@ instrumentation_test_runner(
   android_test_apk_name = "ChromeBundleSmokeTest"
   never_incremental = true
   fake_modules = [ "test_dummy" ]
+  if (!is_java_debug) {
+    proguard_mapping_path =
+        "$root_build_dir/apks/ChromeModernPublic.aab.mapping"
+  }
   extra_args =
       _bundle_smoke_test_extra_args + _bundle_fake_modules_smoke_test_extra_args
 }
@@ -3238,8 +3296,16 @@ instrumentation_test_runner(
 instrumentation_test_runner("monochrome_public_bundle_smoke_test") {
   if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     apk_under_test = "//chrome/android:monochrome_64_public_bundle_apks"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic64.aab.mapping"
+    }
   } else {
     apk_under_test = "//chrome/android:monochrome_public_bundle_apks"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic.aab.mapping"
+    }
   }
   android_test_apk = ":chrome_bundle_smoke_test_apk"
   android_test_apk_name = "ChromeBundleSmokeTest"
@@ -3252,8 +3318,16 @@ instrumentation_test_runner(
     "monochrome_public_bundle_fake_modules_smoke_test") {
   if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     apk_under_test = "//chrome/android:monochrome_64_public_bundle_apks"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic64.aab.mapping"
+    }
   } else {
     apk_under_test = "//chrome/android:monochrome_public_bundle_apks"
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/MonochromePublic.aab.mapping"
+    }
   }
   android_test_apk = ":chrome_bundle_smoke_test_apk"
   android_test_apk_name = "ChromeBundleSmokeTest"
@@ -3294,9 +3368,16 @@ instrumentation_test_runner("trichrome_chrome_bundle_smoke_test") {
   if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     apk_under_test = "//chrome/android:trichrome_chrome_64_bundle_apks"
     additional_apks = [ "//chrome/android:trichrome_library_64_apk" ]
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/TrichromeChrome64.aab.mapping"
+    }
   } else {
     apk_under_test = "//chrome/android:trichrome_chrome_bundle_apks"
     additional_apks = [ "//chrome/android:trichrome_library_apk" ]
+    if (!is_java_debug) {
+      proguard_mapping_path = "$root_build_dir/apks/TrichromeChrome.aab.mapping"
+    }
   }
 }
 
@@ -3308,9 +3389,16 @@ instrumentation_test_runner("trichrome_chrome_bundle_fake_modules_smoke_test") {
   if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     apk_under_test = "//chrome/android:trichrome_chrome_64_bundle_apks"
     additional_apks = [ "//chrome/android:trichrome_library_64_apk" ]
+    if (!is_java_debug) {
+      proguard_mapping_path =
+          "$root_build_dir/apks/TrichromeChrome64.aab.mapping"
+    }
   } else {
     apk_under_test = "//chrome/android:trichrome_chrome_bundle_apks"
     additional_apks = [ "//chrome/android:trichrome_library_apk" ]
+    if (!is_java_debug) {
+      proguard_mapping_path = "$root_build_dir/apks/TrichromeChrome.aab.mapping"
+    }
   }
   extra_args =
       _bundle_smoke_test_extra_args + _bundle_fake_modules_smoke_test_extra_args
@@ -3366,6 +3454,7 @@ chrome_bundle("chrome_modern_public_bundle") {
     include_32_bit_webview = false
   }
   is_monochrome_or_trichrome = false
+  add_view_trace_events = true
   manifest_package = chrome_public_manifest_package
   min_sdk_version = default_min_sdk_version
   module_descs = chrome_modern_module_descs
@@ -3447,6 +3536,7 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
   monochrome_public_apk_or_module_tmpl(_base_module_target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "expected_android_manifest",
                              "is_64_bit_browser",
                              "include_32_bit_webview",
@@ -3470,6 +3560,7 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
   chrome_bundle(target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "enable_lint",
                              "include_32_bit_webview",
                              "include_64_bit_webview",
@@ -3529,6 +3620,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     enable_lint = true
     lint_baseline_file = "expectations/lint-baseline.xml"
     lint_suppressions_file = "expectations/lint-suppressions.xml"
+    add_view_trace_events = true
 
     bundle_suffix = ""
     if (android_64bit_target_cpu) {
@@ -3575,6 +3667,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
     bundle_suffix = ""
     use_trichrome_library = true
     static_library_provider = ":trichrome_library_apk"
+    add_view_trace_events = true
     if (!is_java_debug) {
       static_library_synchronized_proguard = trichrome_synchronized_proguard
       if (trichrome_synchronized_proguard) {
@@ -3702,8 +3795,6 @@ generate_jni("chrome_jni_headers") {
   sources = [
     # Files under a feature's public/ dir are included in chrome_java's source
     # files, so include these files in chrome_jni_headers.
-    "feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProvider.java",
-    "feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStream.java",
     "java/src/org/chromium/chrome/browser/AppHooks.java",
     "java/src/org/chromium/chrome/browser/ApplicationLifetime.java",
     "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
@@ -3793,6 +3884,8 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategory.java",
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryTile.java",
     "java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesSite.java",
+    "java/src/org/chromium/chrome/browser/feature_guide/notifications/FeatureNotificationGuideBridge.java",
+    "java/src/org/chromium/chrome/browser/feature_guide/notifications/FeatureNotificationGuideServiceFactory.java",
     "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",
     "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
     "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
@@ -3863,6 +3956,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridge.java",
     "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskScheduler.java",
+    "java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java",
     "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java",
     "java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java",
     "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
@@ -3904,7 +3998,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
     "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
-    "java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java",
     "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
     "java/src/org/chromium/chrome/browser/tab/HistoricalTabSaver.java",
     "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
diff --git a/chromium/chrome/android/chrome_java_resources.gni b/chromium/chrome/android/chrome_java_resources.gni
index 4cb53a7b088..cfdf1b70650 100644
--- a/chromium/chrome/android/chrome_java_resources.gni
+++ b/chromium/chrome/android/chrome_java_resources.gni
@@ -477,7 +477,6 @@ chrome_java_resources = [
   "java/res/drawable/distilled_page_prefs_button_bg.xml",
   "java/res/drawable/elo_card.xml",
   "java/res/drawable/explore_sites_dense_tile_background.xml",
-  "java/res/drawable/feed_header_border_background.xml",
   "java/res/drawable/google_pay_plex.xml",
   "java/res/drawable/google_pay_with_divider.xml",
   "java/res/drawable/ic_add_box_rounded_corner.xml",
@@ -502,7 +501,6 @@ chrome_java_resources = [
   "java/res/drawable/ic_offline_pin_white.xml",
   "java/res/drawable/ic_open_in_browser.xml",
   "java/res/drawable/ic_person_add_40dp.xml",
-  "java/res/drawable/ic_reading_list_add_24dp.xml",
   "java/res/drawable/ic_reading_list_folder_24dp.xml",
   "java/res/drawable/ic_select_window.xml",
   "java/res/drawable/ic_signout_40dp.xml",
@@ -532,15 +530,20 @@ chrome_java_resources = [
   "java/res/drawable/long_screenshot.xml",
   "java/res/drawable/material_tooltip_background.xml",
   "java/res/drawable/mir_card.xml",
+  "java/res/drawable/outline_chevron_right_24dp.xml",
   "java/res/drawable/price_tracking_disabled.xml",
-  "java/res/drawable/price_tracking_enabled.xml",
+  "java/res/drawable/price_tracking_enabled_filled.xml",
+  "java/res/drawable/price_tracking_enabled_outline.xml",
   "java/res/drawable/qr_code.xml",
+  "java/res/drawable/safety_check.xml",
   "java/res/drawable/screenshot.xml",
   "java/res/drawable/send_tab.xml",
   "java/res/drawable/shared_clipboard_zero_state_dark.xml",
   "java/res/drawable/shared_clipboard_zero_state_light.xml",
   "java/res/drawable/sharing_more.xml",
   "java/res/drawable/sharing_print.xml",
+  "java/res/drawable/sharing_print_baseline.xml",
+  "java/res/drawable/shield.xml",
   "java/res/drawable/signin_header_animation.xml",
   "java/res/drawable/store_locally_tooltip_background.xml",
   "java/res/drawable/tab_indicator.xml",
@@ -643,7 +646,6 @@ chrome_java_resources = [
   "java/res/layout/explore_sites_section.xml",
   "java/res/layout/explore_sites_tile_view.xml",
   "java/res/layout/fake_search_box_layout.xml",
-  "java/res/layout/feed_options_panel.xml",
   "java/res/layout/find_in_page.xml",
   "java/res/layout/find_toolbar.xml",
   "java/res/layout/fre_data_reduction_proxy_lite_mode.xml",
@@ -654,7 +656,6 @@ chrome_java_resources = [
   "java/res/layout/history_main.xml",
   "java/res/layout/history_privacy_disclaimer_header.xml",
   "java/res/layout/history_toolbar.xml",
-  "java/res/layout/horizontal_divider.xml",
   "java/res/layout/incognito_description_layout.xml",
   "java/res/layout/incognito_history_placeholder.xml",
   "java/res/layout/incognito_toggle_tabs.xml",
@@ -673,16 +674,12 @@ chrome_java_resources = [
   "java/res/layout/navigation_sheet.xml",
   "java/res/layout/navigation_sheet_toolbar.xml",
   "java/res/layout/new_tab_page_cryptid_holder.xml",
-  "java/res/layout/new_tab_page_feed_v2_expandable_header.xml",
   "java/res/layout/new_tab_page_incognito.xml",
   "java/res/layout/new_tab_page_layout.xml",
-  "java/res/layout/new_tab_page_multi_feed_header.xml",
-  "java/res/layout/new_tab_page_section_tab.xml",
   "java/res/layout/new_tab_page_tile_grid_placeholder.xml",
   "java/res/layout/optional_toolbar_button.xml",
   "java/res/layout/os_version_unsupported_text.xml",
   "java/res/layout/other_forms_of_history_dialog.xml",
-  "java/res/layout/passphrase_type_item.xml",
   "java/res/layout/password_entry_exception.xml",
   "java/res/layout/password_entry_viewer_copyable_row.xml",
   "java/res/layout/password_entry_viewer_interactive.xml",
@@ -716,6 +713,7 @@ chrome_java_resources = [
   "java/res/layout/share_sheet_item.xml",
   "java/res/layout/sharing_device_picker.xml",
   "java/res/layout/sheet_tab_toolbar.xml",
+  "java/res/layout/shopping_filter_row.xml",
   "java/res/layout/signin_activity.xml",
   "java/res/layout/status_indicator_container.xml",
   "java/res/layout/suggestions_site_tile_grid_modern.xml",
@@ -741,6 +739,7 @@ chrome_java_resources = [
   "java/res/menu/save_password_preferences_action_bar_menu.xml",
   "java/res/transition/fade.xml",
   "java/res/transition/move_image.xml",
+  "java/res/values-h600dp/dimens.xml",
   "java/res/values-hdpi/dimens.xml",
   "java/res/values-large/dimens.xml",
   "java/res/values-night/colors.xml",
@@ -791,6 +790,5 @@ chrome_java_resources = [
   "java/res/xml/phone_as_a_security_key_accessory_filter.xml",
   "java/res/xml/privacy_preferences.xml",
   "java/res/xml/search_widget_info.xml",
-  "java/res/xml/tab_layout_badge.xml",
   "java/res/xml/tracing_preferences.xml",
 ]
diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni
index c784135d978..89ba0363b3c 100644
--- a/chromium/chrome/android/chrome_java_sources.gni
+++ b/chromium/chrome/android/chrome_java_sources.gni
@@ -23,6 +23,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeKeyboardVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/ChromeLocalizationUtils.java",
   "java/src/org/chromium/chrome/browser/ChromePowerModeVoter.java",
+  "java/src/org/chromium/chrome/browser/ChromeSemanticColorUtils.java",
   "java/src/org/chromium/chrome/browser/ChromeStrictMode.java",
   "java/src/org/chromium/chrome/browser/ChromeStringConstants.java",
   "java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java",
@@ -70,9 +71,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/app/appmenu/IncognitoMenuItemViewBinder.java",
   "java/src/org/chromium/chrome/browser/app/appmenu/ManagedByMenuItemViewBinder.java",
   "java/src/org/chromium/chrome/browser/app/appmenu/UpdateMenuItemViewBinder.java",
-  "java/src/org/chromium/chrome/browser/app/feedmanagement/FeedManagementActivity.java",
+  "java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/app/feed/NavigationRecorder.java",
+  "java/src/org/chromium/chrome/browser/app/feed/ProcessScopeDependencyProviderFactory.java",
+  "java/src/org/chromium/chrome/browser/app/feed/feedmanagement/FeedManagementActivity.java",
+  "java/src/org/chromium/chrome/browser/app/feed/followmanagement/FollowManagementActivity.java",
   "java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java",
-  "java/src/org/chromium/chrome/browser/app/followmanagement/FollowManagementActivity.java",
   "java/src/org/chromium/chrome/browser/app/metrics/LaunchCauseMetrics.java",
   "java/src/org/chromium/chrome/browser/app/metrics/TabbedActivityLaunchCauseMetrics.java",
   "java/src/org/chromium/chrome/browser/app/reengagement/ReengagementActivity.java",
@@ -179,8 +183,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkMetrics.java",
   "java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRow.java",
   "java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipList.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java",
   "java/src/org/chromium/chrome/browser/bookmarks/ReadingListFeatures.java",
   "java/src/org/chromium/chrome/browser/bookmarks/ReadingListSectionHeader.java",
   "java/src/org/chromium/chrome/browser/bookmarks/bottomsheet/BookmarkBottomSheetContent.java",
@@ -305,7 +311,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/RelatedSearchesControl.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
-  "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMetrics.java",
   "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java",
   "java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java",
@@ -459,6 +464,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionServiceImpl.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsShareBroadcastReceiver.java",
+  "java/src/org/chromium/chrome/browser/customtabs/DefaultBrowserProviderImpl.java",
   "java/src/org/chromium/chrome/browser/customtabs/FirstMeaningfulPaintObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/HiddenTabHolder.java",
   "java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabColorProvider.java",
@@ -545,8 +551,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadNotificationUmaHelper.java",
   "java/src/org/chromium/chrome/browser/download/DownloadNotifier.java",
   "java/src/org/chromium/chrome/browser/download/DownloadPage.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadResumptionBackgroundTask.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadResumptionScheduler.java",
   "java/src/org/chromium/chrome/browser/download/DownloadServiceDelegate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceHelper.java",
@@ -563,7 +567,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorFactoryHelper.java",
   "java/src/org/chromium/chrome/browser/download/home/FaviconProviderImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/FileDeletionQueue.java",
-  "java/src/org/chromium/chrome/browser/download/home/LegacyDownloadProviderImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/PrefetchEnabledSupplier.java",
   "java/src/org/chromium/chrome/browser/download/items/DownloadBlockedOfflineContentProvider.java",
   "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorFactory.java",
@@ -590,6 +593,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/explore_sites/StableScrollLayoutManager.java",
   "java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/externalnav/IntentWithRequestMetadataHandler.java",
+  "java/src/org/chromium/chrome/browser/feature_guide/notifications/FeatureNotificationGuideBridge.java",
+  "java/src/org/chromium/chrome/browser/feature_guide/notifications/FeatureNotificationGuideServiceFactory.java",
   "java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java",
   "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",
   "java/src/org/chromium/chrome/browser/feedback/ConnectivityFeedbackSource.java",
@@ -723,7 +728,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java",
   "java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java",
   "java/src/org/chromium/chrome/browser/init/BrowserParts.java",
-  "java/src/org/chromium/chrome/browser/init/ChainedTasks.java",
   "java/src/org/chromium/chrome/browser/init/ChromeActivityNativeDelegate.java",
   "java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java",
   "java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java",
@@ -828,24 +832,16 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedTab.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedTabManager.java",
   "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java",
-  "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelper.java",
+  "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java",
   "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoController.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoUtils.java",
-  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxChipDelegate.java",
   "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
   "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
   "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
   "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxProperties.java",
   "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxViewBinder.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/OnSectionHeaderSelectedListener.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderListProperties.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderProperties.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderView.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderViewBinder.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionType.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/ViewVisibility.java",
   "java/src/org/chromium/chrome/browser/offlinepages/AutoFetchNotifier.java",
   "java/src/org/chromium/chrome/browser/offlinepages/BackgroundScheduler.java",
   "java/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerBridge.java",
@@ -888,20 +884,16 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java",
   "java/src/org/chromium/chrome/browser/omaha/ResponseParser.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
-  "java/src/org/chromium/chrome/browser/omaha/UpdateInfoBarController.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
   "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
   "java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/NoopInlineUpdateController.java",
-  "java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java",
   "java/src/org/chromium/chrome/browser/omaha/metrics/HistogramUtils.java",
   "java/src/org/chromium/chrome/browser/omaha/metrics/TrackingProvider.java",
   "java/src/org/chromium/chrome/browser/omaha/metrics/UpdateSuccessMetrics.java",
+  "java/src/org/chromium/chrome/browser/page_info/AboutThisSiteView.java",
   "java/src/org/chromium/chrome/browser/page_info/ChromePageInfo.java",
   "java/src/org/chromium/chrome/browser/page_info/ChromePageInfoControllerDelegate.java",
+  "java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java",
   "java/src/org/chromium/chrome/browser/page_info/PageInfoHistoryController.java",
   "java/src/org/chromium/chrome/browser/page_info/SiteSettingsHelper.java",
   "java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java",
@@ -1001,6 +993,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java",
   "java/src/org/chromium/chrome/browser/printing/TabPrinter.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java",
+  "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
   "java/src/org/chromium/chrome/browser/provider/BaseColumns.java",
@@ -1076,7 +1069,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinder.java",
   "java/src/org/chromium/chrome/browser/suggestions/DestructionObserver.java",
   "java/src/org/chromium/chrome/browser/suggestions/ImageFetcher.java",
-  "java/src/org/chromium/chrome/browser/suggestions/NavigationRecorder.java",
   "java/src/org/chromium/chrome/browser/suggestions/OfflinableSuggestion.java",
   "java/src/org/chromium/chrome/browser/suggestions/SiteSuggestion.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java",
@@ -1106,8 +1098,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sync/SyncContentResolverDelegate.java",
   "java/src/org/chromium/chrome/browser/sync/SyncController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
-  "java/src/org/chromium/chrome/browser/sync/SyncService.java",
-  "java/src/org/chromium/chrome/browser/sync/SyncServiceImpl.java",
   "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
   "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
   "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
@@ -1177,6 +1167,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
   "java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java",
+  "java/src/org/chromium/chrome/browser/toolbar/LogoLoadHelper.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java",
diff --git a/chromium/chrome/android/chrome_junit_test_java_sources.gni b/chromium/chrome/android/chrome_junit_test_java_sources.gni
index af93a72bf02..63027f46861 100644
--- a/chromium/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_junit_test_java_sources.gni
@@ -1,6 +1,7 @@
 chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java",
   "junit/src/org/chromium/chrome/browser/ChromeActionModeHandlerUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/ChromeActivityUnitTest.java",
   "junit/src/org/chromium/chrome/browser/ChromeBackupAgentTest.java",
   "junit/src/org/chromium/chrome/browser/ChromeLocalizationUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/DeferredStartupHandlerTest.java",
@@ -81,7 +82,9 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/customtabs/LaunchesWithColorSchemeTest.java",
   "junit/src/org/chromium/chrome/browser/customtabs/MockPostMessageHandler.java",
   "junit/src/org/chromium/chrome/browser/customtabs/NavigationInfoCaptureTriggerTest.java",
+  "junit/src/org/chromium/chrome/browser/customtabs/PartialCustomTabHeightStrategyTest.java",
   "junit/src/org/chromium/chrome/browser/customtabs/RequestThrottlerTest.java",
+  "junit/src/org/chromium/chrome/browser/customtabs/TrustedCdnTest.java",
   "junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java",
   "junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityNavigationControllerTest.java",
   "junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityTabControllerUnitTest.java",
@@ -93,7 +96,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/directactions/GoBackDirectActionHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutControllerTest.java",
   "junit/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManagerTest.java",
-  "junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntryTest.java",
   "junit/src/org/chromium/chrome/browser/download/OfflineContentAvailabilityStatusProviderTest.java",
   "junit/src/org/chromium/chrome/browser/download/home/FileDeletionQueueTest.java",
@@ -162,7 +164,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorMetricsDelegateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
-  "junit/src/org/chromium/chrome/browser/omaha/UpdateStatusProviderTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/VersionNumberTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/metrics/HistogramUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/metrics/UpdateSuccessMetricsTest.java",
@@ -197,6 +198,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridgeUnitTest.java",
   "junit/src/org/chromium/chrome/browser/sync/AndroidSyncSettingsTest.java",
   "junit/src/org/chromium/chrome/browser/tab/HistoricalTabSaverUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/tab/RequestDesktopUtilsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabAttributesTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelperTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelperTest.java",
@@ -210,6 +212,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/tasks/EngagementTimeUtilTest.java",
   "junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/toolbar/LogoLoadHelperUnitTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImplTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/adaptive/OptionalNewTabButtonControllerActivityTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarMediatorUnitTest.java",
@@ -219,6 +222,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/webapps/MockWebappDataStorageClockRule.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkIconNameUpdateDialogTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkInstallNotificationTest.java",
+  "junit/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProviderFactoryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkShareTargetUtilTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappAuthenticatorTest.java",
diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni
index 2a53ce562ae..a208e00f85a 100644
--- a/chromium/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni
@@ -5,6 +5,7 @@
 import("//android_webview/variables.gni")
 import("//base/android/linker/config.gni")
 import("//base/android/resource_exclusions.gni")
+import("//build/config/android/create_unwind_table.gni")
 import("//build/config/android/extract_unwind_tables.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/compiler/compiler.gni")
@@ -100,25 +101,46 @@ template("chrome_public_common_apk_or_module_tmpl") {
 
   if (_add_unwind_tables) {
     _unwind_asset_target = "${target_name}__unwind_assets"
-    unwind_table_asset(_unwind_asset_target) {
-      if (defined(invoker.testonly)) {
-        testonly = invoker.testonly
-      }
 
-      if (defined(invoker.shared_library_for_unwind_asset)) {
-        library_target = invoker.shared_library_for_unwind_asset
-      } else {
-        if (_is_monochrome || _is_trichrome) {
+    if (use_android_unwinder_v2) {
+      unwind_table_asset_v2(_unwind_asset_target) {
+        if (defined(invoker.testonly)) {
+          testonly = invoker.testonly
+        }
+
+        if (defined(invoker.shared_library_for_unwind_asset)) {
+          library_target = invoker.shared_library_for_unwind_asset
+        } else if (_is_monochrome || _is_trichrome) {
           library_target = "monochrome"
         } else {
           library_target = "chrome"
         }
+
+        if (android_64bit_target_cpu) {
+          deps = [ "//chrome/android:lib${library_target}($android_secondary_abi_toolchain)" ]
+        } else {
+          deps = [ "//chrome/android:lib${library_target}" ]
+        }
       }
+    } else {
+      unwind_table_asset(_unwind_asset_target) {
+        if (defined(invoker.testonly)) {
+          testonly = invoker.testonly
+        }
 
-      if (android_64bit_target_cpu) {
-        deps = [ "//chrome/android:lib${library_target}($android_secondary_abi_toolchain)" ]
-      } else {
-        deps = [ "//chrome/android:lib${library_target}" ]
+        if (defined(invoker.shared_library_for_unwind_asset)) {
+          library_target = invoker.shared_library_for_unwind_asset
+        } else if (_is_monochrome || _is_trichrome) {
+          library_target = "monochrome"
+        } else {
+          library_target = "chrome"
+        }
+
+        if (android_64bit_target_cpu) {
+          deps = [ "//chrome/android:lib${library_target}($android_secondary_abi_toolchain)" ]
+        } else {
+          deps = [ "//chrome/android:lib${library_target}" ]
+        }
       }
     }
   } else if (defined(invoker.shared_library_for_unwind_asset)) {
@@ -185,7 +207,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
       strip_resource_names = !is_java_debug
 
       # Shortens resource file names in apk eg: res/drawable/button.xml -> res/a.xml
-      short_resource_paths = true
+      short_resource_paths = !is_java_debug
 
       # Removes unused resources from the apk. Only enabled on official builds
       # since it adds a slow step and serializes the build graph causing fewer
@@ -289,6 +311,12 @@ template("chrome_public_common_apk_or_module_tmpl") {
       deps += [ "//chrome/android:chrome_all_java" ]
     }
 
+    if (_is_bundle) {
+      # Required to support macro resources.
+      # See https://crbug.com/1278419
+      deps += [ ":${target_name}__all_dfm_resources" ]
+    }
+
     # Prefer to add this data_dep on the final target instead of java targets
     # like chrome_all_java so that all other targets can build in parallel with
     # lint.
@@ -398,7 +426,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
       if (_is_bundle_module) {
         # Sets ISOLATED_SPLITS_ENABLED in BuildConfig.java.
         isolated_splits_enabled = true
-        deps += [ ":${target_name}__all_dfm_resources" ]
       }
 
       if (_is_bundle_module && invoker.is_base_module) {
diff --git a/chromium/chrome/android/chrome_test_java_sources.gni b/chromium/chrome/android/chrome_test_java_sources.gni
index 533f43ba2a3..79fdf03c3ec 100644
--- a/chromium/chrome/android/chrome_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_test_java_sources.gni
@@ -8,6 +8,7 @@ import("//components/feed/features.gni")
 # conditionally added. See java_source.gni for conditionally added files.
 
 chrome_test_java_sources = [
+  "java/src/org/chromium/chrome/browser/app/feed/NavigationRecorderTest.java",
   "javatests/src/org/chromium/chrome/browser/ActivityTabProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/AudioTest.java",
   "javatests/src/org/chromium/chrome/browser/ChromeActionModeHandlerTest.java",
@@ -59,6 +60,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/app/tab_activity_glue/TabletPhoneLayoutChangeTest.java",
   "javatests/src/org/chromium/chrome/browser/app/tabmodel/ChromeNextTabPolicySupplierTest.java",
   "javatests/src/org/chromium/chrome/browser/attribution_reporting/AttributionIntentIntegrationTest.java",
+  "javatests/src/org/chromium/chrome/browser/attribution_reporting/AttributionProviderIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillSnackbarControllerTest.java",
@@ -81,8 +83,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java",
+  "javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowRenderTest.java",
+  "javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkShoppingItemRowTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipListTest.java",
-  "javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/bottomsheet/BookmarkBottomSheetTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/ManageTrustedWebActivityDataActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/QualityEnforcerTest.java",
@@ -113,6 +116,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java",
   "javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java",
   "javatests/src/org/chromium/chrome/browser/contacts_picker/ContactsPickerLauncherTest.java",
+  "javatests/src/org/chromium/chrome/browser/content_settings/ContentSettingsObserverTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java",
@@ -121,6 +125,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java",
+  "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInstrumentationBase.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInstrumentationTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateControllerWrapper.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java",
@@ -128,6 +133,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequestTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java",
+  "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUnbatchedTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/MockContextualSearchPolicy.java",
   "javatests/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchFullUiTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java",
@@ -152,6 +158,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/DetachedResourceRequestTest.java",
+  "javatests/src/org/chromium/chrome/browser/customtabs/FakeDefaultBrowserProviderImpl.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabActivityRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabActivityTestRule.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/TabReparentingTest.java",
@@ -215,6 +222,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java",
   "javatests/src/org/chromium/chrome/browser/findinpage/FindTest.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/DisableFirstRun.java",
+  "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivitySigninAndSyncTest.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java",
@@ -348,13 +356,13 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessorUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/mostvisited/MostVisitedTilesProcessorUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/mostvisited/MostVisitedTilesTest.java",
-  "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/tiles/TileSuggestionProcessorUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUiTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoViewTest.java",
+  "javatests/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/PageInfoDiscoverabilityTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewDarkModeTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java",
@@ -441,7 +449,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPhoneTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestRemoveBillingAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestRetryTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestServiceWorkerExpandablePaymentHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestServiceWorkerPaymentAppTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressAndOptionTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressChangeTest.java",
@@ -466,6 +473,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/permissions/NotificationTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/PermissionTestRule.java",
+  "javatests/src/org/chromium/chrome/browser/permissions/PermissionUpdateMessageTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/QuotaTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/RuntimePermissionTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/RuntimePermissionTestUtils.java",
@@ -483,9 +491,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java",
   "javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
   "javatests/src/org/chromium/chrome/browser/query_tiles/ListMatchers.java",
-  "javatests/src/org/chromium/chrome/browser/query_tiles/OmniboxQueryTileSuggestionTest.java",
   "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java",
-  "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionToOmniboxTest.java",
   "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/query_tiles/TileMatchers.java",
   "javatests/src/org/chromium/chrome/browser/query_tiles/ViewActions.java",
@@ -519,6 +525,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/PermissionInfoTest.java",
+  "javatests/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/SiteSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/SiteSettingsTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/WebsitePermissionsFetcherTest.java",
@@ -527,17 +534,16 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/ssl/CaptivePortalTest.java",
   "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorTest.java",
   "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java",
-  "javatests/src/org/chromium/chrome/browser/suggestions/NavigationRecorderTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesMetadataUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayoutTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupUnitTest.java",
+  "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileRendererTest.java",
   "javatests/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/AccountManagementFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
-  "javatests/src/org/chromium/chrome/browser/sync/FakeSyncServiceImpl.java",
   "javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsTest.java",
@@ -553,6 +559,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/sync/ui/SyncErrorMessageTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/RepostFormWarningTest.java",
+  "javatests/src/org/chromium/chrome/browser/tab/RequestDesktopSiteTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/TabStateTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java",
@@ -567,6 +574,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tab/state/LoadCallbackHelper.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/PersistedTabDataTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/PriceDropMetricsLoggerTest.java",
+  "javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataDeferredStartupTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataLegacyTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataLegacyWithPASTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataNativeTest.java",
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>
diff --git a/chromium/chrome/android/feed/BUILD.gn b/chromium/chrome/android/feed/BUILD.gn
index df4f603333f..26bbc71d595 100644
--- a/chromium/chrome/android/feed/BUILD.gn
+++ b/chromium/chrome/android/feed/BUILD.gn
@@ -8,8 +8,6 @@ import("//components/feed/features.gni")
 
 android_resources("chrome_feed_java_resources") {
   sources = [
-    "core/java/res/layout/feed_spinner.xml",
-    "core/java/res/layout/following_empty_state.xml",
     "core/java/res/values-night/colors.xml",
     "core/java/res/values/attrs.xml",
     "core/java/res/values/colors.xml",
diff --git a/chromium/chrome/android/feed/feed_java_sources.gni b/chromium/chrome/android/feed/feed_java_sources.gni
index d5cd8a2ebe8..290960c49b3 100644
--- a/chromium/chrome/android/feed/feed_java_sources.gni
+++ b/chromium/chrome/android/feed/feed_java_sources.gni
@@ -20,28 +20,10 @@ feed_deps = [
 ]
 
 feed_java_sources = [
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/BackToTopBubble.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedAutoplaySettingsDelegate.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLaunchReliabilityLoggingState.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedStreamViewResizer.java",
   "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceLifecycleManager.java",
   "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceScopeDependencyProvider.java",
   "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/NtpFeedSurfaceLifecycleManager.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/RefreshIphScrollListener.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedSurfaceDelegate.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedSurfaceProvider.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/ScrollTracker.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/stream/Stream.java",
   "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/ui/MaterialSpinnerView.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/sort_ui/SortChipProperties.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/sort_ui/SortView.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/sort_ui/SortViewBinder.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProvider.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedServiceBridgeDelegateImpl.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStream.java",
 ]
 
 feed_srcjar_deps = []
@@ -49,15 +31,10 @@ feed_srcjar_deps = []
 feed_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinatorTest.java",
   "junit/src/org/chromium/chrome/browser/feed/FeedSurfaceMediatorTest.java",
-  "junit/src/org/chromium/chrome/browser/feed/v2/FakeLinearLayoutManager.java",
-  "junit/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProviderTest.java",
-  "junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamTest.java",
 ]
 
 feed_test_java_sources = [
   "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedV2NewTabPageTest.java",
-  "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/RefreshIphScrollListenerTest.java",
-  "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProviderNativeTest.java",
   "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/FeedV2TestHelper.java",
   "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/TestFeedServer.java",
 ]
diff --git a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
index 6c34ea91c24..201937aae06 100644
--- a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
+++ b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
@@ -55,24 +55,26 @@ template("chrome_bundle") {
     _module_descs += [ chrome_module_desc ]
   }
 
-  if (invoker.is_monochrome_or_trichrome) {
-    # TODO(crbug.com/1126301): Isolated splits cause various bugs with resource
-    # access. For now, move all resources to the base module.
-    _base_target_name = get_label_info(invoker.base_module_target, "name")
-    android_resources("${_base_target_name}__all_dfm_resources") {
-      recursive_resource_deps = true
-      deps = []
+  # TODO(crbug.com/1126301): Isolated splits cause various bugs with resource
+  # access. For now, move all resources to the base module.
+  # TODO(crbug.com/1278419): Macro resource types only work when all resources
+  # are in the same split. For now, keep all resources in the base module even
+  # in Chrome Modern.
+  _base_target_name = get_label_info(invoker.base_module_target, "name")
+  android_resources("${_base_target_name}__all_dfm_resources") {
+    recursive_resource_deps = true
+    deps = []
 
-      # Java library deps are added to this target because the
-      # recursive_resource_deps arg allows pulling all the android_resources
-      # deps from them. The actual java library targets are not used.
-      foreach(_module_desc, _module_descs) {
-        if (defined(_module_desc.java_deps)) {
-          deps += _module_desc.java_deps
-        }
+    # Java library deps are added to this target because the
+    # recursive_resource_deps arg allows pulling all the android_resources
+    # deps from them. The actual java library targets are not used.
+    foreach(_module_desc, _module_descs) {
+      if (defined(_module_desc.java_deps)) {
+        deps += _module_desc.java_deps
       }
     }
   }
+
   foreach(_tmp_module_desc, _module_descs) {
     assert(_package_id > 2, "Too many modules, ran out of package IDs!")
 
@@ -101,6 +103,7 @@ template("chrome_bundle") {
         "${_bundle_target_name}__${_module_desc.name}_bundle_module") {
       forward_variables_from(invoker,
                              [
+                               "add_view_trace_events",
                                "base_module_target",
                                "is_64_bit_browser",
                                "is_monochrome_or_trichrome",
@@ -140,6 +143,7 @@ template("chrome_bundle") {
   android_app_bundle(target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "base_module_target",
                              "bundle_name",
                              "compress_shared_libraries",
diff --git a/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni b/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni
index 64abd38c9d6..6dc974f2be3 100644
--- a/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni
+++ b/chromium/chrome/android/modules/chrome_feature_module_tmpl.gni
@@ -86,6 +86,7 @@ template("chrome_feature_module") {
   android_app_bundle_module(target_name) {
     forward_variables_from(invoker,
                            [
+                             "add_view_trace_events",
                              "base_module_target",
                              "manifest_package",
                              "min_sdk_version",
diff --git a/chromium/chrome/android/static_initializers.gni b/chromium/chrome/android/static_initializers.gni
index cefd5957e78..cf8ea294ab3 100644
--- a/chromium/chrome/android/static_initializers.gni
+++ b/chromium/chrome/android/static_initializers.gni
@@ -41,7 +41,8 @@ if (current_toolchain == default_toolchain &&
   # base_logging.cc (initializer offset 0x9a4b0c size 0x48)
   expected_static_initializer_count += 1
 
-  if (use_static_angle && !is_official_build) {
+  if (use_static_angle && !is_official_build &&
+      (is_debug || dcheck_always_on)) {
     # TODO(https://crbug.com/1172451): remove global variables from ANGLE:
     #
     # doc.cpp (initializer offset 0xcf9c6c size 0x138)
diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni
index 5a97c2f5b2b..c3b67bc38a8 100644
--- a/chromium/chrome/android/trichrome.gni
+++ b/chromium/chrome/android/trichrome.gni
@@ -242,6 +242,7 @@ template("write_ssargs_trichrome") {
   } else {
     _library_args = ""
   }
+  _extra_args = " --abi-filter $android_app_abi"
 
   # Base names (i.e., no full path) are used because .ssargs files specifies
   # files using paths relative to itself. It is expected for |ssargs_path| to
@@ -249,10 +250,10 @@ template("write_ssargs_trichrome") {
   # by SuperSize.
   _lines = [
     "# Written by build target \"${target_name}.\"",
-    "Library -f ${invoker.trichrome_library_basename}$_library_args",
+    "Library -f ${invoker.trichrome_library_basename}$_extra_args$_library_args",
     "# Add --no-native to Chrome as workaround for crbug.com/1103271.",
-    "Chrome -f ${invoker.trichrome_chrome_basename} --no-native",
-    "WebView -f ${invoker.trichrome_webview_basename}",
+    "Chrome -f ${invoker.trichrome_chrome_basename}$_extra_args --no-native",
+    "WebView -f ${invoker.trichrome_webview_basename}$_extra_args",
   ]
 
   write_file(invoker.ssargs_path, _lines)
diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
index 7142e72c09a..2f869e2a5f4 100644
--- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
@@ -224,6 +224,7 @@ template("webapk_tmpl") {
       "res/values-v17/styles.xml",
       "res/values-v24/default_enabled_activity.xml",
       "res/values-v31/dimens.xml",
+      "res/values-v31/styles.xml",
       "res/values-xhdpi/is_splash_icon_maskable_bool.xml",
       "res/values-xxhdpi/is_splash_icon_maskable_bool.xml",
       "res/values-xxxhdpi/is_splash_icon_maskable_bool.xml",
diff --git a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni
index 6d254425298..82e44940a80 100644
--- a/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni
+++ b/chromium/chrome/android/webapk/shell_apk/current_version/current_version.gni
@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 145
+current_shell_apk_version = 146