BASELINE: Update Chromium to 96.0.4664.181

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

23 files changed, 307 insertions, 156 deletions

diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn
index dd4823f8558..20e37bb1fb6 100644
--- a/chromium/chrome/android/BUILD.gn
+++ b/chromium/chrome/android/BUILD.gn
@@ -23,7 +23,6 @@ import("//chrome/browser/commerce/price_tracking/android/java_sources.gni")
 import("//chrome/browser/commerce/subscriptions/android/java_sources.gni")
 import(
     "//chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni")
-import("//chrome/browser/feed/android/web_feed_java_sources.gni")
 import("//chrome/browser/share/android/java_sources.gni")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
@@ -113,7 +112,7 @@ jinja_template("chrome_public_android_manifest") {
   output = chrome_public_android_manifest
   variables = chrome_public_jinja_variables
   variables += [
-    "min_sdk_version=21",
+    "min_sdk_version=$default_min_sdk_version",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -204,7 +203,7 @@ android_resources("chrome_app_java_resources") {
     ":ui_locale_string_resources",
     "//chrome/android/webapk/libs/common:splash_resources",
     "//chrome/app:java_strings_grd",
-    "//chrome/browser/feed/android:web_feed_java_resources",
+    "//chrome/browser/feed/android:feed_java_resources",
     "//chrome/browser/feedback/android:java_resources",
     "//chrome/browser/lens:java_resources",
     "//chrome/browser/password_check/android:java_resources",
@@ -213,6 +212,7 @@ android_resources("chrome_app_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/strings:ui_strings_grd",
@@ -282,6 +282,7 @@ java_group("delegate_public_impl_java") {
     ":app_hooks_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/policy/android:delegate_public_impl_java",
     "//chrome/browser/ui/android/theme:delegate_public_impl_java",
     "//components/externalauth/android:google_delegate_public_impl_java",
@@ -331,15 +332,18 @@ android_library("chrome_java") {
     "//chrome/browser/android/browserservices/verification:java",
     "//chrome/browser/android/crypto:java",
     "//chrome/browser/android/lifecycle:java",
+    "//chrome/browser/android/messages:java",
     "//chrome/browser/android/webapps/launchpad:java",
     "//chrome/browser/attribution_reporting/android:factory_java",
     "//chrome/browser/attribution_reporting/android:java",
     "//chrome/browser/banners/android:java",
     "//chrome/browser/browser_controls/android:java",
     "//chrome/browser/commerce/merchant_viewer/android:java",
+    "//chrome/browser/commerce/shopping_list/android:java",
     "//chrome/browser/consent_auditor/android:java",
     "//chrome/browser/contextmenu:java",
     "//chrome/browser/continuous_search:java",
+    "//chrome/browser/dependency_injection:java",
     "//chrome/browser/device:java",
     "//chrome/browser/download/android:factory_java",
     "//chrome/browser/download/android:file_provider_java",
@@ -356,6 +360,7 @@ android_library("chrome_java") {
     "//chrome/browser/history_clusters:java",
     "//chrome/browser/image_descriptions:java",
     "//chrome/browser/image_editor/public:java",
+    "//chrome/browser/incognito:java",
     "//chrome/browser/language/android:base_module_java",
     "//chrome/browser/language/android:java",
     "//chrome/browser/lens:java",
@@ -373,13 +378,16 @@ android_library("chrome_java") {
     "//chrome/browser/password_manager/android:java",
     "//chrome/browser/performance_hints/android:java",
     "//chrome/browser/policy/android:java",
+    "//chrome/browser/power_bookmarks:proto_java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/privacy:java",
+    "//chrome/browser/privacy_review/android:java",
     "//chrome/browser/privacy_sandbox/android:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/safe_browsing/android:java",
     "//chrome/browser/safety_check/android:java",
     "//chrome/browser/search_engines/android:java",
+    "//chrome/browser/segmentation_platform:factory_java",
     "//chrome/browser/settings:java",
     "//chrome/browser/share:java",
     "//chrome/browser/share/android:java_resources",
@@ -398,6 +406,7 @@ android_library("chrome_java") {
     "//chrome/browser/ui/android/layouts:java",
     "//chrome/browser/ui/android/layouts/glue:java",
     "//chrome/browser/ui/android/layouts/third_party/float_property:java",
+    "//chrome/browser/ui/android/management:java",
     "//chrome/browser/ui/android/multiwindow:java",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/night_mode:java",
@@ -441,6 +450,7 @@ android_library("chrome_java") {
     "//components/browser_ui/util/android:java",
     "//components/browser_ui/webshare/android:java",
     "//components/browser_ui/widget/android:java",
+    "//components/commerce/core:proto_java",
     "//components/component_updater/android:background_task_update_scheduler_java",
     "//components/content_capture/android:java",
     "//components/content_settings/android:content_settings_enums_java",
@@ -489,6 +499,7 @@ android_library("chrome_java") {
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/offline_items_collection/core:core_java",
     "//components/omnibox/browser:browser_java",
+    "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//components/page_info/android:java",
     "//components/page_info/android:page_info_action_enum_java",
     "//components/paint_preview/browser/android:java",
@@ -552,6 +563,7 @@ android_library("chrome_java") {
     "//services/media_session/public/cpp/android:media_session_java",
     "//services/media_session/public/mojom:mojom_java",
     "//services/network/public/mojom:mojom_java",
+    "//services/network/public/mojom:mojom_proxy_config_java",
     "//services/network/public/mojom:url_loader_base_java",
     "//services/service_manager/public/java:service_manager_java",
     "//services/service_manager/public/mojom:mojom_java",
@@ -602,7 +614,6 @@ android_library("chrome_java") {
   ]
 
   deps += feed_deps
-  deps += web_feed_deps
 
   srcjar_deps = [
     ":autofill_verification_status_generated_enum",
@@ -624,6 +635,7 @@ android_library("chrome_java") {
     "//chrome/browser:survey_http_client_type_enum",
     "//chrome/browser/notifications/scheduler/public:jni_enums",
     "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar",
+    "//chrome/browser/ui:duplicate_download_enums_java",
     "//components/autofill_assistant/browser:autofill_assistant_enums_java",
     "//components/autofill_assistant/browser:autofill_assistant_intent_strings_java",
     "//components/browsing_data/core:browsing_data_utils_java",
@@ -642,9 +654,6 @@ android_library("chrome_java") {
   sources += feed_java_sources
   srcjar_deps += feed_srcjar_deps
 
-  # Include sources from web_feed_java_sources.gni.
-  sources += web_feed_java_sources
-
   sources += public_vr_java_sources
 
   # Include sources from public_tab_management_java_sources.gni.
@@ -728,6 +737,7 @@ java_group("chrome_all_java") {
     "//chrome/browser/attribution_reporting/android/internal:java",
     "//chrome/browser/commerce/merchant_viewer/android:java",
     "//chrome/browser/content_creation/notes/internal/android:java",
+    "//chrome/browser/content_creation/reactions/internal/android:java",
     "//chrome/browser/download/internal/android:java",
     "//chrome/browser/page_annotations/android:java",
     "//chrome/browser/password_check:internal_java",
@@ -776,6 +786,7 @@ group("jni_headers") {
     "//chrome/browser/flags:jni_headers",
     "//chrome/browser/history_clusters:jni_headers",
     "//chrome/browser/image_descriptions:jni_headers",
+    "//chrome/browser/incognito:jni_headers",
     "//chrome/browser/locale:jni_headers",
     "//chrome/browser/performance_hints/android:jni_headers",
     "//chrome/browser/preferences:jni_headers",
@@ -926,6 +937,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/contextmenu:java",
     "//chrome/browser/continuous_search:junit",
     "//chrome/browser/continuous_search/internal:junit",
+    "//chrome/browser/dependency_injection:java",
     "//chrome/browser/device:java",
     "//chrome/browser/device:junit",
     "//chrome/browser/download/android:java",
@@ -945,6 +957,7 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/gsa:java",
     "//chrome/browser/image_descriptions:java",
     "//chrome/browser/image_editor/public:java",
+    "//chrome/browser/incognito:java",
     "//chrome/browser/lens:delegate_public_impl_java",
     "//chrome/browser/lens:java",
     "//chrome/browser/locale:java",
@@ -992,9 +1005,11 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/android/native_page:junit",
     "//chrome/browser/ui/android/night_mode:java",
+    "//chrome/browser/ui/android/night_mode:junit",
     "//chrome/browser/ui/android/omnibox:java",
     "//chrome/browser/ui/android/omnibox:junit",
     "//chrome/browser/ui/android/quickactionsearchwidget:java",
+    "//chrome/browser/ui/android/searchactivityutils:java",
     "//chrome/browser/ui/android/theme:java",
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/android/toolbar:junit",
@@ -1022,6 +1037,7 @@ junit_binary("chrome_junit_tests") {
     "//components/browser_ui/notifications/android:java",
     "//components/browser_ui/share/android:java",
     "//components/browser_ui/site_settings/android:java",
+    "//components/browser_ui/test/android:test_support_java",
     "//components/browser_ui/util/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/commerce/core:proto_java",
@@ -1037,6 +1053,7 @@ junit_binary("chrome_junit_tests") {
     "//components/favicon/android:java",
     "//components/feature_engagement/public:public_java",
     "//components/feed/core/proto:proto_java_v2",
+    "//components/feed/core/v2:feedv2_core_java",
     "//components/image_fetcher:java",
     "//components/infobars/android:java",
     "//components/messages/android:java",
@@ -1084,6 +1101,7 @@ junit_binary("chrome_junit_tests") {
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
     "//third_party/android_deps:dagger_java",
+    "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:guava_android_java",
     "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:rules_java",
@@ -1099,6 +1117,7 @@ junit_binary("chrome_junit_tests") {
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
+    "//third_party/blink/public/mojom:mojom_core_java",
     "//third_party/blink/public/mojom:mojom_platform_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/google-truth:google_truth_java",
@@ -1135,6 +1154,25 @@ source_set("chrome_test_util_jni") {
   ]
 }
 
+# Files used by chrome integration and unit javatests.
+android_library("chrome_unit_test_util_java") {
+  testonly = true
+
+  sources = [
+    "javatests/src/org/chromium/chrome/browser/homepage/HomepageTestRule.java",
+  ]
+
+  deps = [
+    "//chrome/browser/preferences:java",
+    "//components/policy/android:policy_java",
+    "//components/policy/android:policy_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/junit:junit",
+  ]
+}
+
 # Files used for both chrome tests and VR/AR and autofill_assistant tests
 android_library("chrome_test_util_java") {
   testonly = true
@@ -1149,6 +1187,8 @@ android_library("chrome_test_util_java") {
     "javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestRule.java",
   ]
 
+  public_deps = [ ":chrome_unit_test_util_java" ]
+
   deps = [
     ":browser_java_test_support",
     "//base:base_java",
@@ -1182,6 +1222,32 @@ android_library("chrome_test_util_java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
+android_library("chrome_unit_test_java") {
+  testonly = true
+  resources_package = "org.chromium.chrome.test"
+  sources = [
+    "javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java",
+  ]
+  deps = [
+    ":chrome_unit_test_util_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/ui/android/toolbar:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//components/browser_ui/settings/android:java",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:espresso_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_test_runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_full_java",
+    "//ui/android:ui_java_test_support",
+  ]
+}
+
 android_library("chrome_test_java") {
   testonly = true
   resources_package = "org.chromium.chrome.test"
@@ -1233,11 +1299,15 @@ 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/merchant_viewer/android:java",
     "//chrome/browser/commerce/merchant_viewer/android:javatests",
     "//chrome/browser/content_creation/notes/internal/android:java",
     "//chrome/browser/content_creation/notes/internal/android:javatests",
     "//chrome/browser/contextmenu:java",
+    "//chrome/browser/continuous_search:data_structures_java",
+    "//chrome/browser/continuous_search:java",
     "//chrome/browser/continuous_search:javatests",
+    "//chrome/browser/dependency_injection:java",
     "//chrome/browser/device:java",
     "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/download/android:java",
@@ -1245,6 +1315,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/endpoint_fetcher:java",
     "//chrome/browser/enterprise/util:java",
     "//chrome/browser/feature_engagement:java",
+    "//chrome/browser/feed/android:java",
     "//chrome/browser/feed/android:javatests",
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/first_run/android:java",
@@ -1252,6 +1323,8 @@ android_library("chrome_test_java") {
     "//chrome/browser/fullscreen/android:java",
     "//chrome/browser/gsa:java",
     "//chrome/browser/image_descriptions:javatests",
+    "//chrome/browser/incognito:incognito_java_tests",
+    "//chrome/browser/incognito:java",
     "//chrome/browser/language/android:base_module_java",
     "//chrome/browser/language/android:java",
     "//chrome/browser/language/android:javatests",
@@ -1274,6 +1347,7 @@ android_library("chrome_test_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/privacy_sandbox/android:java",
     "//chrome/browser/privacy_sandbox/android:javatests",
@@ -1315,6 +1389,7 @@ android_library("chrome_test_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/theme:java",
     "//chrome/browser/ui/android/toolbar:java",
     "//chrome/browser/ui/android/toolbar:javatests",
@@ -1404,7 +1479,6 @@ 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/paint_preview/common/proto:proto_java",
     "//components/paint_preview/player/android:java",
     "//components/paint_preview/player/android:javatests",
     "//components/password_manager/core/browser:password_manager_java_enums",
@@ -1455,6 +1529,7 @@ android_library("chrome_test_java") {
     "//services/device/public/java:geolocation_java_test_support",
     "//services/device/public/mojom:mojom_java",
     "//services/network/public/mojom:mojom_java",
+    "//services/network/public/mojom:mojom_proxy_config_java",
     "//services/network/public/mojom:url_loader_base_java",
     "//services/service_manager/public/java:service_manager_java",
     "//third_party/android_data_chart:android_data_chart_java",
@@ -1482,6 +1557,7 @@ android_library("chrome_test_java") {
     "//third_party/androidx:androidx_viewpager_viewpager_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
+    "//third_party/blink/public/mojom:mojom_core_java",
     "//third_party/blink/public/mojom:mojom_mhtml_load_result_java",
     "//third_party/blink/public/mojom:mojom_platform_java",
     "//third_party/hamcrest:hamcrest_java",
@@ -2386,6 +2462,7 @@ android_library("base_module_java") {
   sources = [
     "../browser/attribution_reporting/android/java/src/org/chromium/chrome/browser/attribution_reporting/AttributionReportingProvider.java",
     "java/src/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
+    "java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
     "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
     "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
     "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
@@ -2713,6 +2790,8 @@ android_resources("trichrome_dummy_resources") {
   sources = [ "trichrome/res_dummy/values/strings.xml" ]
 }
 
+chrome_public_unit_test_apk_manifest =
+    "$root_gen_dir/chrome_public_unit_test_apk_manifest/AndroidManifest.xml"
 chrome_public_test_apk_manifest =
     "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
 chrome_public_test_vr_apk_manifest =
@@ -2720,6 +2799,18 @@ chrome_public_test_vr_apk_manifest =
 monochrome_public_test_ar_apk_manifest =
     "$root_gen_dir/monochrome_public_test_ar_apk_manifest/AndroidManifest.xml"
 
+jinja_template("chrome_public_unit_test_apk_manifest") {
+  input = "javatests/AndroidManifest.xml"
+  includes = [ "java/AndroidManifest.xml" ]
+  output = chrome_public_unit_test_apk_manifest
+  variables = default_chrome_public_jinja_variables
+  variables += [
+    "manifest_package=$chrome_public_test_manifest_package",
+    "min_sdk_version=$default_min_sdk_version",
+    "target_sdk_version=$android_sdk_version",
+  ]
+}
+
 jinja_template("chrome_public_test_apk_manifest") {
   input = "javatests/AndroidManifest.xml"
   includes = [ "java/AndroidManifest.xml" ]
@@ -2727,7 +2818,7 @@ jinja_template("chrome_public_test_apk_manifest") {
   variables = default_chrome_public_jinja_variables
   variables += [
     "manifest_package=$chrome_public_test_manifest_package",
-    "min_sdk_version=21",
+    "min_sdk_version=$default_min_sdk_version",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -2738,7 +2829,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
   output = chrome_public_test_vr_apk_manifest
   variables = chrome_public_jinja_variables
   variables += [
-    "min_sdk_version=21",
+    "min_sdk_version=$default_min_sdk_version",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -2879,6 +2970,23 @@ template("monochrome_test_apk_tmpl") {
   }
 }
 
+# As compared to chrome_public_test_apk, this target contains only unit tests
+# that require on device capabilities. These tests are smaller, more tightly
+# scoped, and do not leave lingering state after execution.
+# TODO(crbug.com/1238057): Set clear rules for what tests can be added here.
+chrome_test_apk_tmpl("chrome_public_unit_test_apk") {
+  apk_name = "ChromePublicUnitTest"
+  android_manifest = chrome_public_unit_test_apk_manifest
+  android_manifest_dep = ":chrome_public_unit_test_apk_manifest"
+  shared_libraries = [ ":libchromefortest" ]
+  deps = [
+    ":chrome_unit_test_java",
+    "//chrome/browser/user_education:javatests",
+    "//chrome/browser/video_tutorials/internal:javatests",
+  ]
+}
+
+# TODO(crbug.com/1238057): Rename to chrome_public_integration_test_apk
 chrome_test_apk_tmpl("chrome_public_test_apk") {
   # TODO(wnwen): Re-enable when new lint failures are disabled for test targets.
   #enable_lint = true
@@ -2892,8 +3000,6 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     ":chrome_test_java",
     "//chrome/android/features/autofill_assistant:test_java",
     "//chrome/android/features/keyboard_accessory:test_java",
-    "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
-    "//chrome/android/webapk/shell_apk:shell_apk_javatests",
     "//chrome/browser/banners/android:javatests",
     "//chrome/browser/download/android:download_java_tests",
     "//chrome/browser/engagement/android:javatests",
@@ -2903,10 +3009,10 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/tabmodel:javatests",
     "//chrome/browser/touch_to_fill/android:test_java",
     "//chrome/browser/ui/android/appmenu/internal:javatests",
+    "//chrome/browser/ui/android/omnibox:javatests",
     "//chrome/browser/ui/android/webid/internal:javatests",
     "//chrome/browser/ui/messages/android:javatests",
     "//chrome/browser/util:javatests",
-    "//chrome/browser/video_tutorials/internal:javatests",
   ]
 
   data_deps = [ "//testing/buildbot/filters:chrome_public_test_apk_filters" ]
@@ -2919,9 +3025,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
   enforce_resource_overlays_in_tests = true
 
   additional_apks = [
-    "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
     "//chrome/android/webapk/shell_apk:javatests_webapk",
-    "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
     "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
     "//components/media_router/test/android/media_router_test_support:media_router_test_support_apk",
   ]
@@ -3026,6 +3130,7 @@ android_test_apk("chrome_smoke_test_apk") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/androidx:androidx_test_runner_java",
+    "//third_party/hamcrest:hamcrest_library_java",
     "//third_party/junit",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
   ]
@@ -3035,6 +3140,10 @@ 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"
+  extra_args = [
+    "--enable-breakpad-dump",
+    "--use-apk-under-test-flags-file",
+  ]
 }
 
 # Public webview targets don't work with non-public sdks.
@@ -3048,6 +3157,10 @@ instrumentation_test_runner("monochrome_public_smoke_test") {
   android_test_apk = ":chrome_smoke_test_apk"
   android_test_apk_name = "ChromeSmokeTest"
   never_incremental = true
+  extra_args = [
+    "--enable-breakpad-dump",
+    "--use-apk-under-test-flags-file",
+  ]
 }
 
 android_test_apk("chrome_bundle_smoke_test_apk") {
@@ -3079,6 +3192,11 @@ _bundle_smoke_test_extra_args = [
   # Make extra args be passed through to the bundle under test (see below).
   "--use-apk-under-test-flags-file",
 
+  # Enable breakpad dumps in order to detect Chrome crashes (because the
+  # test intentionally does not set <instrumentation android:targetPackage> to
+  # the bundle under test.)
+  "--enable-breakpad-dump",
+
   # Chrome crashes at startup if strict mode is turned on.
   "--strict-mode=off",
 
@@ -3096,10 +3214,8 @@ instrumentation_test_runner("chrome_modern_public_bundle_smoke_test") {
   extra_args = _bundle_smoke_test_extra_args
 }
 
+# These are in addition to the ones listed in _bundle_smoke_test_extra_args.
 _bundle_fake_modules_smoke_test_extra_args = [
-  # These are in addition to the ones listed in _bundle_smoke_test_extra_args.
-  "--fake-feature-module-install",
-
   # The fake modules' apks are stored in the apk_under_test's data directory.
   # This flag tells test_runner.py to skip the "pm clear" step so that the apk
   # files (along with other app data) are not removed before tests are run.
@@ -3216,6 +3332,15 @@ group("chrome_nocompile_tests") {
   ]
 }
 
+script_test("monochrome_webview_finch_smoke_tests") {
+  script = "//testing/scripts/run_finch_smoke_tests_android.py"
+  data_deps = [
+    "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+    "//chrome/android:monochrome_public_apk",
+    "//testing:wpt_android_lib",
+  ]
+}
+
 script_test("chrome_public_wpt") {
   script = "//testing/scripts/run_android_wpt.py"
   args = [
@@ -3242,7 +3367,7 @@ chrome_bundle("chrome_modern_public_bundle") {
   }
   is_monochrome_or_trichrome = false
   manifest_package = chrome_public_manifest_package
-  min_sdk_version = 21
+  min_sdk_version = default_min_sdk_version
   module_descs = chrome_modern_module_descs
   version_code = chrome_modern_version_code
 
@@ -3577,8 +3702,7 @@ 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/FeedSurfaceScopeDependencyProvider.java",
-    "feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedPersistentKeyValueCache.java",
+    "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",
@@ -3587,7 +3711,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/ChromePowerModeVoter.java",
     "java/src/org/chromium/chrome/browser/DevToolsServer.java",
     "java/src/org/chromium/chrome/browser/IntentHandler.java",
-    "java/src/org/chromium/chrome/browser/IntentHelper.java",
     "java/src/org/chromium/chrome/browser/NearOomMonitor.java",
     "java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java",
     "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java",
@@ -3661,6 +3784,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/download/DownloadItem.java",
     "java/src/org/chromium/chrome/browser/download/DownloadManagerService.java",
     "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
+    "java/src/org/chromium/chrome/browser/download/DuplicateDownloadDialogBridge.java",
     "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorFactory.java",
     "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
@@ -3677,7 +3801,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/history/HistoryDeletionBridge.java",
     "java/src/org/chromium/chrome/browser/history/HistoryDeletionInfo.java",
     "java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java",
-    "java/src/org/chromium/chrome/browser/incognito/IncognitoUtils.java",
     "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/AutofillOfferNotificationInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
@@ -3693,7 +3816,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/infobar/NearOomInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/NearOomReductionInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java",
-    "java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java",
     "java/src/org/chromium/chrome/browser/infobar/PreviewsLitePageInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/ReaderModeInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
@@ -3741,7 +3863,6 @@ 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/omaha/notification/UpdateNotificationServiceBridge.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",
@@ -3756,6 +3877,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java",
     "java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUIView.java",
     "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
+    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
     "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
     "java/src/org/chromium/chrome/browser/previews/PreviewsAndroidBridge.java",
     "java/src/org/chromium/chrome/browser/printing/TabPrinter.java",
diff --git a/chromium/chrome/android/chrome_java_resources.gni b/chromium/chrome/android/chrome_java_resources.gni
index 48e78888956..4cb53a7b088 100644
--- a/chromium/chrome/android/chrome_java_resources.gni
+++ b/chromium/chrome/android/chrome_java_resources.gni
@@ -15,10 +15,7 @@ chrome_java_resources = [
   "java/res/anim/fast_out_slow_in_interpolator.xml",
   "java/res/anim/slide_in_up.xml",
   "java/res/anim/stay_hidden.xml",
-  "java/res/color/payment_minimal_ui_default_tint.xml",
-  "java/res/color/payment_minimal_ui_emphasis_tint.xml",
-  "java/res/color/payment_minimal_ui_error_tint.xml",
-  "java/res/color/tab_layout_colors.xml",
+  "java/res/color/tab_layout_text_color_list.xml",
   "java/res/color/white_mode_tint.xml",
   "java/res/drawable-hdpi/amex_card.png",
   "java/res/drawable-hdpi/bg_tabstrip_background_tab_outline.9.png",
@@ -45,7 +42,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/down_arrow.png",
   "java/res/drawable-hdpi/google_logo.png",
   "java/res/drawable-hdpi/help_outline.png",
-  "java/res/drawable-hdpi/ic_account_child_20dp.png",
   "java/res/drawable-hdpi/ic_devices_16dp.png",
   "java/res/drawable-hdpi/ic_devices_48dp.png",
   "java/res/drawable-hdpi/ic_dialer_icon_blue_40dp.png",
@@ -142,7 +138,6 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/down_arrow.png",
   "java/res/drawable-mdpi/google_logo.png",
   "java/res/drawable-mdpi/help_outline.png",
-  "java/res/drawable-mdpi/ic_account_child_20dp.png",
   "java/res/drawable-mdpi/ic_devices_16dp.png",
   "java/res/drawable-mdpi/ic_devices_48dp.png",
   "java/res/drawable-mdpi/ic_dialer_icon_blue_40dp.png",
@@ -240,7 +235,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/down_arrow.png",
   "java/res/drawable-xhdpi/google_logo.png",
   "java/res/drawable-xhdpi/help_outline.png",
-  "java/res/drawable-xhdpi/ic_account_child_20dp.png",
   "java/res/drawable-xhdpi/ic_devices_16dp.png",
   "java/res/drawable-xhdpi/ic_devices_48dp.png",
   "java/res/drawable-xhdpi/ic_dialer_icon_blue_40dp.png",
@@ -321,7 +315,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/down_arrow.png",
   "java/res/drawable-xxhdpi/google_logo.png",
   "java/res/drawable-xxhdpi/help_outline.png",
-  "java/res/drawable-xxhdpi/ic_account_child_20dp.png",
   "java/res/drawable-xxhdpi/ic_devices_16dp.png",
   "java/res/drawable-xxhdpi/ic_devices_48dp.png",
   "java/res/drawable-xxhdpi/ic_dialer_icon_blue_40dp.png",
@@ -401,7 +394,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/down_arrow.png",
   "java/res/drawable-xxxhdpi/google_logo.png",
   "java/res/drawable-xxxhdpi/help_outline.png",
-  "java/res/drawable-xxxhdpi/ic_account_child_20dp.png",
   "java/res/drawable-xxxhdpi/ic_devices_16dp.png",
   "java/res/drawable-xxxhdpi/ic_devices_48dp.png",
   "java/res/drawable-xxxhdpi/ic_dialer_icon_blue_40dp.png",
@@ -462,6 +454,8 @@ chrome_java_resources = [
   "java/res/drawable/arrow_down.xml",
   "java/res/drawable/arrow_up.xml",
   "java/res/drawable/bg_white_dialog.xml",
+  "java/res/drawable/bookmark_save_flow_background.xml",
+  "java/res/drawable/bookmark_save_flow_ripple.xml",
   "java/res/drawable/bookmark_title_bar_shadow.xml",
   "java/res/drawable/bookmark_widget_list_selector.xml",
   "java/res/drawable/btn_back.xml",
@@ -474,7 +468,6 @@ chrome_java_resources = [
   "java/res/drawable/checkerboard_background.xml",
   "java/res/drawable/computer_black_24dp.xml",
   "java/res/drawable/contextual_search_panel_help_background.xml",
-  "java/res/drawable/contextual_search_promo_background.xml",
   "java/res/drawable/custom_tabs_handle_view_shape.xml",
   "java/res/drawable/data_reduction_big.xml",
   "java/res/drawable/data_reduction_illustration.xml",
@@ -484,6 +477,7 @@ 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",
@@ -495,13 +489,9 @@ chrome_java_resources = [
   "java/res/drawable/ic_checkmark_24dp.xml",
   "java/res/drawable/ic_cloud_offline_24dp.xml",
   "java/res/drawable/ic_credit_card_black.xml",
-  "java/res/drawable/ic_desktop_windows.xml",
-  "java/res/drawable/ic_done_googblue_36dp.xml",
   "java/res/drawable/ic_error.xml",
-  "java/res/drawable/ic_error_googred_36dp.xml",
   "java/res/drawable/ic_file_download_scheduled_24dp.xml",
   "java/res/drawable/ic_find_in_page.xml",
-  "java/res/drawable/ic_fingerprint_grey500_36dp.xml",
   "java/res/drawable/ic_forward_arrow_black_24dp.xml",
   "java/res/drawable/ic_google_services_48dp.xml",
   "java/res/drawable/ic_image_descriptions.xml",
@@ -512,15 +502,15 @@ 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_photo_camera_black.xml",
-  "java/res/drawable/ic_reading_list_folder.xml",
-  "java/res/drawable/ic_remove_box_rounded_corner.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_settings_black.xml",
   "java/res/drawable/ic_signout_40dp.xml",
   "java/res/drawable/ic_site_timer.xml",
+  "java/res/drawable/ic_storefront_blue.xml",
   "java/res/drawable/ic_sync_badge_error_20dp.xml",
   "java/res/drawable/ic_sync_error_48dp.xml",
+  "java/res/drawable/ic_sync_error_legacy_24dp.xml",
   "java/res/drawable/ic_sync_error_legacy_40dp.xml",
   "java/res/drawable/ic_sync_off_48dp.xml",
   "java/res/drawable/ic_sync_on_48dp.xml",
@@ -542,6 +532,8 @@ 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/price_tracking_disabled.xml",
+  "java/res/drawable/price_tracking_enabled.xml",
   "java/res/drawable/qr_code.xml",
   "java/res/drawable/screenshot.xml",
   "java/res/drawable/send_tab.xml",
@@ -559,7 +551,6 @@ chrome_java_resources = [
   "java/res/drawable/visa_card.xml",
   "java/res/layout-sw360dp/preference_spinner_single_line.xml",
   "java/res/layout-sw600dp/find_toolbar.xml",
-  "java/res/layout/accessibility_page_zoom_preference.xml",
   "java/res/layout/accessibility_tab_switcher.xml",
   "java/res/layout/accessibility_tab_switcher_list_item.xml",
   "java/res/layout/account_chooser_dialog_item.xml",
@@ -576,6 +567,7 @@ chrome_java_resources = [
   "java/res/layout/autofill_local_card_editor.xml",
   "java/res/layout/autofill_name_fixflow.xml",
   "java/res/layout/autofill_save_address_profile_prompt.xml",
+  "java/res/layout/autofill_save_card_base_layout.xml",
   "java/res/layout/autofill_server_card_editor.xml",
   "java/res/layout/autofill_server_data_edit_link.xml",
   "java/res/layout/autofill_server_data_label.xml",
@@ -589,6 +581,7 @@ chrome_java_resources = [
   "java/res/layout/bookmark_folder_select_activity.xml",
   "java/res/layout/bookmark_item_row.xml",
   "java/res/layout/bookmark_main.xml",
+  "java/res/layout/bookmark_save_flow.xml",
   "java/res/layout/bookmark_section_header.xml",
   "java/res/layout/bookmark_widget.xml",
   "java/res/layout/bookmark_widget_icons_only.xml",
@@ -610,6 +603,7 @@ chrome_java_resources = [
   "java/res/layout/contextual_search_context_view.xml",
   "java/res/layout/contextual_search_panel_help_view.xml",
   "java/res/layout/contextual_search_promo_view.xml",
+  "java/res/layout/contextual_search_promo_view_revised.xml",
   "java/res/layout/contextual_search_quick_action_icon_view.xml",
   "java/res/layout/contextual_search_related_searches_in_content_view.xml",
   "java/res/layout/contextual_search_related_searches_view.xml",
@@ -649,6 +643,7 @@ 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",
@@ -698,6 +693,8 @@ chrome_java_resources = [
   "java/res/layout/password_no_result.xml",
   "java/res/layout/passwords_error_dialog.xml",
   "java/res/layout/passwords_progress_dialog.xml",
+  "java/res/layout/power_bookmark_shopping_item_row.xml",
+  "java/res/layout/power_bookmark_tag_chip_list.xml",
   "java/res/layout/powered_by_chrome_footer.xml",
   "java/res/layout/preference_text_scale.xml",
   "java/res/layout/radio_button_group_homepage_preference.xml",
@@ -713,6 +710,7 @@ chrome_java_resources = [
   "java/res/layout/send_tab_to_self_device_picker_list.xml",
   "java/res/layout/send_tab_to_self_device_picker_toolbar.xml",
   "java/res/layout/send_tab_to_self_feature_unavailable_prompt.xml",
+  "java/res/layout/send_tab_to_self_manage_devices_link.xml",
   "java/res/layout/settings_activity.xml",
   "java/res/layout/share_sheet_content.xml",
   "java/res/layout/share_sheet_item.xml",
diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni
index dd58dafd72a..c784135d978 100644
--- a/chromium/chrome/android/chrome_java_sources.gni
+++ b/chromium/chrome/android/chrome_java_sources.gni
@@ -34,7 +34,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/DevToolsServer.java",
   "java/src/org/chromium/chrome/browser/FileProviderHelper.java",
   "java/src/org/chromium/chrome/browser/IntentHandler.java",
-  "java/src/org/chromium/chrome/browser/IntentHelper.java",
   "java/src/org/chromium/chrome/browser/KeyboardShortcuts.java",
   "java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java",
   "java/src/org/chromium/chrome/browser/LauncherShortcutActivity.java",
@@ -57,7 +56,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/about_settings/HyperlinkPreference.java",
   "java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java",
   "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java",
-  "java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilityPageZoomPreference.java",
   "java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java",
   "java/src/org/chromium/chrome/browser/accessibility/settings/TextScalePreference.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelAdapter.java",
@@ -104,6 +102,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowPrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java",
+  "java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardConfirmFlowPrompt.java",
+  "java/src/org/chromium/chrome/browser/autofill/AutofillSaveCardPromptBase.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillSnackbarController.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillUiUtils.java",
   "java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java",
@@ -159,6 +159,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemRow.java",
@@ -169,11 +170,18 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowCoordinator.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowProperties.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowViewBinder.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkTextInputLayout.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java",
   "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/PowerBookmarkShoppingItemRow.java",
+  "java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTagChipList.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",
   "java/src/org/chromium/chrome/browser/bookmarks/bottomsheet/BookmarkBottomSheetCoordinator.java",
@@ -488,7 +496,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java",
   "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionSiteBreakdownView.java",
   "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionStatsPreference.java",
-  "java/src/org/chromium/chrome/browser/dependency_injection/ActivityScope.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ChromeActivityCommonsModule.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ChromeActivityComponent.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ChromeAppComponent.java",
@@ -546,6 +553,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUpdate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
+  "java/src/org/chromium/chrome/browser/download/DuplicateDownloadClickableSpan.java",
+  "java/src/org/chromium/chrome/browser/download/DuplicateDownloadDialog.java",
+  "java/src/org/chromium/chrome/browser/download/DuplicateDownloadDialogBridge.java",
   "java/src/org/chromium/chrome/browser/download/FileAccessPermissionHelper.java",
   "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java",
   "java/src/org/chromium/chrome/browser/download/OfflineContentAvailabilityStatusProvider.java",
@@ -669,15 +679,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java",
   "java/src/org/chromium/chrome/browser/homepage/settings/RadioButtonGroupHomepagePreference.java",
   "java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java",
-  "java/src/org/chromium/chrome/browser/incognito/IncognitoCctProfileManager.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationPresenceController.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationServiceImpl.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoProfileDestroyer.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java",
-  "java/src/org/chromium/chrome/browser/incognito/IncognitoTabPersistence.java",
   "java/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotController.java",
-  "java/src/org/chromium/chrome/browser/incognito/IncognitoUtils.java",
   "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/AutofillOfferNotificationInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
@@ -700,7 +707,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/infobar/NearOomReductionInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/PasswordInfoBarUtils.java",
   "java/src/org/chromium/chrome/browser/infobar/PermissionInfoBar.java",
-  "java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java",
   "java/src/org/chromium/chrome/browser/infobar/PreviewsLitePageInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/ReaderModeInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
@@ -822,8 +828,6 @@ 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/ScrollListener.java",
-  "java/src/org/chromium/chrome/browser/ntp/ScrollableContainerDelegate.java",
   "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelper.java",
   "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
@@ -841,6 +845,7 @@ chrome_java_sources = [
   "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",
@@ -895,11 +900,6 @@ chrome_java_sources = [
   "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/omaha/notification/UpdateNotificationController.java",
-  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationControllerFactory.java",
-  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationControllerImpl.java",
-  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationServiceBridge.java",
-  "java/src/org/chromium/chrome/browser/omaha/notification/UpdateUtils.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/PageInfoHistoryController.java",
@@ -965,7 +965,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",
   "java/src/org/chromium/chrome/browser/payments/SettingsAutofillAndPaymentsObserver.java",
   "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java",
-  "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelperUtil.java",
   "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerActionModeCallback.java",
   "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
   "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
@@ -977,11 +976,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarProperties.java",
   "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarView.java",
   "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarViewBinder.java",
-  "java/src/org/chromium/chrome/browser/payments/minimal/MinimalUICoordinator.java",
-  "java/src/org/chromium/chrome/browser/payments/minimal/MinimalUIMediator.java",
-  "java/src/org/chromium/chrome/browser/payments/minimal/MinimalUIProperties.java",
-  "java/src/org/chromium/chrome/browser/payments/minimal/MinimalUIView.java",
-  "java/src/org/chromium/chrome/browser/payments/minimal/MinimalUIViewBinder.java",
   "java/src/org/chromium/chrome/browser/payments/ui/AnimatorProperties.java",
   "java/src/org/chromium/chrome/browser/payments/ui/ContactDetailsSection.java",
   "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
@@ -997,6 +991,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/ui/SectionUiUtils.java",
   "java/src/org/chromium/chrome/browser/payments/ui/ShoppingCart.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
+  "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
   "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
   "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java",
@@ -1019,7 +1014,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java",
   "java/src/org/chromium/chrome/browser/query_tiles/TileServiceUtils.java",
   "java/src/org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider.java",
-  "java/src/org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetReceiver.java",
   "java/src/org/chromium/chrome/browser/read_later/ReadLaterIPHController.java",
   "java/src/org/chromium/chrome/browser/read_later/ReadingListBridge.java",
   "java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java",
@@ -1034,6 +1028,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",
+  "java/src/org/chromium/chrome/browser/searchwidget/SearchType.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java",
   "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerServiceImpl.java",
@@ -1127,6 +1122,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorMessage.java",
+  "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorPromptUtils.java",
   "java/src/org/chromium/chrome/browser/sync/ui/SyncTrustedVaultProxyActivity.java",
   "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java",
   "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptorTabHelper.java",
@@ -1245,7 +1242,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateReportAbuseDialog.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateTask.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkVersionManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActiveTabUmaTracker.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity.java",
diff --git a/chromium/chrome/android/chrome_junit_test_java_sources.gni b/chromium/chrome/android/chrome_junit_test_java_sources.gni
index 63478f7d61e..af93a72bf02 100644
--- a/chromium/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_junit_test_java_sources.gni
@@ -10,6 +10,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java",
   "junit/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroidUnitTest.java",
   "junit/src/org/chromium/chrome/browser/app/tab_activity_glue/TabReparentingControllerTest.java",
   "junit/src/org/chromium/chrome/browser/app/tabmodel/TabPersistentStoreIntegrationTest.java",
   "junit/src/org/chromium/chrome/browser/app/tabmodel/TabbedModeTabModelOrchestratorUnitTest.java",
@@ -111,6 +112,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidatorUnitTest.java",
   "junit/src/org/chromium/chrome/browser/fonts/FontPreloaderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManagerUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java",
   "junit/src/org/chromium/chrome/browser/gsa/GSAStateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/history/HistoryAdapterAccessibilityTest.java",
@@ -175,7 +177,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/password_manager/settings/TimedCallbackDelayerTest.java",
   "junit/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImplTest.java",
   "junit/src/org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProviderTest.java",
-  "junit/src/org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetReceiverTest.java",
   "junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/reengagement/ReengagementNotificationControllerTest.java",
   "junit/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridgeTest.java",
@@ -217,6 +218,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/usage_stats/PageViewObserverTest.java",
   "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/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 9c5ae20c878..2a53ce562ae 100644
--- a/chromium/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni
@@ -22,6 +22,7 @@ default_chrome_public_jinja_variables = [
   "channel=$android_channel",
   "enable_vr=$enable_vr",
   "include_arcore_manifest_flag=false",
+  "zygote_preload_class=org.chromium.content_public.app.ZygotePreload",
 ]
 
 # Enable stack unwinding only on official build with specific channels. It is
@@ -138,7 +139,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
     } else if (_is_monochrome) {
       min_sdk_version = 24
     } else {
-      min_sdk_version = 21
+      min_sdk_version = default_min_sdk_version
     }
 
     resource_exclusion_regex = common_resource_exclusion_regex
diff --git a/chromium/chrome/android/chrome_test_java_sources.gni b/chromium/chrome/android/chrome_test_java_sources.gni
index b1a8a2eb5b9..533f43ba2a3 100644
--- a/chromium/chrome/android/chrome_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_test_java_sources.gni
@@ -79,7 +79,10 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedPromoRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoDismissTest.java",
   "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/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",
@@ -109,6 +112,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java",
   "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/contextmenu/ChromeContextMenuPopulatorTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuChipControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuHeaderViewTest.java",
@@ -121,9 +125,11 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateControllerWrapper.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicyTest.java",
+  "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/MockContextualSearchPolicy.java",
+  "javatests/src/org/chromium/chrome/browser/continuous_search/ContinuousSearchFullUiTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporterTest.java",
@@ -148,6 +154,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/customtabs/DetachedResourceRequestTest.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",
   "javatests/src/org/chromium/chrome/browser/customtabs/TrustedCdnPublisherUrlTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityTabControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/content/TabObserverRegistrarTest.java",
@@ -230,7 +237,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/history/HistoryTest.java",
   "javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java",
-  "javatests/src/org/chromium/chrome/browser/homepage/HomepageTestRule.java",
   "javatests/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/identity_disc/IdentityDiscControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoCookieLeakageTest.java",
@@ -257,7 +263,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java",
   "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/interstitials/LookalikeInterstitialTest.java",
-  "javatests/src/org/chromium/chrome/browser/javascript/ModalCloseWatcherTest.java",
+  "javatests/src/org/chromium/chrome/browser/javascript/CloseWatcherTest.java",
   "javatests/src/org/chromium/chrome/browser/javascript/WebContextFetcherTest.java",
   "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptAppModalDialogTest.java",
   "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptTabModalDialogTest.java",
@@ -266,6 +272,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/login/ChromeHttpAuthHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/media/MediaLauncherActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/media/MediaViewerUtilsTest.java",
+  "javatests/src/org/chromium/chrome/browser/media/PictureInPictureActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/MediaSessionTest.java",
@@ -290,10 +297,12 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/notifications/channels/SiteChannelsManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionViewRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageTest.java",
+  "javatests/src/org/chromium/chrome/browser/ntp/LogoViewTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageLoadTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/RecentTabsPageTest.java",
+  "javatests/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionViewRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/TitleUtilTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/MHTMLPageTest.java",
@@ -381,11 +390,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/PaymentManifestDownloaderTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentManifestParserTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestAbortTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressWithoutPhoneTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBlobUrlTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentGooglePayTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentQueryNoCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentQueryTest.java",
@@ -411,7 +418,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteEmailTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteServerCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestJourneyLoggerTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestLongIdTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java",
@@ -435,7 +441,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/PaymentRequestServerCardTest.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",
@@ -453,7 +458,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTabTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUpdateWithTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/SkipToGPayHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/WebPaymentIntentHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/AutomaticEmbargoTest.java",
   "javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java",
@@ -470,6 +474,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/previewtab/PreviewTabTest.java",
   "javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImplNativeTest.java",
+  "javatests/src/org/chromium/chrome/browser/privacy/settings/PrivacySettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/profiles/OTRProfileIDTest.java",
   "javatests/src/org/chromium/chrome/browser/profiles/ProfileResolverTest.java",
   "javatests/src/org/chromium/chrome/browser/profiles/ProfileTest.java",
@@ -501,8 +506,10 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplTest.java",
   "javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java",
+  "javatests/src/org/chromium/chrome/browser/signin/AccountsReloadingTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninCheckerTest.java",
+  "javatests/src/org/chromium/chrome/browser/signin/SigninFirstRunFragmentRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninFirstRunFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninHeaderTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninSignoutIntegrationTest.java",
@@ -515,6 +522,7 @@ chrome_test_java_sources = [
   "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",
+  "javatests/src/org/chromium/chrome/browser/site_settings/WebsitePreferenceBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/sms/WebOTPServiceInfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/ssl/CaptivePortalTest.java",
   "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorTest.java",
@@ -542,6 +550,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/sync/UkmTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
+  "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/SadTabTest.java",
@@ -586,7 +595,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tasks/ReturnToChromeTest.java",
   "javatests/src/org/chromium/chrome/browser/test/CommandLineInitRule.java",
   "javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java",
-  "javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/LocationBarModelTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarDataProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarIntegrationTest.java",
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index efa009a88e8..eba85c93fdb 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -318,11 +318,14 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestRule.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTriggerScriptIntegrationTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTtsIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUpdateClientSettingsIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/BottomSheetOnboardingCoordinatorTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/DirectActionsIntegrationTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InChromeTriggeringTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InCctTriggeringFromGsaTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/InCctTriggeringFromNonGsaTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/MiniActionTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureParameters.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/PasswordChangeFixtureTest.java",
@@ -451,6 +454,7 @@ android_resources("java_resources") {
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
+    "//components/browser_ui/styles/android:java_resources",
   ]
 }
 
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index e44113ad603..c7613ff9cbd 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -10,8 +10,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEAdvert.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticator.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUI.java",
-    "java/src/org/chromium/chrome/browser/webauth/authenticator/CameraView.java",
-    "java/src/org/chromium/chrome/browser/webauth/authenticator/QRScanDialog.java",
     "java/src/org/chromium/chrome/browser/webauth/authenticator/USBHandler.java",
   ]
 
@@ -23,6 +21,7 @@ android_library("java") {
     "$google_play_services_package:google_play_services_vision_common_java",
     "$google_play_services_package:google_play_services_vision_java",
     "//base:base_java",
+    "//chrome/browser/webauthn/android:java_resources",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
@@ -44,43 +43,14 @@ generate_jni("jni_headers") {
 
 android_resources("java_resources") {
   sources = [
-    "java/res/anim/circle_loader_animation_interpolator_0.xml",
-    "java/res/anim/circle_loader_animation_interpolator_1.xml",
-    "java/res/anim/circle_loader_animation_interpolator_2.xml",
-    "java/res/anim/circle_loader_animation_interpolator_3.xml",
-    "java/res/anim/circle_loader_animation_interpolator_4.xml",
-    "java/res/anim/circle_loader_animation_interpolator_5.xml",
-    "java/res/anim/circle_loader_animation_interpolator_6.xml",
-    "java/res/anim/circle_loader_animation_interpolator_7.xml",
-    "java/res/anim/circle_loader_animation_interpolator_8.xml",
-    "java/res/anim/circle_loader_circleblue_animation.xml",
-    "java/res/anim/circle_loader_circlegreen_animation.xml",
-    "java/res/anim/circle_loader_circlered_animation.xml",
-    "java/res/anim/circle_loader_circleyellow_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_2_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_3_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_4_animation.xml",
-    "java/res/anim/circle_loader_ellipse_path_5_animation.xml",
     "java/res/drawable-night/ble.xml",
-    "java/res/drawable-night/error_icon.xml",
     "java/res/drawable/ble.xml",
-    "java/res/drawable/circle_loader.xml",
-    "java/res/drawable/circle_loader_animation.xml",
-    "java/res/drawable/error_icon.xml",
-    "java/res/drawable/header.xml",
-    "java/res/drawable/ic_lock_googblue_48dp.xml",
     "java/res/drawable/usb_conn_disconnect.xml",
     "java/res/layout-sw600dp/cablev2_ble_enable.xml",
-    "java/res/layout-sw600dp/cablev2_error.xml",
-    "java/res/layout-sw600dp/cablev2_serverlink.xml",
     "java/res/layout/cablev2_ble_enable.xml",
-    "java/res/layout/cablev2_error.xml",
-    "java/res/layout/cablev2_qr_dialog.xml",
-    "java/res/layout/cablev2_qr_scan.xml",
-    "java/res/layout/cablev2_serverlink.xml",
+    "java/res/layout/cablev2_qr.xml",
     "java/res/layout/cablev2_usb_attached.xml",
     "java/res/values/attrs.xml",
-    "java/res/values/styles.xml",
   ]
   deps = [ "//chrome/android:chrome_app_java_resources" ]
 }
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index c587025d8e5..f92f90bdf32 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -56,7 +56,6 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetBridge.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetMediator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetMetricsRecorder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetProperties.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetViewBinder.java",
@@ -100,6 +99,7 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewBinder.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PromoCodeAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutProperties.java",
@@ -129,6 +129,7 @@ android_resources("java_resources") {
     "java/res/layout/keyboard_accessory_sheet_tab_legacy_title.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_option_toggle.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_password_info.xml",
+    "java/res/layout/keyboard_accessory_sheet_tab_promo_code_info.xml",
     "java/res/layout/keyboard_accessory_sheet_tab_title.xml",
     "java/res/layout/keyboard_accessory_suggestion.xml",
     "java/res/layout/keyboard_accessory_tabs.xml",
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index a8852c93601..97a2622fb64 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -28,12 +28,9 @@ android_resources("java_resources") {
     "java/res/drawable-xxhdpi/ic_home.png",
     "java/res/drawable-xxxhdpi/ic_explore.png",
     "java/res/drawable-xxxhdpi/ic_home.png",
-    "java/res/layout/feed_placeholder_layout.xml",
     "java/res/layout/ss_bottom_bar_layout.xml",
     "java/res/layout/ss_explore_button.xml",
     "java/res/layout/ss_home_button.xml",
-    "java/res/values-night/colors.xml",
-    "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
     "java/res/values/ids.xml",
   ]
@@ -53,7 +50,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
     "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/FeedPlaceholderLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
     "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
@@ -72,6 +68,7 @@ android_library("java") {
     "//chrome/android/feed:chrome_feed_java_resources",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/browser_controls/android:java",
+    "//chrome/browser/feed/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/lens:java",
     "//chrome/browser/preferences:java",
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index d13f34aee45..7eb4997474b 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -30,6 +30,7 @@ android_resources("java_resources") {
     "java/res/anim/iph_touch_point_background_animation.xml",
     "java/res/color/dark_text_color_list.xml",
     "java/res/drawable-v21/fake_search_box_bg_incognito.xml",
+    "java/res/drawable/chevron_right.xml",
     "java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
     "java/res/drawable/hovered_tab_grid_card_background.xml",
     "java/res/drawable/ic_add_alert_blue.xml",
@@ -45,6 +46,7 @@ android_resources("java_resources") {
     "java/res/drawable/price_card_scrim.xml",
     "java/res/drawable/selected_tab_background.xml",
     "java/res/drawable/selected_tab_background_incognito.xml",
+    "java/res/drawable/single_tab_background.xml",
     "java/res/drawable/tab_grid_card_background.xml",
     "java/res/drawable/tab_grid_dialog_background.xml",
     "java/res/drawable/tab_grid_selection_list_icon.xml",
@@ -79,8 +81,6 @@ android_resources("java_resources") {
     "java/res/layout/tab_selection_editor_toolbar.xml",
     "java/res/layout/tab_strip_item.xml",
     "java/res/layout/tasks_view_layout.xml",
-    "java/res/values-night/dimens.xml",
-    "java/res/values-night/styles.xml",
     "java/res/values/attrs.xml",
     "java/res/values/colors.xml",
     "java/res/values/dimens.xml",
@@ -235,10 +235,12 @@ android_library("java") {
     "//components/site_engagement/content/android:java",
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
+    "//net/android:net_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:material_design_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+    "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/androidx:androidx_core_core_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
     "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
index c27d929e484..22414b4db3e 100644
--- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -425,6 +425,20 @@
         Get notified when prices drop
       </message>
 
+      <!-- Price Drop Notification strings -->
+      <message name="IDS_PRICE_DROP_NOTIFICATION_CONTENT_TITLE" desc="This text shows on the price drop notification. It tells users how much price drop on the corresponding product.">
+        <ph name="PRICE_DROP">%1$s<ex>$100</ex></ph> price drop on <ph name="PRODUCT_NAME">%2$s<ex>Chromebook</ex></ph>
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_CONTENT_TEXT" desc="This text shows on the price drop notification below the content title. It tells users the current price of the product and the source website.">
+        Now <ph name="CURRENT_PRICE">%1$s<ex>$799</ex></ph> on <ph name="SOURCE_WEBSITE">%2$s<ex>amazon.com</ex></ph>
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_ACTION_VISIT_SITE" desc="This text shows when users swipe down the price drop notification. When users click this button, we send them to the source website.">
+        Visit site
+      </message>
+      <message name="IDS_PRICE_DROP_NOTIFICATION_ACTION_TURN_OFF_ALERT" desc="This text shows when users swipe down the price drop notification. When users click this button, we won't send price drop notifications on this product to them any more.">
+        Turn off alert
+      </message>
+
       <!-- Merchant Viewer strings -->
       <message name="IDS_MERCHANT_VIEWER_MESSAGE_TITLE" desc="Message shown when merchant trust signals are available.">
         View store info?
@@ -457,6 +471,30 @@
       <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_TITLE" desc="Bottom sheet title for the merchant viewer experience.">
         Google | About this store
       </message>
+      <message name="IDS_MERCHANT_VIEWER_OMNIBOX_ICON_IPH" desc="IPH shown when merchant trust message is dismissed at the first time.">
+        View store info
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_TITLE" desc="The title of the Store info row in Trusted Surface.">
+        Store info
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_DESCRIPTION_WITH_NO_REVIEW" desc="The description of the Store info row in Trusted Surface for sites with ratings but no reviews.">
+        (store rating)
+      </message>
+      <message name="IDS_PAGE_INFO_STORE_INFO_DESCRIPTION_WITH_NO_RATING" desc="The description of the Store info row in Trusted Surface for sites with return policy but no ratings.">
+        See return policy and more
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_DESCRIPTION" desc="The content description of the merchant viewer bottom sheet.">
+        Information about this store
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_OPENED_HALF" desc="Accessibility string read when the merchant viewer bottom sheet is opened at half height. The sheet will occupy up to half the screen.">
+        Information about this store opened at half height
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_OPENED_FULL" desc="Accessibility string read when the merchant viewer bottom sheet is opened at full height. The sheet will occupy up to full screen.">
+        Information about this store opened at full height
+      </message>
+      <message name="IDS_MERCHANT_VIEWER_PREVIEW_SHEET_CLOSED" desc="Accessibility string read when the merchant viewer bottom sheet is closed.">
+        Information about this store closed
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index bd5556e6dbb..77aa17ecfc1 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -79,6 +79,7 @@ android_library("java") {
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
+    "//chrome/browser/ui/android/omnibox:util_java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/modaldialog/android:java",
diff --git a/chromium/chrome/android/feed/BUILD.gn b/chromium/chrome/android/feed/BUILD.gn
index 12cedac3999..df4f603333f 100644
--- a/chromium/chrome/android/feed/BUILD.gn
+++ b/chromium/chrome/android/feed/BUILD.gn
@@ -8,12 +8,9 @@ import("//components/feed/features.gni")
 
 android_resources("chrome_feed_java_resources") {
   sources = [
-    "core/java/res/drawable/feed_text_ripple_drawable_dark.xml",
-    "core/java/res/drawable/feed_text_ripple_drawable_light.xml",
     "core/java/res/layout/feed_spinner.xml",
     "core/java/res/layout/following_empty_state.xml",
-    "core/java/res/layout/no_connection.xml",
-    "core/java/res/layout/no_content_v2.xml",
+    "core/java/res/values-night/colors.xml",
     "core/java/res/values/attrs.xml",
     "core/java/res/values/colors.xml",
     "core/java/res/values/dimens.xml",
diff --git a/chromium/chrome/android/feed/feed_java_sources.gni b/chromium/chrome/android/feed/feed_java_sources.gni
index 5e1af6a5645..d5cd8a2ebe8 100644
--- a/chromium/chrome/android/feed/feed_java_sources.gni
+++ b/chromium/chrome/android/feed/feed_java_sources.gni
@@ -20,34 +20,28 @@ feed_deps = [
 ]
 
 feed_java_sources = [
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedIPHDelegate.java",
+  "//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/FeedSurfaceTracker.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSwipeRefreshLayout.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/HeaderIphScrollListener.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/NtpListContentManager.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/Header.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/stream/NonDismissibleHeader.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/v2/CardMenuBottomSheetContent.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedPersistentKeyValueCache.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/FeedSliceViewTracker.java",
   "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStream.java",
-  "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/NativeViewListRenderer.java",
 ]
 
 feed_srcjar_deps = []
@@ -57,15 +51,11 @@ feed_junit_test_java_sources = [
   "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/FeedSliceViewTrackerTest.java",
   "junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamTest.java",
-  "junit/src/org/chromium/chrome/browser/feed/v2/NativeViewListRendererTest.java",
-  "junit/src/org/chromium/chrome/browser/feed/v2/NtpListContentManagerTest.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/HeaderIphScrollListenerTest.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",
diff --git a/chromium/chrome/android/java_sources.gni b/chromium/chrome/android/java_sources.gni
index 5d622d46a53..7409ba746b6 100644
--- a/chromium/chrome/android/java_sources.gni
+++ b/chromium/chrome/android/java_sources.gni
@@ -16,7 +16,6 @@ import("//chrome/android/feed/feed_java_sources.gni")
 import("//chrome/browser/commerce/price_tracking/android/test_java_sources.gni")
 import(
     "//chrome/browser/commerce/subscriptions/test/android/test_java_sources.gni")
-import("//chrome/browser/feed/android/web_feed_java_sources.gni")
 import("//chrome/browser/share/android/test_java_sources.gni")
 import("//chrome/common/features.gni")
 import("//components/feed/features.gni")
@@ -42,6 +41,7 @@ chrome_test_java_sources += start_surface_test_java_sources
 chrome_junit_test_java_sources += start_surface_junit_java_sources
 chrome_junit_test_java_sources += tab_management_junit_java_sources
 chrome_test_java_sources += omnibox_test_java_sources
+chrome_junit_test_java_sources += price_tracking_junit_test_java_sources
 chrome_test_java_sources += price_tracking_test_java_sources
 chrome_test_java_sources += tab_management_test_java_sources
 chrome_test_java_sources += share_test_java_sources
diff --git a/chromium/chrome/android/monochrome/BUILD.gn b/chromium/chrome/android/monochrome/BUILD.gn
index 33da3618826..982aa3eaae3 100644
--- a/chromium/chrome/android/monochrome/BUILD.gn
+++ b/chromium/chrome/android/monochrome/BUILD.gn
@@ -2,22 +2,59 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/android/config.gni")
 import("//build/config/python.gni")
+import("//testing/test.gni")
 
+# A script that can be used to run the tests locally.
+# TODO(agrieve): Figure out how to have the script test used directly by bots.
+script_test("monochrome_public_apk_checker_runner") {
+  script = "scripts/monochrome_python_tests.py"
+  args = [
+    "--chrome-apk",
+    "apks/ChromePublic.apk",
+    "--chrome-pathmap",
+    "apks/ChromePublic.apk.pathmap.txt",
+    "--system-webview-apk",
+    "apks/SystemWebView.apk",
+    "--system-webview-pathmap",
+    "apks/SystemWebView.apk.pathmap.txt",
+    "--monochrome-apk",
+    "apks/MonochromePublic.apk",
+    "--monochrome-pathmap",
+    "apks/MonochromePublic.apk.pathmap.txt",
+  ]
+  data_deps = [ ":monochrome_public_apk_checker" ]
+}
+
+# The target currently referenced by the bot configs.
 python_library("monochrome_public_apk_checker") {
   testonly = true
   pydeps_file =
       "//chrome/android/monochrome/scripts/monochrome_python_tests.pydeps"
   data_deps = [
+    ":monochrome_python_tests_py",
     "//android_webview:system_webview_apk",
+    "//chrome/android:chrome_public_apk",
+    "//chrome/android:monochrome_public_apk",
+  ]
+}
+
+# Separate target so that it can be shared with downstream.
+python_library("monochrome_python_tests_py") {
+  testonly = true
+  pydeps_file = "scripts/monochrome_python_tests.pydeps"
+  data = [
+    "${android_sdk_build_tools}/aapt2",
+    "${android_sdk_build_tools}/dexdump",
+  ]
+  data_deps = [
     "//build/android:devil_chromium_py",
 
     # Depending on logdog_wrapper here is a hack to allow all isolated scripts
     # to be wrapped, otherwise some python dependencies are missing, since
     # this target doesn't depend on test_runner_py like others
     "//build/android:logdog_wrapper_py",
-    "//chrome/android:chrome_public_apk",
-    "//chrome/android:monochrome_public_apk",
     "//testing:run_isolated_script_test",
   ]
 }
diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni
index d0de6918f12..5a97c2f5b2b 100644
--- a/chromium/chrome/android/trichrome.gni
+++ b/chromium/chrome/android/trichrome.gni
@@ -35,6 +35,7 @@ trichrome_jinja_variables = [
   "trichrome_library=$trichrome_library_package",
   "trichrome_certdigest=$trichrome_certdigest",
   "use32bitAbi=android:use32bitAbi=\"true\"",
+  "zygote_preload_class=org.chromium.chrome.app.TrichromeZygotePreload",
 ]
 
 trichrome_synchronized_proguard =
diff --git a/chromium/chrome/android/webapk/libs/client/BUILD.gn b/chromium/chrome/android/webapk/libs/client/BUILD.gn
index b581b6ddffb..d3e133074fb 100644
--- a/chromium/chrome/android/webapk/libs/client/BUILD.gn
+++ b/chromium/chrome/android/webapk/libs/client/BUILD.gn
@@ -8,7 +8,6 @@ import("//chrome/android/webapk/shell_apk/request_update_for_version.gni")
 
 android_library("client_java") {
   sources = [
-    "src/org/chromium/webapk/lib/client/DexOptimizer.java",
     "src/org/chromium/webapk/lib/client/WebApkIdentityServiceClient.java",
     "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java",
     "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java",
@@ -25,10 +24,7 @@ android_library("client_java") {
 
 java_cpp_template("runtime_library_version_java") {
   sources = [ "src/org/chromium/webapk/lib/client/WebApkVersion.template" ]
-  defines = [
-    "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version",
-    "REQUEST_UPDATE_FOR_SHELL_APK_VERSION_VALUE=$request_update_for_shell_apk_version",
-  ]
+  defines = [ "REQUEST_UPDATE_FOR_SHELL_APK_VERSION_VALUE=$request_update_for_shell_apk_version" ]
 }
 
 junit_binary("webapk_client_junit_tests") {
diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
index c2b1dce0597..7142e72c09a 100644
--- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
@@ -374,7 +374,6 @@ android_library("shell_apk_javatests") {
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/junit",
   ]
-  srcjar_deps = [ "javatests/dex_optimizer:dex_optimizer_service_aidl" ]
 }
 
 junit_binary("webapk_shell_apk_junit_tests") {
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 679b28b3fdd..6d254425298 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 = 142
+current_shell_apk_version = 145
diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
index 19e4427bdf4..182d06d0a0a 100644
--- a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
@@ -4,12 +4,6 @@
 
 import("//build/config/android/rules.gni")
 
-android_aidl("dex_optimizer_service_aidl") {
-  interface_file =
-      "src/org/chromium/webapk/shell_apk/test/dex_optimizer/common.aidl"
-  sources = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/IDexOptimizerService.aidl" ]
-}
-
 android_apk("dex_optimizer_apk") {
   # Used as an additional_apk in test scripts.
   never_incremental = true
@@ -21,12 +15,9 @@ android_apk("dex_optimizer_apk") {
   android_manifest = "AndroidManifest.xml"
   apk_name = "DexOptimizer"
   chromium_code = false
-  sources = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java" ]
+  sources = []
   deps = [
-    "//base:base_java",
-    "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/shell_apk/javatests/canary_lib:canary_dex2_assets",
     "//chrome/android/webapk/shell_apk/javatests/canary_lib:canary_dex_assets",
   ]
-  srcjar_deps = [ ":dex_optimizer_service_aidl" ]
 }
diff --git a/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni b/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni
index 4db0b9cdc20..96bb8aafaf4 100644
--- a/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni
+++ b/chromium/chrome/android/webapk/shell_apk/request_update_for_version.gni
@@ -6,4 +6,4 @@
 # if the WebAPK's ShellAPK version is less than
 # |request_update_for_shell_apk_version|. The version should be incremented
 # after a new ShellAPK has been uploaded to the WebAPK Minting Server.
-request_update_for_shell_apk_version = 135
+request_update_for_shell_apk_version = 144