BASELINE: Update Chromium to 84.0.4147.141

Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-06 12:48:11 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-10-13 09:33:43 +0000
commit: 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch)
tree: fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/chrome/android
parent: 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff)
download: qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz
48 files changed, 662 insertions, 844 deletions
diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn
index 38fbea8a47e..2e9596b4a61 100644
--- a/chromium/chrome/android/BUILD.gn
+++ b/chromium/chrome/android/BUILD.gn
@@ -35,6 +35,17 @@ import("java_sources.gni")
 import("static_initializers.gni")
 import("trichrome.gni")
 
+_default_package = "org.chromium.chrome"
+if (android_channel != "default") {
+  # android-binary-size trybot may checks if an internal Chrome variant's
+  # AndroidManifest is as expected by ensuring the differences between its
+  # AndroidManifest and its upstream target's .AndroidManifest.expected file
+  # are as expected. Upstream targets having a "org.chromium.chrome" package
+  # name will cause the comparison to output many unnecessary differences.
+  # See https://source.chromium.org/chromium/chromium/src/+/master:chrome/android/java/README.md
+  _default_package += "." + android_channel
+}
+
 declare_args() {
   # Android package name to use when compiling the public chrome targets
   # (chrome_modern_public_apk, monochrome_public_apk, etc. as well as the
@@ -43,7 +54,7 @@ declare_args() {
   # WebView providers which declare one of a handful of package names. See
   # https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name
   # for details.
-  chrome_public_manifest_package = "org.chromium.chrome"
+  chrome_public_manifest_package = _default_package
 }
 chrome_public_test_manifest_package = "org.chromium.chrome.tests"
 
@@ -75,12 +86,24 @@ chrome_jni_registration_header =
     "$root_build_dir/gen/chrome/browser/android/chrome_jni_registration.h"
 chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
 
+# Chosen to match what CQ bots exist.
+_enable_libs_and_assets_verification =
+    !is_component_build &&
+    ((target_cpu == "arm" && android_channel == "stable") ||
+     (target_cpu == "arm64" && android_channel == "default"))
+
+# Having //clank present causes different flags because of how play services
+# is wired up.
+# The channel is required because manifest entries vary based on channel.
+_enable_manifest_verification =
+    !enable_chrome_android_internal && android_channel == "stable"
+
 jinja_template("chrome_public_android_manifest") {
   input = "java/AndroidManifest.xml"
   output = chrome_public_android_manifest
   variables = chrome_public_jinja_variables
   variables += [
-    "min_sdk_version=19",
+    "min_sdk_version=21",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -149,20 +172,10 @@ android_resources("chrome_app_java_resources") {
     "//chrome/android/java/res_chromium/drawable-xxxhdpi/fre_product_logo.png",
     "//chrome/android/java/res_chromium/drawable-xxxhdpi/product_logo_name.png",
     "//chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-hdpi/app_shortcut_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-hdpi/app_single_page_icon.png",
     "//chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-mdpi/app_shortcut_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-mdpi/app_single_page_icon.png",
     "//chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xhdpi/app_single_page_icon.png",
     "//chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xxhdpi/app_single_page_icon.png",
     "//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png",
-    "//chrome/android/java/res_chromium/mipmap-xxxhdpi/app_single_page_icon.png",
     "//chrome/android/java/res_chromium/values/channel_constants.xml",
   ]
 
@@ -275,11 +288,12 @@ android_library("chrome_java") {
     "$google_play_services_package:google_play_services_vision_java",
     "//base:base_java",
     "//base:jni_java",
-    "//chrome/android/features/cablev2_authenticator:public_java",
     "//chrome/android/features/keyboard_accessory:public_java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library:piet_resources",
+    "//chrome/android/modules/cablev2_authenticator/public:java",
     "//chrome/android/modules/image_editor/provider:java",
     "//chrome/android/modules/image_editor/public:java",
+    "//chrome/android/modules/stack_unwinder/provider:java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
@@ -289,25 +303,29 @@ android_library("chrome_java") {
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/android/thin_webview:factory_java",
     "//chrome/browser/android/thin_webview:java",
+    "//chrome/browser/download/android:factory_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/download/android:java_resources",
+    "//chrome/browser/enterprise/util:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/image_editor/public:java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/notifications/chime/android:java",
+    "//chrome/browser/offline_pages/android:java",
     "//chrome/browser/optimization_guide/android:java",
     "//chrome/browser/performance_hints/android:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/settings:java",
     "//chrome/browser/share/android:java_resources",
+    "//chrome/browser/tab:java",
     "//chrome/browser/thumbnail:java",
+    "//chrome/browser/ui:infobar_android_enums_java",
     "//chrome/browser/ui/android/appmenu:factory_java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/android/native_page:java",
     "//chrome/browser/ui/messages/android:java",
-    "//chrome/browser/upboarding:java",
     "//chrome/browser/util:java",
     "//chrome/browser/xsurface:java",
     "//components/autofill/android:autofill_java",
@@ -315,13 +333,16 @@ android_library("chrome_java") {
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/browser_ui/android/bottomsheet:java",
     "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/notifications/android:java",
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/site_settings/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/util/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/content_capture/android:java",
+    "//components/content_settings/android:content_settings_enums_java",
     "//components/content_settings/android:java",
     "//components/contextual_search/content/common/mojom:mojom_java",
     "//components/crash/android:java",
@@ -334,6 +355,7 @@ android_library("chrome_java") {
     "//components/download/public/common:public_java",
     "//components/download/public/task:public_java",
     "//components/embedder_support/android:application_java",
+    "//components/embedder_support/android:browser_context_java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:context_menu_java",
     "//components/embedder_support/android:util_java",
@@ -363,6 +385,7 @@ android_library("chrome_java") {
     "//components/payments/mojom:mojom_java",
     "//components/permissions/android:java",
     "//components/policy/android:policy_java",
+    "//components/query_tiles:java",
     "//components/safe_browsing/android:safe_browsing_java",
     "//components/schema_org/common:mojom_java",
     "//components/search_engines/android:java",
@@ -380,6 +403,7 @@ android_library("chrome_java") {
     "//components/version_info/android:version_constants_java",
     "//components/viz/common:common_java",
     "//components/viz/service:service_java",
+    "//components/webrtc/android:java",
     "//content/public/android:content_java",
     "//device/gamepad:java",
     "//media/base/android:media_java",
@@ -407,22 +431,20 @@ android_library("chrome_java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
+    "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_customview_customview_java",
+    "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
-
-    # TODO(bjoyce): Change to AndroidX materials after
-    # ClearBrowsingDataTabsFramgent.java is converted to AndroidX.
-    "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
@@ -438,7 +460,6 @@ android_library("chrome_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/google_android_play_core:com_google_android_play_core_java",
-    "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
     "//ui/base/mojom:mojom_java",
     "//ui/gfx/geometry/mojom:mojom_java",
@@ -458,13 +479,9 @@ android_library("chrome_java") {
     ":sync_user_settings_enums_java",
     ":vr_build_config",
     "//chrome:assist_ranker_prediction_enum_javagen",
-    "//chrome:content_setting_javagen",
     "//chrome:context_menu_image_format_enum_javagen",
-    "//chrome:cookie_controls_mode_javagen",
-    "//chrome:download_enum_javagen",
     "//chrome:instant_apps_reasons_enum_javagen",
     "//chrome:offline_pages_enum_javagen",
-    "//chrome:page_info_connection_type_javagen",
     "//chrome:partner_bookmarks_javagen",
     "//chrome:payments_journey_logger_enum_javagen",
     "//chrome:quick_action_category_enum_javagen",
@@ -473,8 +490,6 @@ android_library("chrome_java") {
     "//chrome/browser:sharing_send_message_result_generated_enum",
     "//chrome/browser/notifications/scheduler/public:jni_enums",
     "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar",
-    "//chrome/browser/ui:cookie_controls_enforcement_javagen",
-    "//chrome/browser/ui:tab_model_enums_java",
     "//chrome/browser/updates/announcement_notification:jni_enums",
     "//components/autofill_assistant/browser:autofill_assistant_enums_java",
     "//components/browsing_data/core:browsing_data_utils_java",
@@ -485,7 +500,6 @@ android_library("chrome_java") {
     "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
     "//components/ntp_tiles:ntp_tiles_enums_java",
     "//components/offline_pages/core:offline_page_model_enums_java",
-    "//components/page_info:page_info_action_javagen",
     "//components/password_manager/core/browser:password_manager_java_enums_srcjar",
     "//components/payments/content/android:method_strings_generated_srcjar",
     "//components/search_engines:search_engine_type_java",
@@ -495,8 +509,6 @@ android_library("chrome_java") {
     "//net:effective_connection_type_java",
   ]
 
-  android_manifest_for_lint = chrome_public_android_manifest
-
   # From java_sources.gni.
   sources = chrome_java_sources + [
               app_hooks_impl,
@@ -542,6 +554,9 @@ android_library("chrome_java") {
   # TODO(crbug/1022172): Instead of adding source files, add it as a separate
   # dependency when circular deps is resolved.
   sources += share_java_sources
+
+  # This is added to speed-up compile time.
+  skip_jetify = true
 }
 
 generate_product_config_srcjar("chrome_product_config") {
@@ -553,11 +568,11 @@ generate_product_config_srcjar("chrome_product_config") {
 java_group("chrome_all_java") {
   deps = [
     ":chrome_java",
-    "//chrome/android/features/cablev2_authenticator:internal_java",
     "//chrome/android/features/keyboard_accessory:internal_java",
     "//chrome/android/features/media_router:java",
-    "//chrome/android/features/test_dummy/internal:base_module_java",
     "//chrome/android/modules/extra_icu/provider:java",
+    "//chrome/browser/download/internal/android:java",
+    "//chrome/browser/test_dummy/internal:base_module_java",
     "//chrome/browser/touch_to_fill/android/internal:java",
     "//chrome/browser/ui/android/appmenu/internal:java",
   ]
@@ -588,10 +603,10 @@ group("jni_headers") {
   public_deps = [
     ":chrome_jni_headers",
     "//chrome/android/features/autofill_assistant:jni_headers",
-    "//chrome/android/features/cablev2_authenticator/internal:jni_headers",
     "//chrome/android/features/keyboard_accessory:jni_headers",
     "//chrome/android/features/media_router:jni_headers",
     "//chrome/browser/download/android:jni_headers",
+    "//chrome/browser/enterprise/util:jni_headers",
     "//chrome/browser/flags:jni_headers",
     "//chrome/browser/image_fetcher:jni_headers",
     "//chrome/browser/performance_hints/android:jni_headers",
@@ -599,6 +614,7 @@ group("jni_headers") {
     "//chrome/browser/profiles/android:jni_headers",
     "//chrome/browser/touch_to_fill/android:jni_headers",
     "//chrome/browser/ui/android/favicon:jni_headers",
+    "//chrome/browser/ui/messages/android:jni_headers",
     "//chrome/browser/util:jni_headers",
   ]
 }
@@ -617,7 +633,6 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
   sources = [
     "//chrome/browser/android/chrome_session_state.h",
     "//chrome/browser/android/customtabs/detached_resource_request.h",
-    "//chrome/browser/android/digital_asset_links/digital_asset_links_handler.h",
     "//chrome/browser/android/explore_sites/explore_sites_bridge.h",
     "//chrome/browser/android/explore_sites/explore_sites_feature.h",
     "//chrome/browser/android/feedback/connectivity_checker.cc",
@@ -630,13 +645,13 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
     "//chrome/browser/android/webapps/add_to_homescreen_params.h",
     "//chrome/browser/banners/app_banner_settings_helper.h",
     "//chrome/browser/download/android/download_open_source.h",
+    "//chrome/browser/installable/digital_asset_links/digital_asset_links_handler.h",
     "//chrome/browser/notifications/notification_channels_provider_android.h",
     "//chrome/browser/notifications/notification_handler.h",
     "//chrome/browser/notifications/notification_platform_bridge_android.cc",
     "//chrome/browser/ntp_snippets/ntp_snippets_metrics.h",
     "//chrome/browser/profiles/profile_metrics.h",
     "//chrome/browser/translate/android/translate_utils.h",
-    "//chrome/browser/ui/android/infobars/infobar_android.h",
   ]
 }
 
@@ -655,11 +670,6 @@ java_cpp_enum("sync_user_settings_enums_java") {
   sources = [ "//components/sync/driver/sync_user_settings.h" ]
 }
 
-# TODO(crbug.com/1041473): Remove this when all usages are migrated.
-java_group("chrome_android_java_switches") {
-  deps = [ "//chrome/browser/flags:java" ]
-}
-
 proto_java_library("partner_location_descriptor_proto_java") {
   proto_path = "java/src/org/chromium/chrome/browser/omnibox/geo"
   sources = [ "$proto_path/partner_location_descriptor.proto" ]
@@ -694,6 +704,7 @@ junit_binary("chrome_junit_tests") {
   # From java_sources.gni.
   sources = chrome_junit_test_java_sources
 
+  # Should not have any deps native targets since junit tests are java-only.
   assert_no_deps = [
     "//content",
     "//mojo/public/mojom/base",
@@ -794,6 +805,7 @@ android_library("chrome_test_util_java") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/android:content_java",
@@ -818,6 +830,7 @@ android_library("chrome_test_java") {
     ":browser_java_test_support",
     ":chrome_app_java_resources",
     ":chrome_test_util_java",
+    ":native_java_unittests_java",
     ":partner_location_descriptor_proto_java",
     "$google_play_services_package:google_play_services_base_java",
     "$google_play_services_package:google_play_services_basement_java",
@@ -829,6 +842,7 @@ android_library("chrome_test_java") {
     "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//base:jni_java",
     "//base/test:test_support_java",
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
@@ -842,6 +856,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/android/metrics:ukm_java_test_support",
     "//chrome/browser/android/metrics:ukm_javatests",
     "//chrome/browser/download/android:java",
+    "//chrome/browser/enterprise/util:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/performance_hints/android:java",
@@ -849,14 +864,15 @@ android_library("chrome_test_java") {
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/settings:java",
     "//chrome/browser/settings:javatests",
+    "//chrome/browser/tab:java",
     "//chrome/browser/thumbnail:java",
     "//chrome/browser/thumbnail:javatests",
     "//chrome/browser/ui/android/appmenu:java",
-    "//chrome/browser/ui/android/appmenu:test_support_java",
+    "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/messages/android:java",
-    "//chrome/browser/upboarding/query_tiles:query_tiles_javatests",
     "//chrome/browser/util:java",
+    "//chrome/test:sync_integration_test_support_java",
     "//chrome/test/android:chrome_java_test_support",
     "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
     "//components/autofill/android:autofill_java",
@@ -864,9 +880,11 @@ android_library("chrome_test_java") {
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/background_task_scheduler/internal:background_task_scheduler_javatests",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/browser_ui/android/bottomsheet:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/modaldialog/android:javatests",
     "//components/browser_ui/settings/android:java",
+    "//components/browser_ui/site_settings/android:javatests",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/util/android:java",
     "//components/browser_ui/widget/android:java",
@@ -879,11 +897,13 @@ android_library("chrome_test_java") {
     "//components/download/internal/common:internal_java",
     "//components/download/network:network_java",
     "//components/download/public/common:public_java",
+    "//components/embedder_support/android:browser_context_java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:util_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/embedder_support/android:web_contents_delegate_javatests",
     "//components/external_intents/android:java",
+    "//components/external_intents/android:javatests",
     "//components/feature_engagement:feature_engagement_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
@@ -905,6 +925,8 @@ android_library("chrome_test_java") {
     "//components/permissions/android:java",
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
+    "//components/query_tiles:public_java",
+    "//components/query_tiles:test_support_java",
     "//components/safe_browsing/android:safe_browsing_java",
     "//components/schema_org/common:mojom_java",
     "//components/search_engines/android:java",
@@ -941,7 +963,12 @@ android_library("chrome_test_java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+
+    # TODO (bjoyce): Remove recyclerview_v7 when espresso tests are migrated
+    # to androidx.
+    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_sdk:android_test_mock_java",
@@ -956,7 +983,6 @@ android_library("chrome_test_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/espresso:espresso_all_java",
     "//third_party/hamcrest:hamcrest_java",
-    "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
@@ -977,6 +1003,7 @@ android_library("chrome_test_java") {
     "//chrome/test/data/autofill/",
     "//chrome/test/data/background_sync/",
     "//chrome/test/data/banners/",
+    "//chrome/test/data/dom_distiller/",
     "//chrome/test/data/browsing_data/",
     "//chrome/test/data/encoding_tests/auto_detect/Big5_with_no_encoding_specified.html",
     "//chrome/test/data/geolocation/",
@@ -1036,6 +1063,8 @@ if (enable_vr || enable_arcore) {
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
     "//chrome/android/features/vr:java",
+    "//chrome/browser/tab:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/embedder_support/android:util_java",
@@ -1195,20 +1224,10 @@ android_resources("chrome_public_apk_resources") {
     "java/res_chromium/drawable-xxxhdpi/fre_product_logo.png",
     "java/res_chromium/drawable-xxxhdpi/product_logo_name.png",
     "java/res_chromium/mipmap-hdpi/app_icon.png",
-    "java/res_chromium/mipmap-hdpi/app_shortcut_icon.png",
-    "java/res_chromium/mipmap-hdpi/app_single_page_icon.png",
     "java/res_chromium/mipmap-mdpi/app_icon.png",
-    "java/res_chromium/mipmap-mdpi/app_shortcut_icon.png",
-    "java/res_chromium/mipmap-mdpi/app_single_page_icon.png",
     "java/res_chromium/mipmap-xhdpi/app_icon.png",
-    "java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png",
-    "java/res_chromium/mipmap-xhdpi/app_single_page_icon.png",
     "java/res_chromium/mipmap-xxhdpi/app_icon.png",
-    "java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png",
-    "java/res_chromium/mipmap-xxhdpi/app_single_page_icon.png",
     "java/res_chromium/mipmap-xxxhdpi/app_icon.png",
-    "java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png",
-    "java/res_chromium/mipmap-xxxhdpi/app_single_page_icon.png",
     "java/res_chromium/values/channel_constants.xml",
   ]
 
@@ -1668,6 +1687,7 @@ android_library("browser_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
     "//components/offline_items_collection/core:core_java",
     "//components/sync/protocol:protocol_java",
     "//content/public/android:content_java",
@@ -1725,6 +1745,11 @@ template("chrome_public_apk_or_module_tmpl") {
                              "is_modern",
                              "target_type",
                              "enable_multidex",
+
+                             # TODO(crbug.com/1076896): remove
+                             # "disable_library_rename" when we remove chrome
+                             # public apk.
+                             "disable_library_rename",
                            ])
     deps = _chrome_public_shared_deps
     if (_is_bundle_module) {
@@ -1760,6 +1785,9 @@ chrome_public_apk_or_module_tmpl("chrome_public_apk") {
   target_type = "android_apk"
   apk_name = "ChromePublic"
   enable_multidex = is_java_debug
+  if (android_64bit_target_cpu) {
+    disable_library_rename = true
+  }
 }
 
 android_resource_sizes_test("resource_sizes_chrome_public_apk") {
@@ -1789,7 +1817,6 @@ android_library("monochrome_java") {
   ]
   sources =
       [ "java/src/org/chromium/chrome/browser/MonochromeApplication.java" ]
-  min_sdk_version = 24
 }
 
 # Defines a target that derives from the monochrome public application. This
@@ -1866,8 +1893,6 @@ template("monochrome_public_apk_or_module_tmpl") {
                            [
                              "apk_name",
                              "bundle_target",
-                             "failed_manifest_expectation_file",
-                             "failed_proguard_expectation_file",
                              "include_32_bit_webview",
                              "include_64_bit_webview",
                              "is_64_bit_browser",
@@ -1929,47 +1954,48 @@ if (public_android_sdk) {
   }
 }
 
-if (define_upstream_webview_targets) {
-  trichrome_library_apk_tmpl("trichrome_library_apk") {
-    apk_name = "TrichromeLibrary"
-    android_manifest = trichrome_library_android_manifest
-    android_manifest_dep = ":trichrome_library_android_manifest"
+trichrome_library_apk_tmpl("trichrome_library_apk") {
+  apk_name = "TrichromeLibrary"
+  android_manifest = trichrome_library_android_manifest
+  android_manifest_dep = ":trichrome_library_android_manifest"
 
-    if (android_64bit_target_cpu) {
-      is_64_bit_browser = false
-      include_64_bit_webview = true
-    }
+  if (android_64bit_target_cpu) {
+    is_64_bit_browser = false
+    include_64_bit_webview = true
+  }
 
-    if (trichrome_synchronized_proguard) {
-      webview_target = "//android_webview:trichrome_webview_apk"
-      chrome_target = ":trichrome_chrome_bundle"
-    }
+  if (trichrome_synchronized_proguard) {
+    webview_target = "//android_webview:trichrome_webview_apk"
+    chrome_target = ":trichrome_chrome_bundle"
   }
 
-  if (android_64bit_target_cpu) {
-    trichrome_library_apk_tmpl("trichrome_library_32_apk") {
-      apk_name = "TrichromeLibrary32"
-      android_manifest = trichrome_library_32_android_manifest
-      android_manifest_dep = ":trichrome_library_32_android_manifest"
-      is_64_bit_browser = false
-      include_64_bit_webview = false
-    }
+  verify_manifest = _enable_manifest_verification
+  verify_native_libs_and_assets = _enable_libs_and_assets_verification
+}
 
-    trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
-      apk_name = "TrichromeLibrary6432"
-      android_manifest = trichrome_library_64_32_android_manifest
-      android_manifest_dep = ":trichrome_library_64_32_android_manifest"
-      is_64_bit_browser = true
-      include_32_bit_webview = true
-    }
+if (android_64bit_target_cpu) {
+  trichrome_library_apk_tmpl("trichrome_library_32_apk") {
+    apk_name = "TrichromeLibrary32"
+    android_manifest = trichrome_library_32_android_manifest
+    android_manifest_dep = ":trichrome_library_32_android_manifest"
+    is_64_bit_browser = false
+    include_64_bit_webview = false
+  }
+
+  trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
+    apk_name = "TrichromeLibrary6432"
+    android_manifest = trichrome_library_64_32_android_manifest
+    android_manifest_dep = ":trichrome_library_64_32_android_manifest"
+    is_64_bit_browser = true
+    include_32_bit_webview = true
+  }
 
-    trichrome_library_apk_tmpl("trichrome_library_64_apk") {
-      apk_name = "TrichromeLibrary64"
-      android_manifest = trichrome_library_64_android_manifest
-      android_manifest_dep = ":trichrome_library_64_android_manifest"
-      is_64_bit_browser = true
-      include_32_bit_webview = false
-    }
+  trichrome_library_apk_tmpl("trichrome_library_64_apk") {
+    apk_name = "TrichromeLibrary64"
+    android_manifest = trichrome_library_64_android_manifest
+    android_manifest_dep = ":trichrome_library_64_android_manifest"
+    is_64_bit_browser = true
+    include_32_bit_webview = false
   }
 }
 
@@ -1996,7 +2022,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=19",
+    "min_sdk_version=21",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -2007,7 +2033,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=19",
+    "min_sdk_version=21",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -2046,6 +2072,7 @@ template("chrome_test_apk_tmpl") {
                              "android_manifest",
                              "android_manifest_dep",
                              "data_deps",
+                             "enable_lint",
                              "shared_libraries",
                            ])
 
@@ -2131,6 +2158,7 @@ template("monochrome_test_apk_tmpl") {
 }
 
 chrome_test_apk_tmpl("chrome_public_test_apk") {
+  enable_lint = true
   apk_name = "ChromePublicTest"
   android_manifest = chrome_public_test_apk_manifest
   android_manifest_dep = ":chrome_public_test_apk_manifest"
@@ -2148,7 +2176,6 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/subresource_filter:subresource_filter_javatests",
     "//chrome/browser/touch_to_fill/android:test_java",
     "//chrome/browser/ui/android/appmenu/internal:javatests",
-    "//chrome/browser/ui/android/favicon:javatests",
     "//chrome/browser/ui/messages/android:javatests",
     "//chrome/browser/util:javatests",
   ]
@@ -2383,9 +2410,9 @@ if (public_android_sdk) {
   if (defined(expected_static_initializer_count)) {
     action_with_pydeps("monochrome_static_initializers") {
       script = "//build/android/gyp/assert_static_initializers.py"
-      inputs = [ "$root_build_dir/apks/MonochromePublic.apk" ]
+      inputs = [ "$root_build_dir/apks/MonochromePublic.aab" ]
       outputs = [ "$target_gen_dir/$target_name.stamp" ]
-      deps = [ ":monochrome_public_apk" ]
+      deps = [ ":monochrome_public_bundle" ]
       args = [
         "--expected-count=$expected_static_initializer_count",
         "--tool-prefix",
@@ -2444,6 +2471,8 @@ chrome_bundle("chrome_modern_public_bundle") {
   min_sdk_version = 21
   module_descs = chrome_modern_module_descs
   version_code = chrome_modern_version_code
+
+  verify_native_libs_and_assets = _enable_libs_and_assets_verification
 }
 
 if (is_official_build) {
@@ -2524,20 +2553,12 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
                              "static_library_synchronized_proguard",
                              "resource_ids_provider_dep",
                              "use_trichrome_library",
+                             "verify_manifest",
                            ])
     target_type = "android_app_bundle_module"
     is_base_module = true
     version_code = _version_code
 
-    if (defined(invoker.verify_android_configuration) &&
-        invoker.verify_android_configuration) {
-      verify_manifest = true
-      if (check_android_configuration) {
-        failed_manifest_expectation_file =
-            "monochrome_public_bundle.android_manifest.failed"
-      }
-    }
-
     if (!_is_trichrome ||
         !defined(invoker.static_library_synchronized_proguard) ||
         !invoker.static_library_synchronized_proguard) {
@@ -2553,6 +2574,8 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
                              "is_64_bit_browser",
                              "static_library_provider",
                              "static_library_synchronized_proguard",
+                             "verify_native_libs_and_assets",
+                             "verify_proguard_flags",
                            ])
     base_module_target = ":$_base_module_target_name"
     bundle_name = _bundle_name
@@ -2564,14 +2587,6 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
 
     if (!is_java_debug) {
       proguard_android_sdk_dep = webview_framework_dep
-      if (defined(invoker.verify_android_configuration) &&
-          invoker.verify_android_configuration) {
-        verify_proguard_flags = true
-        if (check_android_configuration) {
-          failed_proguard_expectation_file =
-              "monochrome_public_bundle.proguard_flags.failed"
-        }
-      }
     }
   }
 }
@@ -2587,11 +2602,10 @@ if (public_android_sdk) {
       include_64_bit_webview = true
     }
 
-    # Having //clank present causes different flags because of how play services
-    # is wired up.
-    # The channel is required because manifest entries vary based on channel.
-    if (!enable_chrome_android_internal && android_channel == "stable") {
-      verify_android_configuration = true
+    verify_manifest = _enable_manifest_verification
+    verify_native_libs_and_assets = _enable_libs_and_assets_verification
+    if (!is_java_debug) {
+      verify_proguard_flags = _enable_manifest_verification
     }
   }
 
@@ -2622,6 +2636,9 @@ if (public_android_sdk) {
       is_64_bit_browser = false
       include_64_bit_webview = true
     }
+
+    verify_manifest = _enable_manifest_verification
+    verify_native_libs_and_assets = _enable_libs_and_assets_verification
   }
 
   if (android_64bit_target_cpu) {
@@ -2705,7 +2722,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
-    "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
     "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
     "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java",
     "java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java",
@@ -2737,6 +2753,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java",
     "java/src/org/chromium/chrome/browser/consent_auditor/ConsentAuditorBridge.java",
     "java/src/org/chromium/chrome/browser/content/ContentUtils.java",
+    "java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java",
     "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java",
     "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java",
     "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java",
@@ -2757,7 +2774,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerUIUtils.java",
     "java/src/org/chromium/chrome/browser/download/DownloadController.java",
     "java/src/org/chromium/chrome/browser/download/DownloadItem.java",
-    "java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.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/home/rename/RenameUtils.java",
@@ -2786,13 +2802,11 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/infobar/AdsBlockedInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
-    "java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBarDelegate.java",
     "java/src/org/chromium/chrome/browser/infobar/DownloadProgressInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/FramebustBlockInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java",
-    "java/src/org/chromium/chrome/browser/infobar/InfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java",
     "java/src/org/chromium/chrome/browser/infobar/InstallableAmbientBadgeInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/InstantAppsInfoBar.java",
@@ -2808,7 +2822,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBar.java",
-    "java/src/org/chromium/chrome/browser/infobar/SimpleConfirmInfoBarBuilder.java",
     "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
     "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
@@ -2822,7 +2835,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/login/ChromeHttpAuthHandler.java",
     "java/src/org/chromium/chrome/browser/media/MediaCaptureDevicesDispatcherAndroid.java",
     "java/src/org/chromium/chrome/browser/media/PictureInPictureActivity.java",
-    "java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java",
     "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
     "java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
     "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
@@ -2860,7 +2872,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/offlinepages/prefetch/OfflineNotificationBackgroundTask.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/offlinepages/prefetch/PrefetchConfiguration.java",
     "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchNotificationServiceBridge.java",
     "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchedPagesNotifier.java",
     "java/src/org/chromium/chrome/browser/omaha/notification/UpdateNotificationServiceBridge.java",
@@ -2869,8 +2880,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java",
     "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java",
     "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java",
-    "java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java",
-    "java/src/org/chromium/chrome/browser/page_info/PageInfoController.java",
     "java/src/org/chromium/chrome/browser/paint_preview/services/PaintPreviewDemoService.java",
     "java/src/org/chromium/chrome/browser/paint_preview/services/PaintPreviewDemoServiceFactory.java",
     "java/src/org/chromium/chrome/browser/paint_preview/services/PaintPreviewTabService.java",
@@ -2891,7 +2900,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java",
     "java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEditingBridge.java",
     "java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUIView.java",
-    "java/src/org/chromium/chrome/browser/permissions/ChromePermissionsClient.java",
     "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
     "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
     "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
@@ -2929,16 +2937,13 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/signin/UnifiedConsentServiceBridge.java",
     "java/src/org/chromium/chrome/browser/site_settings/CookieControlsBridge.java",
     "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
-    "java/src/org/chromium/chrome/browser/site_settings/WebsitePreferenceBridge.java",
     "java/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBar.java",
-    "java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java",
     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
     "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporterBridge.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
     "java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java",
     "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
-    "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java",
     "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
     "java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
     "java/src/org/chromium/chrome/browser/tab/TabImpl.java",
@@ -2963,6 +2968,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java",
     "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenInstaller.java",
     "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenMediator.java",
+    "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java",
   ]
 
   # Used for testing only, should not be shipped to end users.
@@ -2994,6 +3000,29 @@ generate_jni("chrome_jni_headers") {
   }
 }
 
+native_java_unittests_tests = [
+  "native_java_unittests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediatorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteResultUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessorTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionProcessorTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/tiles/TileSuggestionProcessorUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/CachedZeroSuggestionsManagerUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreUnitTest.java",
+  "native_java_unittests/src/org/chromium/chrome/browser/toolbar/ToolbarSecurityIconTest.java",
+]
+
 android_library("native_java_unittests_java") {
   testonly = true
   deps = [
@@ -3006,21 +3035,26 @@ android_library("native_java_unittests_java") {
     "//base/test:test_support_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/flags:java",
+    "//chrome/browser/image_fetcher:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/embedder_support/android:context_menu_java",
     "//components/embedder_support/android:util_java",
     "//components/omnibox/browser:browser_java",
     "//components/payments/content/android:java",
+    "//components/query_tiles:java",
+    "//components/search_engines/android:java",
     "//components/security_state/content/android:java",
     "//components/security_state/core:security_state_enums_java",
     "//content/public/android:content_java",
     "//content/public/test/android:android_test_message_pump_support_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
-    "//third_party/jsr-305:jsr_305_javalib",
+    "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
     "//ui/android:ui_java",
@@ -3028,20 +3062,14 @@ android_library("native_java_unittests_java") {
     "//url:gurl_java",
     "//url/mojom:url_mojom_gurl_java",
   ]
+
   sources = [
     "native_java_unittests/src/org/chromium/chrome/browser/UnitTestUtils.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/toolbar/ToolbarSecurityIconTest.java",
+    "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionBuilderForTest.java",
   ]
 
+  sources += native_java_unittests_tests
+
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
@@ -3049,17 +3077,6 @@ android_library("native_java_unittests_java") {
 # can't put 'java' in the name here.
 generate_jni("native_j_unittests_jni_headers") {
   testonly = true
-  sources = [
-    "native_java_unittests/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulatorTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/installedapp/InstalledAppProviderTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizationsUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreUnitTest.java",
-    "native_java_unittests/src/org/chromium/chrome/browser/toolbar/ToolbarSecurityIconTest.java",
-  ]
+  sources = native_java_unittests_tests
   feature_list_file = "//chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java"
 }
diff --git a/chromium/chrome/android/chrome_java_resources.gni b/chromium/chrome/android/chrome_java_resources.gni
index 8afab38a2a3..bd5a1b199e6 100644
--- a/chromium/chrome/android/chrome_java_resources.gni
+++ b/chromium/chrome/android/chrome_java_resources.gni
@@ -22,7 +22,6 @@ chrome_java_resources = [
   "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/tint_on_blue_bg.xml",
   "java/res/color/toolbar_icon_tint_dark.xml",
   "java/res/color/white_mode_tint.xml",
   "java/res/drawable-hdpi-v21/navigation_bubble_shadow.9.png",
@@ -68,11 +67,8 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/google_play.png",
   "java/res/drawable-hdpi/help_outline.png",
   "java/res/drawable-hdpi/ic_account_child_20dp.png",
-  "java/res/drawable-hdpi/ic_bluetooth_searching_black_24dp.png",
   "java/res/drawable-hdpi/ic_chrome.png",
   "java/res/drawable-hdpi/ic_close_all_tabs.png",
-  "java/res/drawable-hdpi/ic_content_paste_grey600_24dp.png",
-  "java/res/drawable-hdpi/ic_delete_white_24dp.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",
@@ -104,15 +100,10 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/ic_place_googblue_36dp.png",
   "java/res/drawable-hdpi/ic_play_arrow_white_24dp.png",
   "java/res/drawable-hdpi/ic_play_arrow_white_36dp.png",
-  "java/res/drawable-hdpi/ic_refresh_white_24dp.png",
-  "java/res/drawable-hdpi/ic_refresh_white_36dp.png",
   "java/res/drawable-hdpi/ic_share_white_24dp.png",
   "java/res/drawable-hdpi/ic_skip_next_white_36dp.png",
   "java/res/drawable-hdpi/ic_skip_previous_white_36dp.png",
-  "java/res/drawable-hdpi/ic_stop_white_36dp.png",
   "java/res/drawable-hdpi/ic_suggestion_magnifier.png",
-  "java/res/drawable-hdpi/ic_videocam_white_24dp.png",
-  "java/res/drawable-hdpi/ic_volume_up_grey600_24dp.png",
   "java/res/drawable-hdpi/ic_warning_white_24dp.png",
   "java/res/drawable-hdpi/ic_watch_later_24dp.png",
   "java/res/drawable-hdpi/incognito_simple.png",
@@ -121,7 +112,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/incognito_switch.png",
   "java/res/drawable-hdpi/infobar_blocked_popups.png",
   "java/res/drawable-hdpi/infobar_chrome.png",
-  "java/res/drawable-hdpi/infobar_downloading.png",
   "java/res/drawable-hdpi/infobar_mobile_friendly.png",
   "java/res/drawable-hdpi/infobar_restore.png",
   "java/res/drawable-hdpi/infobar_screen_share.png",
@@ -133,37 +123,20 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/mc_card.png",
   "java/res/drawable-hdpi/menu_update.png",
   "java/res/drawable-hdpi/modern_location_bar.9.png",
-  "java/res/drawable-hdpi/modern_toolbar_shadow.png",
   "java/res/drawable-hdpi/offline_pin.png",
   "java/res/drawable-hdpi/open_in_new_tab.png",
   "java/res/drawable-hdpi/overlay_side_shadow.9.png",
-  "java/res/drawable-hdpi/permission_background_sync.png",
-  "java/res/drawable-hdpi/permission_javascript.png",
-  "java/res/drawable-hdpi/permission_mic.png",
-  "java/res/drawable-hdpi/permission_midi.png",
-  "java/res/drawable-hdpi/permission_popups.png",
-  "java/res/drawable-hdpi/permission_protected_media.png",
-  "java/res/drawable-hdpi/permission_push_notification.png",
   "java/res/drawable-hdpi/permission_push_notification_off.png",
-  "java/res/drawable-hdpi/plus.png",
   "java/res/drawable-hdpi/popup_bg_bottom.9.png",
   "java/res/drawable-hdpi/preview_pin_round.png",
   "java/res/drawable-hdpi/print.png",
   "java/res/drawable-hdpi/progress_bar_background.9.png",
   "java/res/drawable-hdpi/progress_bar_foreground.9.png",
-  "java/res/drawable-hdpi/qr_code.png",
   "java/res/drawable-hdpi/reader_mode_prefs_icon.png",
   "java/res/drawable-hdpi/sad_tab.png",
   "java/res/drawable-hdpi/safetytip_shield.png",
-  "java/res/drawable-hdpi/screenshot.png",
-  "java/res/drawable-hdpi/send_tab.png",
-  "java/res/drawable-hdpi/settings_all_sites.png",
   "java/res/drawable-hdpi/settings_cog.png",
-  "java/res/drawable-hdpi/settings_sensors.png",
-  "java/res/drawable-hdpi/settings_storage.png",
-  "java/res/drawable-hdpi/settings_usb.png",
   "java/res/drawable-hdpi/shared_clipboard_40dp.png",
-  "java/res/drawable-hdpi/sharing_more.png",
   "java/res/drawable-hdpi/shortcut_incognito.png",
   "java/res/drawable-hdpi/shortcut_newtab.png",
   "java/res/drawable-hdpi/spinner.png",
@@ -181,9 +154,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/top_round.9.png",
   "java/res/drawable-hdpi/unionpay_card.png",
   "java/res/drawable-hdpi/verify_checkmark.png",
-  "java/res/drawable-hdpi/web_asset.png",
-  "java/res/drawable-hdpi/webrtc_audio.png",
-  "java/res/drawable-hdpi/webrtc_video.png",
   "java/res/drawable-ldrtl-hdpi-v17/btn_suggestion_refine.png",
   "java/res/drawable-ldrtl-hdpi-v17/btn_tabstrip_new_incognito_tab_normal.png",
   "java/res/drawable-ldrtl-hdpi-v17/btn_tabstrip_new_tab_pressed.png",
@@ -260,11 +230,8 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/google_play.png",
   "java/res/drawable-mdpi/help_outline.png",
   "java/res/drawable-mdpi/ic_account_child_20dp.png",
-  "java/res/drawable-mdpi/ic_bluetooth_searching_black_24dp.png",
   "java/res/drawable-mdpi/ic_chrome.png",
   "java/res/drawable-mdpi/ic_close_all_tabs.png",
-  "java/res/drawable-mdpi/ic_content_paste_grey600_24dp.png",
-  "java/res/drawable-mdpi/ic_delete_white_24dp.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",
@@ -296,15 +263,10 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/ic_place_googblue_36dp.png",
   "java/res/drawable-mdpi/ic_play_arrow_white_24dp.png",
   "java/res/drawable-mdpi/ic_play_arrow_white_36dp.png",
-  "java/res/drawable-mdpi/ic_refresh_white_24dp.png",
-  "java/res/drawable-mdpi/ic_refresh_white_36dp.png",
   "java/res/drawable-mdpi/ic_share_white_24dp.png",
   "java/res/drawable-mdpi/ic_skip_next_white_36dp.png",
   "java/res/drawable-mdpi/ic_skip_previous_white_36dp.png",
-  "java/res/drawable-mdpi/ic_stop_white_36dp.png",
   "java/res/drawable-mdpi/ic_suggestion_magnifier.png",
-  "java/res/drawable-mdpi/ic_videocam_white_24dp.png",
-  "java/res/drawable-mdpi/ic_volume_up_grey600_24dp.png",
   "java/res/drawable-mdpi/ic_warning_white_24dp.png",
   "java/res/drawable-mdpi/ic_watch_later_24dp.png",
   "java/res/drawable-mdpi/incognito_simple.png",
@@ -313,7 +275,6 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/incognito_switch.png",
   "java/res/drawable-mdpi/infobar_blocked_popups.png",
   "java/res/drawable-mdpi/infobar_chrome.png",
-  "java/res/drawable-mdpi/infobar_downloading.png",
   "java/res/drawable-mdpi/infobar_mobile_friendly.png",
   "java/res/drawable-mdpi/infobar_restore.png",
   "java/res/drawable-mdpi/infobar_screen_share.png",
@@ -325,37 +286,20 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/mc_card.png",
   "java/res/drawable-mdpi/menu_update.png",
   "java/res/drawable-mdpi/modern_location_bar.9.png",
-  "java/res/drawable-mdpi/modern_toolbar_shadow.png",
   "java/res/drawable-mdpi/offline_pin.png",
   "java/res/drawable-mdpi/open_in_new_tab.png",
   "java/res/drawable-mdpi/overlay_side_shadow.9.png",
-  "java/res/drawable-mdpi/permission_background_sync.png",
-  "java/res/drawable-mdpi/permission_javascript.png",
-  "java/res/drawable-mdpi/permission_mic.png",
-  "java/res/drawable-mdpi/permission_midi.png",
-  "java/res/drawable-mdpi/permission_popups.png",
-  "java/res/drawable-mdpi/permission_protected_media.png",
-  "java/res/drawable-mdpi/permission_push_notification.png",
   "java/res/drawable-mdpi/permission_push_notification_off.png",
-  "java/res/drawable-mdpi/plus.png",
   "java/res/drawable-mdpi/popup_bg_bottom.9.png",
   "java/res/drawable-mdpi/preview_pin_round.png",
   "java/res/drawable-mdpi/print.png",
   "java/res/drawable-mdpi/progress_bar_background.9.png",
   "java/res/drawable-mdpi/progress_bar_foreground.9.png",
-  "java/res/drawable-mdpi/qr_code.png",
   "java/res/drawable-mdpi/reader_mode_prefs_icon.png",
   "java/res/drawable-mdpi/sad_tab.png",
   "java/res/drawable-mdpi/safetytip_shield.png",
-  "java/res/drawable-mdpi/screenshot.png",
-  "java/res/drawable-mdpi/send_tab.png",
-  "java/res/drawable-mdpi/settings_all_sites.png",
   "java/res/drawable-mdpi/settings_cog.png",
-  "java/res/drawable-mdpi/settings_sensors.png",
-  "java/res/drawable-mdpi/settings_storage.png",
-  "java/res/drawable-mdpi/settings_usb.png",
   "java/res/drawable-mdpi/shared_clipboard_40dp.png",
-  "java/res/drawable-mdpi/sharing_more.png",
   "java/res/drawable-mdpi/shortcut_incognito.png",
   "java/res/drawable-mdpi/shortcut_newtab.png",
   "java/res/drawable-mdpi/spinner.png",
@@ -373,14 +317,12 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/top_round.9.png",
   "java/res/drawable-mdpi/unionpay_card.png",
   "java/res/drawable-mdpi/verify_checkmark.png",
-  "java/res/drawable-mdpi/web_asset.png",
-  "java/res/drawable-mdpi/webrtc_audio.png",
-  "java/res/drawable-mdpi/webrtc_video.png",
   "java/res/drawable-night-hdpi/top_round.9.png",
   "java/res/drawable-night-mdpi/top_round.9.png",
   "java/res/drawable-night-xhdpi/top_round.9.png",
   "java/res/drawable-night-xxhdpi/top_round.9.png",
   "java/res/drawable-night-xxxhdpi/top_round.9.png",
+  "java/res/drawable-night/homepage_promo_illustration_vector.xml",
   "java/res/drawable-nodpi/bookmark_widget_preview.png",
   "java/res/drawable-nodpi/widget_preview.png",
   "java/res/drawable-sw600dp-hdpi/google_logo.png",
@@ -445,11 +387,8 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/google_play.png",
   "java/res/drawable-xhdpi/help_outline.png",
   "java/res/drawable-xhdpi/ic_account_child_20dp.png",
-  "java/res/drawable-xhdpi/ic_bluetooth_searching_black_24dp.png",
   "java/res/drawable-xhdpi/ic_chrome.png",
   "java/res/drawable-xhdpi/ic_close_all_tabs.png",
-  "java/res/drawable-xhdpi/ic_content_paste_grey600_24dp.png",
-  "java/res/drawable-xhdpi/ic_delete_white_24dp.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",
@@ -481,15 +420,10 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/ic_place_googblue_36dp.png",
   "java/res/drawable-xhdpi/ic_play_arrow_white_24dp.png",
   "java/res/drawable-xhdpi/ic_play_arrow_white_36dp.png",
-  "java/res/drawable-xhdpi/ic_refresh_white_24dp.png",
-  "java/res/drawable-xhdpi/ic_refresh_white_36dp.png",
   "java/res/drawable-xhdpi/ic_share_white_24dp.png",
   "java/res/drawable-xhdpi/ic_skip_next_white_36dp.png",
   "java/res/drawable-xhdpi/ic_skip_previous_white_36dp.png",
-  "java/res/drawable-xhdpi/ic_stop_white_36dp.png",
   "java/res/drawable-xhdpi/ic_suggestion_magnifier.png",
-  "java/res/drawable-xhdpi/ic_videocam_white_24dp.png",
-  "java/res/drawable-xhdpi/ic_volume_up_grey600_24dp.png",
   "java/res/drawable-xhdpi/ic_warning_white_24dp.png",
   "java/res/drawable-xhdpi/ic_watch_later_24dp.png",
   "java/res/drawable-xhdpi/incognito_simple.png",
@@ -498,7 +432,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/incognito_switch.png",
   "java/res/drawable-xhdpi/infobar_blocked_popups.png",
   "java/res/drawable-xhdpi/infobar_chrome.png",
-  "java/res/drawable-xhdpi/infobar_downloading.png",
   "java/res/drawable-xhdpi/infobar_mobile_friendly.png",
   "java/res/drawable-xhdpi/infobar_restore.png",
   "java/res/drawable-xhdpi/infobar_screen_share.png",
@@ -510,37 +443,20 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/mc_card.png",
   "java/res/drawable-xhdpi/menu_update.png",
   "java/res/drawable-xhdpi/modern_location_bar.9.png",
-  "java/res/drawable-xhdpi/modern_toolbar_shadow.png",
   "java/res/drawable-xhdpi/offline_pin.png",
   "java/res/drawable-xhdpi/open_in_new_tab.png",
   "java/res/drawable-xhdpi/overlay_side_shadow.9.png",
-  "java/res/drawable-xhdpi/permission_background_sync.png",
-  "java/res/drawable-xhdpi/permission_javascript.png",
-  "java/res/drawable-xhdpi/permission_mic.png",
-  "java/res/drawable-xhdpi/permission_midi.png",
-  "java/res/drawable-xhdpi/permission_popups.png",
-  "java/res/drawable-xhdpi/permission_protected_media.png",
-  "java/res/drawable-xhdpi/permission_push_notification.png",
   "java/res/drawable-xhdpi/permission_push_notification_off.png",
-  "java/res/drawable-xhdpi/plus.png",
   "java/res/drawable-xhdpi/popup_bg_bottom.9.png",
   "java/res/drawable-xhdpi/preview_pin_round.png",
   "java/res/drawable-xhdpi/print.png",
   "java/res/drawable-xhdpi/progress_bar_background.9.png",
   "java/res/drawable-xhdpi/progress_bar_foreground.9.png",
-  "java/res/drawable-xhdpi/qr_code.png",
   "java/res/drawable-xhdpi/reader_mode_prefs_icon.png",
   "java/res/drawable-xhdpi/sad_tab.png",
   "java/res/drawable-xhdpi/safetytip_shield.png",
-  "java/res/drawable-xhdpi/screenshot.png",
-  "java/res/drawable-xhdpi/send_tab.png",
-  "java/res/drawable-xhdpi/settings_all_sites.png",
   "java/res/drawable-xhdpi/settings_cog.png",
-  "java/res/drawable-xhdpi/settings_sensors.png",
-  "java/res/drawable-xhdpi/settings_storage.png",
-  "java/res/drawable-xhdpi/settings_usb.png",
   "java/res/drawable-xhdpi/shared_clipboard_40dp.png",
-  "java/res/drawable-xhdpi/sharing_more.png",
   "java/res/drawable-xhdpi/shortcut_incognito.png",
   "java/res/drawable-xhdpi/shortcut_newtab.png",
   "java/res/drawable-xhdpi/spinner.png",
@@ -558,9 +474,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/top_round.9.png",
   "java/res/drawable-xhdpi/unionpay_card.png",
   "java/res/drawable-xhdpi/verify_checkmark.png",
-  "java/res/drawable-xhdpi/web_asset.png",
-  "java/res/drawable-xhdpi/webrtc_audio.png",
-  "java/res/drawable-xhdpi/webrtc_video.png",
   "java/res/drawable-xxhdpi-v21/navigation_bubble_shadow.9.png",
   "java/res/drawable-xxhdpi/amex_card.png",
   "java/res/drawable-xxhdpi/audio_playing.png",
@@ -601,11 +514,8 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/google_play.png",
   "java/res/drawable-xxhdpi/help_outline.png",
   "java/res/drawable-xxhdpi/ic_account_child_20dp.png",
-  "java/res/drawable-xxhdpi/ic_bluetooth_searching_black_24dp.png",
   "java/res/drawable-xxhdpi/ic_chrome.png",
   "java/res/drawable-xxhdpi/ic_close_all_tabs.png",
-  "java/res/drawable-xxhdpi/ic_content_paste_grey600_24dp.png",
-  "java/res/drawable-xxhdpi/ic_delete_white_24dp.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",
@@ -637,15 +547,10 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/ic_place_googblue_36dp.png",
   "java/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png",
   "java/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png",
-  "java/res/drawable-xxhdpi/ic_refresh_white_24dp.png",
-  "java/res/drawable-xxhdpi/ic_refresh_white_36dp.png",
   "java/res/drawable-xxhdpi/ic_share_white_24dp.png",
   "java/res/drawable-xxhdpi/ic_skip_next_white_36dp.png",
   "java/res/drawable-xxhdpi/ic_skip_previous_white_36dp.png",
-  "java/res/drawable-xxhdpi/ic_stop_white_36dp.png",
   "java/res/drawable-xxhdpi/ic_suggestion_magnifier.png",
-  "java/res/drawable-xxhdpi/ic_videocam_white_24dp.png",
-  "java/res/drawable-xxhdpi/ic_volume_up_grey600_24dp.png",
   "java/res/drawable-xxhdpi/ic_warning_white_24dp.png",
   "java/res/drawable-xxhdpi/ic_watch_later_24dp.png",
   "java/res/drawable-xxhdpi/incognito_simple.png",
@@ -654,7 +559,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/incognito_switch.png",
   "java/res/drawable-xxhdpi/infobar_blocked_popups.png",
   "java/res/drawable-xxhdpi/infobar_chrome.png",
-  "java/res/drawable-xxhdpi/infobar_downloading.png",
   "java/res/drawable-xxhdpi/infobar_mobile_friendly.png",
   "java/res/drawable-xxhdpi/infobar_restore.png",
   "java/res/drawable-xxhdpi/infobar_screen_share.png",
@@ -665,37 +569,20 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/mc_card.png",
   "java/res/drawable-xxhdpi/menu_update.png",
   "java/res/drawable-xxhdpi/modern_location_bar.9.png",
-  "java/res/drawable-xxhdpi/modern_toolbar_shadow.png",
   "java/res/drawable-xxhdpi/offline_pin.png",
   "java/res/drawable-xxhdpi/open_in_new_tab.png",
   "java/res/drawable-xxhdpi/overlay_side_shadow.9.png",
-  "java/res/drawable-xxhdpi/permission_background_sync.png",
-  "java/res/drawable-xxhdpi/permission_javascript.png",
-  "java/res/drawable-xxhdpi/permission_mic.png",
-  "java/res/drawable-xxhdpi/permission_midi.png",
-  "java/res/drawable-xxhdpi/permission_popups.png",
-  "java/res/drawable-xxhdpi/permission_protected_media.png",
-  "java/res/drawable-xxhdpi/permission_push_notification.png",
   "java/res/drawable-xxhdpi/permission_push_notification_off.png",
-  "java/res/drawable-xxhdpi/plus.png",
   "java/res/drawable-xxhdpi/popup_bg_bottom.9.png",
   "java/res/drawable-xxhdpi/preview_pin_round.png",
   "java/res/drawable-xxhdpi/print.png",
   "java/res/drawable-xxhdpi/progress_bar_background.9.png",
   "java/res/drawable-xxhdpi/progress_bar_foreground.9.png",
-  "java/res/drawable-xxhdpi/qr_code.png",
   "java/res/drawable-xxhdpi/reader_mode_prefs_icon.png",
   "java/res/drawable-xxhdpi/sad_tab.png",
   "java/res/drawable-xxhdpi/safetytip_shield.png",
-  "java/res/drawable-xxhdpi/screenshot.png",
-  "java/res/drawable-xxhdpi/send_tab.png",
-  "java/res/drawable-xxhdpi/settings_all_sites.png",
   "java/res/drawable-xxhdpi/settings_cog.png",
-  "java/res/drawable-xxhdpi/settings_sensors.png",
-  "java/res/drawable-xxhdpi/settings_storage.png",
-  "java/res/drawable-xxhdpi/settings_usb.png",
   "java/res/drawable-xxhdpi/shared_clipboard_40dp.png",
-  "java/res/drawable-xxhdpi/sharing_more.png",
   "java/res/drawable-xxhdpi/shortcut_incognito.png",
   "java/res/drawable-xxhdpi/shortcut_newtab.png",
   "java/res/drawable-xxhdpi/spinner.png",
@@ -713,9 +600,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/top_round.9.png",
   "java/res/drawable-xxhdpi/unionpay_card.png",
   "java/res/drawable-xxhdpi/verify_checkmark.png",
-  "java/res/drawable-xxhdpi/web_asset.png",
-  "java/res/drawable-xxhdpi/webrtc_audio.png",
-  "java/res/drawable-xxhdpi/webrtc_video.png",
   "java/res/drawable-xxxhdpi-v21/navigation_bubble_shadow.9.png",
   "java/res/drawable-xxxhdpi/amex_card.png",
   "java/res/drawable-xxxhdpi/audio_playing.png",
@@ -756,11 +640,8 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/google_play.png",
   "java/res/drawable-xxxhdpi/help_outline.png",
   "java/res/drawable-xxxhdpi/ic_account_child_20dp.png",
-  "java/res/drawable-xxxhdpi/ic_bluetooth_searching_black_24dp.png",
   "java/res/drawable-xxxhdpi/ic_chrome.png",
   "java/res/drawable-xxxhdpi/ic_close_all_tabs.png",
-  "java/res/drawable-xxxhdpi/ic_content_paste_grey600_24dp.png",
-  "java/res/drawable-xxxhdpi/ic_delete_white_24dp.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",
@@ -790,15 +671,10 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/ic_place_googblue_36dp.png",
   "java/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png",
   "java/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png",
-  "java/res/drawable-xxxhdpi/ic_refresh_white_24dp.png",
-  "java/res/drawable-xxxhdpi/ic_refresh_white_36dp.png",
   "java/res/drawable-xxxhdpi/ic_share_white_24dp.png",
   "java/res/drawable-xxxhdpi/ic_skip_next_white_36dp.png",
   "java/res/drawable-xxxhdpi/ic_skip_previous_white_36dp.png",
-  "java/res/drawable-xxxhdpi/ic_stop_white_36dp.png",
   "java/res/drawable-xxxhdpi/ic_suggestion_magnifier.png",
-  "java/res/drawable-xxxhdpi/ic_videocam_white_24dp.png",
-  "java/res/drawable-xxxhdpi/ic_volume_up_grey600_24dp.png",
   "java/res/drawable-xxxhdpi/ic_warning_white_24dp.png",
   "java/res/drawable-xxxhdpi/ic_watch_later_24dp.png",
   "java/res/drawable-xxxhdpi/incognito_simple.png",
@@ -807,7 +683,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/incognito_switch.png",
   "java/res/drawable-xxxhdpi/infobar_blocked_popups.png",
   "java/res/drawable-xxxhdpi/infobar_chrome.png",
-  "java/res/drawable-xxxhdpi/infobar_downloading.png",
   "java/res/drawable-xxxhdpi/infobar_mobile_friendly.png",
   "java/res/drawable-xxxhdpi/infobar_restore.png",
   "java/res/drawable-xxxhdpi/infobar_screen_share.png",
@@ -820,32 +695,16 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/offline_pin.png",
   "java/res/drawable-xxxhdpi/open_in_new_tab.png",
   "java/res/drawable-xxxhdpi/overlay_side_shadow.9.png",
-  "java/res/drawable-xxxhdpi/permission_background_sync.png",
-  "java/res/drawable-xxxhdpi/permission_javascript.png",
-  "java/res/drawable-xxxhdpi/permission_mic.png",
-  "java/res/drawable-xxxhdpi/permission_midi.png",
-  "java/res/drawable-xxxhdpi/permission_popups.png",
-  "java/res/drawable-xxxhdpi/permission_protected_media.png",
-  "java/res/drawable-xxxhdpi/permission_push_notification.png",
   "java/res/drawable-xxxhdpi/permission_push_notification_off.png",
-  "java/res/drawable-xxxhdpi/plus.png",
   "java/res/drawable-xxxhdpi/popup_bg_bottom.9.png",
   "java/res/drawable-xxxhdpi/preview_pin_round.png",
   "java/res/drawable-xxxhdpi/print.png",
   "java/res/drawable-xxxhdpi/progress_bar_background.9.png",
   "java/res/drawable-xxxhdpi/progress_bar_foreground.9.png",
-  "java/res/drawable-xxxhdpi/qr_code.png",
   "java/res/drawable-xxxhdpi/sad_tab.png",
   "java/res/drawable-xxxhdpi/safetytip_shield.png",
-  "java/res/drawable-xxxhdpi/screenshot.png",
-  "java/res/drawable-xxxhdpi/send_tab.png",
-  "java/res/drawable-xxxhdpi/settings_all_sites.png",
   "java/res/drawable-xxxhdpi/settings_cog.png",
-  "java/res/drawable-xxxhdpi/settings_sensors.png",
-  "java/res/drawable-xxxhdpi/settings_storage.png",
-  "java/res/drawable-xxxhdpi/settings_usb.png",
   "java/res/drawable-xxxhdpi/shared_clipboard_40dp.png",
-  "java/res/drawable-xxxhdpi/sharing_more.png",
   "java/res/drawable-xxxhdpi/shortcut_incognito.png",
   "java/res/drawable-xxxhdpi/shortcut_newtab.png",
   "java/res/drawable-xxxhdpi/spinner.png",
@@ -863,9 +722,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/top_round.9.png",
   "java/res/drawable-xxxhdpi/unionpay_card.png",
   "java/res/drawable-xxxhdpi/verify_checkmark.png",
-  "java/res/drawable-xxxhdpi/web_asset.png",
-  "java/res/drawable-xxxhdpi/webrtc_audio.png",
-  "java/res/drawable-xxxhdpi/webrtc_video.png",
   "java/res/drawable/accessibility_tab_switcher_divider.xml",
   "java/res/drawable/account_picker_background.xml",
   "java/res/drawable/action_bar_activity_bg.xml",
@@ -883,8 +739,6 @@ chrome_java_resources = [
   "java/res/drawable/checkmark_blue.xml",
   "java/res/drawable/circle_white.xml",
   "java/res/drawable/computer_black_24dp.xml",
-  "java/res/drawable/content_suggestions_card_corner_bottom.xml",
-  "java/res/drawable/content_suggestions_card_corner_top.xml",
   "java/res/drawable/contextual_search_promo_background.xml",
   "java/res/drawable/data_reduction_big.xml",
   "java/res/drawable/data_reduction_illustration.xml",
@@ -896,9 +750,11 @@ chrome_java_resources = [
   "java/res/drawable/email.xml",
   "java/res/drawable/explore_sites_dense_tile_background.xml",
   "java/res/drawable/face.xml",
+  "java/res/drawable/fast_forward_message_gradient.xml",
   "java/res/drawable/file_picker_scrim.xml",
   "java/res/drawable/google_pay.xml",
   "java/res/drawable/google_pay_with_divider.xml",
+  "java/res/drawable/homepage_promo_illustration_vector.xml",
   "java/res/drawable/ic_add.xml",
   "java/res/drawable/ic_add_circle_40dp.xml",
   "java/res/drawable/ic_apps_blue_24dp.xml",
@@ -916,11 +772,8 @@ chrome_java_resources = [
   "java/res/drawable/ic_credit_card_black.xml",
   "java/res/drawable/ic_done_googblue_36dp.xml",
   "java/res/drawable/ic_drive_document_24dp.xml",
-  "java/res/drawable/ic_drive_document_36dp.xml",
   "java/res/drawable/ic_drive_file_24dp.xml",
-  "java/res/drawable/ic_drive_file_36dp.xml",
   "java/res/drawable/ic_drive_image_24dp.xml",
-  "java/res/drawable/ic_drive_image_36dp.xml",
   "java/res/drawable/ic_equals_sign_round.xml",
   "java/res/drawable/ic_error.xml",
   "java/res/drawable/ic_error_googred_36dp.xml",
@@ -929,16 +782,12 @@ chrome_java_resources = [
   "java/res/drawable/ic_file_download_36dp.xml",
   "java/res/drawable/ic_fingerprint_grey500_36dp.xml",
   "java/res/drawable/ic_globe_24dp.xml",
-  "java/res/drawable/ic_globe_36dp.xml",
   "java/res/drawable/ic_google_round.xml",
-  "java/res/drawable/ic_help_and_feedback.xml",
   "java/res/drawable/ic_info_outline_grey.xml",
   "java/res/drawable/ic_logo_googleg_20dp.xml",
   "java/res/drawable/ic_loop_round.xml",
   "java/res/drawable/ic_music_note_24dp.xml",
-  "java/res/drawable/ic_music_note_36dp.xml",
   "java/res/drawable/ic_offline_pin_24dp_on_dark_bg.xml",
-  "java/res/drawable/ic_offline_pin_24dp_on_light_bg.xml",
   "java/res/drawable/ic_offline_pin_blue_white.xml",
   "java/res/drawable/ic_offline_pin_white.xml",
   "java/res/drawable/ic_pause_circle_outline_white_24dp.xml",
@@ -961,7 +810,6 @@ chrome_java_resources = [
   "java/res/drawable/ic_toolbar_share_offset_24dp.xml",
   "java/res/drawable/ic_tv_options_input_settings_rotated_grey.xml",
   "java/res/drawable/ic_videocam_24dp.xml",
-  "java/res/drawable/ic_videocam_36dp.xml",
   "java/res/drawable/ic_visibility_black.xml",
   "java/res/drawable/ic_visibility_off_black.xml",
   "java/res/drawable/ic_volume_off_white_24dp.xml",
@@ -978,7 +826,6 @@ chrome_java_resources = [
   "java/res/drawable/infobar_downloading_sweep_animation.xml",
   "java/res/drawable/infobar_wrapper_bg.xml",
   "java/res/drawable/item_chooser_row_background.xml",
-  "java/res/drawable/list_divider_compat.xml",
   "java/res/drawable/logo_avatar_anonymous.xml",
   "java/res/drawable/logo_partly_cloudy.xml",
   "java/res/drawable/logo_translate_round.xml",
@@ -995,12 +842,16 @@ chrome_java_resources = [
   "java/res/drawable/password_manager_onboarding_illustration02_dark_mode.xml",
   "java/res/drawable/password_manager_onboarding_illustration03.xml",
   "java/res/drawable/password_manager_onboarding_illustration03_dark_mode.xml",
-  "java/res/drawable/permission_location.xml",
   "java/res/drawable/popup_bg_bottom_tinted.xml",
+  "java/res/drawable/qr_code.xml",
   "java/res/drawable/rating_bar.xml",
+  "java/res/drawable/screenshot.xml",
   "java/res/drawable/search_sogou.xml",
+  "java/res/drawable/send_tab.xml",
   "java/res/drawable/shared_clipboard_zero_state_dark.xml",
   "java/res/drawable/shared_clipboard_zero_state_light.xml",
+  "java/res/drawable/sharing_more.xml",
+  "java/res/drawable/sharing_print.xml",
   "java/res/drawable/signin_header_animation.xml",
   "java/res/drawable/smartphone_black_24dp.xml",
   "java/res/drawable/store_locally_tooltip_background.xml",
@@ -1035,7 +886,6 @@ chrome_java_resources = [
   "java/res/layout/account_picker_row.xml",
   "java/res/layout/account_picker_row_legacy.xml",
   "java/res/layout/add_languages_main.xml",
-  "java/res/layout/add_site_dialog.xml",
   "java/res/layout/add_to_homescreen_dialog.xml",
   "java/res/layout/auto_sign_in_first_run_dialog.xml",
   "java/res/layout/autofill_billing_address_dropdown.xml",
@@ -1067,20 +917,16 @@ chrome_java_resources = [
   "java/res/layout/bottom_toolbar_menu_button.xml",
   "java/res/layout/bottom_toolbar_tab_switcher.xml",
   "java/res/layout/checkbox_layout.xml",
+  "java/res/layout/clear_browsing_data_button.xml",
   "java/res/layout/clear_browsing_data_tabs.xml",
   "java/res/layout/clear_browsing_important_dialog_listview.xml",
-  "java/res/layout/clear_storage.xml",
   "java/res/layout/compositor_view_holder.xml",
   "java/res/layout/confirm_import_sync_data.xml",
   "java/res/layout/confirm_important_sites_list_row.xml",
-  "java/res/layout/connection_info.xml",
   "java/res/layout/contact_view.xml",
   "java/res/layout/contacts_list_item_view.xml",
   "java/res/layout/contacts_picker_dialog.xml",
   "java/res/layout/contacts_picker_toolbar.xml",
-  "java/res/layout/content_suggestions_action_card_modern.xml",
-  "java/res/layout/content_suggestions_card_modern_reversed.xml",
-  "java/res/layout/content_suggestions_status_card_modern.xml",
   "java/res/layout/contextual_search_bar_banner_text_view.xml",
   "java/res/layout/contextual_search_caption_view.xml",
   "java/res/layout/contextual_search_card_icon_view.xml",
@@ -1126,7 +972,6 @@ chrome_java_resources = [
   "java/res/layout/fake_search_box_layout.xml",
   "java/res/layout/find_in_page.xml",
   "java/res/layout/find_toolbar.xml",
-  "java/res/layout/four_state_cookie_settings_preference.xml",
   "java/res/layout/fre_data_reduction_proxy_lite_mode.xml",
   "java/res/layout/fre_tosanduma.xml",
   "java/res/layout/history_clear_browsing_data_header.xml",
@@ -1165,17 +1010,16 @@ chrome_java_resources = [
   "java/res/layout/navigation_popup_item.xml",
   "java/res/layout/navigation_sheet.xml",
   "java/res/layout/navigation_sheet_toolbar.xml",
-  "java/res/layout/new_tab_page_footer.xml",
   "java/res/layout/new_tab_page_incognito.xml",
   "java/res/layout/new_tab_page_layout.xml",
   "java/res/layout/new_tab_page_offline_card.xml",
-  "java/res/layout/new_tab_page_progress_indicator.xml",
   "java/res/layout/new_tab_page_snippets_expandable_header.xml",
+  "java/res/layout/new_tab_page_snippets_expandable_header_with_menu.xml",
   "java/res/layout/new_tab_page_tile_grid_placeholder.xml",
-  "java/res/layout/new_tab_page_view.xml",
   "java/res/layout/omnibox_answer_suggestion.xml",
   "java/res/layout/omnibox_basic_suggestion.xml",
   "java/res/layout/omnibox_entity_suggestion.xml",
+  "java/res/layout/omnibox_query_tiles_suggestion.xml",
   "java/res/layout/omnibox_results_container.xml",
   "java/res/layout/optional_toolbar_button.xml",
   "java/res/layout/os_version_unsupported_preference.xml",
@@ -1248,7 +1092,6 @@ chrome_java_resources = [
   "java/res/layout/signout_wipe_storage_dialog.xml",
   "java/res/layout/start_top_toolbar.xml",
   "java/res/layout/status_indicator_container.xml",
-  "java/res/layout/storage_preferences_view.xml",
   "java/res/layout/suggestions_site_tile_grid_modern.xml",
   "java/res/layout/suggestions_tile_view.xml",
   "java/res/layout/suggestions_tile_view_condensed.xml",
@@ -1272,7 +1115,6 @@ chrome_java_resources = [
   "java/res/layout/top_view.xml",
   "java/res/layout/translate_menu_item.xml",
   "java/res/layout/translate_menu_item_checked.xml",
-  "java/res/layout/tri_state_site_settings_preference.xml",
   "java/res/layout/update_menu_item.xml",
   "java/res/layout/updating_gms_progress_view.xml",
   "java/res/layout/url_action_container.xml",
@@ -1283,7 +1125,6 @@ chrome_java_resources = [
   "java/res/layout/web_notification_button.xml",
   "java/res/layout/web_notification_icon_frame.xml",
   "java/res/layout/web_notification_small_icon.xml",
-  "java/res/layout/website_features.xml",
   "java/res/menu/bookmark_action_bar_menu.xml",
   "java/res/menu/custom_tabs_menu.xml",
   "java/res/menu/history_manager_menu.xml",
@@ -1293,7 +1134,6 @@ chrome_java_resources = [
   "java/res/menu/password_entry_viewer_action_bar_menu.xml",
   "java/res/menu/prefeditor_editor_menu.xml",
   "java/res/menu/save_password_preferences_action_bar_menu.xml",
-  "java/res/menu/website_preferences_menu.xml",
   "java/res/mipmap-hdpi/shortcut_icon_shadow.png",
   "java/res/mipmap-mdpi/shortcut_icon_shadow.png",
   "java/res/mipmap-xhdpi/shortcut_icon_shadow.png",
@@ -1303,7 +1143,6 @@ chrome_java_resources = [
   "java/res/transition/move_image.xml",
   "java/res/values-hdpi/dimens.xml",
   "java/res/values-large/dimens.xml",
-  "java/res/values-ldrtl/values.xml",
   "java/res/values-night/colors.xml",
   "java/res/values-night/drawables.xml",
   "java/res/values-night/values.xml",
@@ -1339,7 +1178,6 @@ chrome_java_resources = [
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/autofill_server_profile_preferences.xml",
   "java/res/xml/bookmark_widget_info.xml",
-  "java/res/xml/clear_browsing_data_button.xml",
   "java/res/xml/clear_browsing_data_preferences_tab.xml",
   "java/res/xml/contextual_search_preferences.xml",
   "java/res/xml/contextual_search_tap_preferences.xml",
@@ -1347,7 +1185,7 @@ chrome_java_resources = [
   "java/res/xml/data_reduction_preferences_off_lite_mode.xml",
   "java/res/xml/developer_preferences.xml",
   "java/res/xml/do_not_track_preferences.xml",
-  "java/res/xml/download_preferences.xml",
+  "java/res/xml/google_services_preferences.xml",
   "java/res/xml/homepage_preferences.xml",
   "java/res/xml/languages_preferences.xml",
   "java/res/xml/legal_information_preferences.xml",
@@ -1357,10 +1195,7 @@ chrome_java_resources = [
   "java/res/xml/notifications_preferences.xml",
   "java/res/xml/privacy_preferences.xml",
   "java/res/xml/search_widget_info.xml",
-  "java/res/xml/single_website_preferences.xml",
-  "java/res/xml/site_settings_preferences.xml",
   "java/res/xml/sync_and_services_preferences.xml",
   "java/res/xml/theme_preferences.xml",
   "java/res/xml/tracing_preferences.xml",
-  "java/res/xml/website_preferences.xml",
 ]
diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni
index 95b13fbb677..b1b92faadfa 100644
--- a/chromium/chrome/android/chrome_java_sources.gni
+++ b/chromium/chrome/android/chrome_java_sources.gni
@@ -20,7 +20,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
   "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
   "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
-  "java/src/org/chromium/chrome/browser/ChromeCachedFlags.java",
   "java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java",
   "java/src/org/chromium/chrome/browser/ChromeKeyboardVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/ChromeLocalizationUtils.java",
@@ -31,6 +30,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeVersionInfo.java",
   "java/src/org/chromium/chrome/browser/ChromeWindow.java",
   "java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java",
+  "java/src/org/chromium/chrome/browser/DefaultBrowserInfo2.java",
   "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
   "java/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandler.java",
   "java/src/org/chromium/chrome/browser/DevToolsServer.java",
@@ -73,9 +73,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelWrapper.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayout.java",
   "java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuIconRowFooter.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java",
-  "java/src/org/chromium/chrome/browser/appmenu/UpdateMenuItemViewBinder.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/UpdateMenuItemViewBinder.java",
+  "java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java",
+  "java/src/org/chromium/chrome/browser/app/reengagement/ReengagementActivity.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowPrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",
@@ -89,9 +91,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
   "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/Completable.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/DropdownFieldAdapter.java",
-  "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditableOption.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorBase.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialog.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialogToolbar.java",
@@ -121,7 +121,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/settings/CreditCardNumberFormattingTextWatcher.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
-  "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
   "java/src/org/chromium/chrome/browser/background_sync/GooglePlayServicesChecker.java",
   "java/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTask.java",
   "java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java",
@@ -152,7 +151,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java",
-  "java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java",
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetProxy.java",
   "java/src/org/chromium/chrome/browser/bookmarkswidget/BookmarkWidgetService.java",
@@ -175,11 +173,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityUmaRecorder.java",
   "java/src/org/chromium/chrome/browser/browserservices/VerificationResultStore.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
+  "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/LocationPermissionUpdater.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserver.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationPermissionUpdater.java",
+  "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/PermissionUpdater.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionManager.java",
   "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionStore.java",
-  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityCoordinator.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/DisclosureAcceptanceBroadcastReceiver.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/DisclosureUiPicker.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityModel.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaFinishHandler.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TwaIntentHandlingStrategy.java",
@@ -195,7 +196,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/sharing/TwaSharingController.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/TwaSplashController.java",
-  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/TrustedWebActivityDisclosureView.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureInfobar.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureNotification.java",
+  "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureSnackbar.java",
+  "java/src/org/chromium/chrome/browser/browserservices/ui/SharedActivityCoordinator.java",
+  "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/webapps/WebappSplashController.java",
+  "java/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/TrustedWebActivityCoordinator.java",
   "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java",
   "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
@@ -424,13 +430,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabNavigationEventObserver.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabNightModeStateController.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java",
+  "java/src/org/chromium/chrome/browser/customtabs/CustomTabOrientationController.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabSessionHandler.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabStatusBarColorProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionHelper.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTaskDescriptionIconGenerator.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabTopBarDelegate.java",
-  "java/src/org/chromium/chrome/browser/customtabs/CustomTabUmaRecorder.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsClientFileProcessor.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java",
@@ -442,18 +448,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/PaymentHandlerActivity.java",
   "java/src/org/chromium/chrome/browser/customtabs/ReparentingTaskProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity0.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity1.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity2.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity3.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity4.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity5.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity6.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity7.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity8.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity9.java",
-  "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskManagedCustomTabActivity.java",
   "java/src/org/chromium/chrome/browser/customtabs/TranslucentCustomTabActivity.java",
   "java/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityNavigationController.java",
   "java/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityTabController.java",
@@ -517,7 +511,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerUIUtils.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java",
-  "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeTabInfo.java",
   "java/src/org/chromium/chrome/browser/dom_distiller/TabDistillabilityProvider.java",
   "java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadActivity.java",
@@ -528,8 +521,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceObservers.java",
   "java/src/org/chromium/chrome/browser/download/DownloadInfoBarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadItem.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java",
-  "java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java",
   "java/src/org/chromium/chrome/browser/download/DownloadManagerService.java",
   "java/src/org/chromium/chrome/browser/download/DownloadMetrics.java",
   "java/src/org/chromium/chrome/browser/download/DownloadNotificationFactory.java",
@@ -549,16 +540,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/ExploreOfflineStatusProvider.java",
   "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java",
   "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier.java",
-  "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinator.java",
-  "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorFactory.java",
+  "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorFactoryHelper.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorImpl.java",
-  "java/src/org/chromium/chrome/browser/download/home/DownloadManagerUiConfig.java",
   "java/src/org/chromium/chrome/browser/download/home/DownloadManagerUiConfigHelper.java",
-  "java/src/org/chromium/chrome/browser/download/home/FaviconProvider.java",
   "java/src/org/chromium/chrome/browser/download/home/FaviconProviderImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/FileDeletionQueue.java",
-  "java/src/org/chromium/chrome/browser/download/home/JustNowProvider.java",
-  "java/src/org/chromium/chrome/browser/download/home/LegacyDownloadProvider.java",
   "java/src/org/chromium/chrome/browser/download/home/LegacyDownloadProviderImpl.java",
   "java/src/org/chromium/chrome/browser/download/home/OfflineItemSource.java",
   "java/src/org/chromium/chrome/browser/download/home/PrefetchEnabledSupplier.java",
@@ -666,11 +652,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
-  "java/src/org/chromium/chrome/browser/download/settings/DownloadDirectoryAdapter.java",
-  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreference.java",
-  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceAdapter.java",
-  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceDialog.java",
-  "java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java",
   "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardAdapter.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java",
@@ -750,6 +731,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java",
   "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
   "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
+  "java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsMarginSupplier.java",
+  "java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsStateProvider.java",
   "java/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java",
   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java",
@@ -824,7 +807,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/CardDetail.java",
-  "java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBarDelegate.java",
   "java/src/org/chromium/chrome/browser/infobar/DownloadProgressInfoBar.java",
@@ -834,7 +816,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java",
   "java/src/org/chromium/chrome/browser/infobar/IPHBubbleDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupport.java",
-  "java/src/org/chromium/chrome/browser/infobar/InfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java",
   "java/src/org/chromium/chrome/browser/infobar/InfoBarContainerLayout.java",
   "java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java",
@@ -853,7 +834,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBar.java",
-  "java/src/org/chromium/chrome/browser/infobar/SimpleConfirmInfoBarBuilder.java",
   "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java",
   "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
   "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java",
@@ -927,13 +907,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java",
   "java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java",
   "java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
-  "java/src/org/chromium/chrome/browser/metrics/ImpressionTracker.java",
   "java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/MediaNotificationUma.java",
   "java/src/org/chromium/chrome/browser/metrics/MediaSessionUMA.java",
   "java/src/org/chromium/chrome/browser/metrics/OmniboxStartupMetrics.java",
-  "java/src/org/chromium/chrome/browser/metrics/OneShotImpressionListener.java",
   "java/src/org/chromium/chrome/browser/metrics/PackageMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
   "java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java",
@@ -951,7 +929,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/multiwindow/MultiWindowModeStateDispatcher.java",
   "java/src/org/chromium/chrome/browser/multiwindow/MultiWindowModeStateDispatcherImpl.java",
   "java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java",
-  "java/src/org/chromium/chrome/browser/native_page/BrowserControlsMarginSupplier.java",
   "java/src/org/chromium/chrome/browser/native_page/ContextMenuManager.java",
   "java/src/org/chromium/chrome/browser/native_page/NativePageAssassin.java",
   "java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java",
@@ -975,8 +952,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/night_mode/settings/RadioButtonGroupThemePreference.java",
   "java/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragment.java",
   "java/src/org/chromium/chrome/browser/notifications/ActionInfo.java",
-  "java/src/org/chromium/chrome/browser/notifications/ChromeNotification.java",
-  "java/src/org/chromium/chrome/browser/notifications/ChromeNotificationBuilder.java",
   "java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java",
   "java/src/org/chromium/chrome/browser/notifications/ForegroundServiceUtils.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationBuilder.java",
@@ -986,9 +961,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationIntentInterceptor.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationJobService.java",
-  "java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java",
-  "java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxyImpl.java",
-  "java/src/org/chromium/chrome/browser/notifications/NotificationMetadata.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationService.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationSettingsBridge.java",
@@ -996,11 +968,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/notifications/NotificationTriggerBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationTriggerScheduler.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationUmaTracker.java",
-  "java/src/org/chromium/chrome/browser/notifications/PendingIntentProvider.java",
   "java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java",
-  "java/src/org/chromium/chrome/browser/notifications/channels/ChannelDefinitions.java",
-  "java/src/org/chromium/chrome/browser/notifications/channels/ChannelsInitializer.java",
   "java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java",
+  "java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java",
   "java/src/org/chromium/chrome/browser/notifications/channels/SiteChannelsManager.java",
   "java/src/org/chromium/chrome/browser/notifications/scheduler/DisplayAgent.java",
   "java/src/org/chromium/chrome/browser/notifications/scheduler/NotificationSchedulerTask.java",
@@ -1018,9 +988,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPage.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java",
+  "java/src/org/chromium/chrome/browser/ntp/NewTabPageManager.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageUma.java",
-  "java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsExpandableListView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java",
@@ -1032,42 +1002,29 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedTabManager.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/AboveTheFoldItem.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/ChildNode.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/Footer.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/InnerNode.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/ItemViewType.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/Leaf.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerView.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageViewHolder.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/OptionalLeaf.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/PartiallyBindable.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/PersonalizedPromoViewHolder.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/ProgressIndicatorView.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/ProgressItem.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/ProgressViewHolder.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/ScrollToLoadListener.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/StatusCardViewHolder.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/StatusItem.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java",
-  "java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/CategoryInt.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/EmptySuggestionsSource.java",
+  "java/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoController.java",
+  "java/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoSnackbarController.java",
+  "java/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoUtils.java",
+  "java/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoVariationManager.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxChipDelegate.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxProperties.java",
+  "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxViewBinder.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeader.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderView.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SectionHeaderViewHolder.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticleViewHolder.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java",
   "java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java",
-  "java/src/org/chromium/chrome/browser/ntp/snippets/SuggestionsSource.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",
@@ -1093,12 +1050,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridge.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java",
+  "java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/TopSnackbarManager.java",
   "java/src/org/chromium/chrome/browser/offlinepages/indicator/TopSnackbarView.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/OfflineNotificationBackgroundTask.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/offlinepages/prefetch/PrefetchConfiguration.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchNotificationServiceBridge.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchPrefs.java",
   "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchedPagesNotifier.java",
@@ -1173,16 +1130,25 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorImpl.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteDelegate.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteResult.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/CachedZeroSuggestionsManager.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemProcessor.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxQueryTileCoordinator.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestion.java",
-  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionListEmbedder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionUiType.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownDelegate.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownFactory.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsList.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsListAdapter.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsRecyclerView.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsRecyclerViewAdapter.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionCommonProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionListProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionListViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/SuggestionsMetrics.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/UrlBarDelegate.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/VoiceSuggestionProvider.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionViewBinder.java",
@@ -1209,19 +1175,25 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionViewProperties.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderProcessor.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderView.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderViewBinder.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderViewProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/AlignmentManager.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionProcessor.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java",
   "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/tiles/TileSuggestionProcessor.java",
+  "java/src/org/chromium/chrome/browser/omnibox/suggestions/tiles/TileSuggestionProperties.java",
   "java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java",
   "java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java",
-  "java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java",
-  "java/src/org/chromium/chrome/browser/page_info/PageInfoController.java",
-  "java/src/org/chromium/chrome/browser/page_info/PermissionParamsListBuilder.java",
+  "java/src/org/chromium/chrome/browser/page_info/ChromePageInfoControllerDelegate.java",
+  "java/src/org/chromium/chrome/browser/page_info/ChromePermissionParamsListBuilderDelegate.java",
   "java/src/org/chromium/chrome/browser/page_info/SiteSettingsHelper.java",
   "java/src/org/chromium/chrome/browser/paint_preview/PaintPreviewDemoManager.java",
   "java/src/org/chromium/chrome/browser/paint_preview/PaintPreviewExperiments.java",
+  "java/src/org/chromium/chrome/browser/paint_preview/PaintPreviewInitializer.java",
   "java/src/org/chromium/chrome/browser/paint_preview/PaintPreviewTabHelper.java",
   "java/src/org/chromium/chrome/browser/paint_preview/TabbedPaintPreviewPlayer.java",
   "java/src/org/chromium/chrome/browser/paint_preview/services/PaintPreviewDemoService.java",
@@ -1295,13 +1267,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/ContactEditor.java",
   "java/src/org/chromium/chrome/browser/payments/JourneyLogger.java",
   "java/src/org/chromium/chrome/browser/payments/PackageManagerDelegate.java",
-  "java/src/org/chromium/chrome/browser/payments/PayerData.java",
-  "java/src/org/chromium/chrome/browser/payments/PaymentAddressTypeConverter.java",
-  "java/src/org/chromium/chrome/browser/payments/PaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryDelegate.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryInterface.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryParams.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppService.java",
+  "java/src/org/chromium/chrome/browser/payments/PaymentAppServiceBridge.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentManifestVerifier.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentManifestWebDataService.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentPreferencesUtil.java",
@@ -1316,7 +1286,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/SkipToGPayHelper.java",
   "java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java",
   "java/src/org/chromium/chrome/browser/payments/SupportedDelegations.java",
-  "java/src/org/chromium/chrome/browser/payments/UriUtils.java",
+  "java/src/org/chromium/chrome/browser/payments/UrlUtils.java",
   "java/src/org/chromium/chrome/browser/payments/WebPaymentIntentHelperTypeConverter.java",
   "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
   "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
@@ -1345,7 +1315,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/ui/SectionInformation.java",
   "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/ChromePermissionsClient.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
   "java/src/org/chromium/chrome/browser/photo_picker/BitmapScalerTask.java",
   "java/src/org/chromium/chrome/browser/photo_picker/BitmapUtils.java",
@@ -1380,9 +1349,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProviderSuggestionsCursor.java",
   "java/src/org/chromium/chrome/browser/provider/SearchColumns.java",
   "java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java",
+  "java/src/org/chromium/chrome/browser/query_tiles/FakeTileProvider.java",
   "java/src/org/chromium/chrome/browser/query_tiles/QueryTileSection.java",
+  "java/src/org/chromium/chrome/browser/query_tiles/QueryTileUtils.java",
   "java/src/org/chromium/chrome/browser/query_tiles/TileProviderFactory.java",
   "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
+  "java/src/org/chromium/chrome/browser/reengagement/ReengagementNotificationController.java",
   "java/src/org/chromium/chrome/browser/resources/ResourceMapper.java",
   "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
   "java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
@@ -1421,10 +1393,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
   "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java",
   "java/src/org/chromium/chrome/browser/settings/MainSettings.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
-  "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",
+  "java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java",
+  "java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProvider.java",
   "java/src/org/chromium/chrome/browser/share/LensUtils.java",
   "java/src/org/chromium/chrome/browser/share/OptionalShareTargetsManager.java",
   "java/src/org/chromium/chrome/browser/share/ShareActivity.java",
@@ -1476,44 +1448,20 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/signin/SigninView.java",
   "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
   "java/src/org/chromium/chrome/browser/signin/UnifiedConsentServiceBridge.java",
-  "java/src/org/chromium/chrome/browser/site_settings/AddExceptionPreference.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ChosenObjectInfo.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java",
+  "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerCoordinator.java",
+  "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerMediator.java",
+  "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerProperties.java",
+  "java/src/org/chromium/chrome/browser/signin/account_picker/AddAccountRowViewBinder.java",
+  "java/src/org/chromium/chrome/browser/signin/account_picker/ExistingAccountRowViewBinder.java",
   "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsClient.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ClearWebsiteStorage.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ClearWebsiteStorageDialog.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ContentSetting.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ContentSettingException.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ContentSettingsResources.java",
+  "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsHelpClient.java",
+  "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsPrefClient.java",
+  "java/src/org/chromium/chrome/browser/site_settings/ChromeWebappSettingsClient.java",
   "java/src/org/chromium/chrome/browser/site_settings/CookieControlsBridge.java",
   "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
-  "java/src/org/chromium/chrome/browser/site_settings/ForwardingManagedPreferenceDelegate.java",
-  "java/src/org/chromium/chrome/browser/site_settings/FourStateCookieSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/site_settings/LocalStorageInfo.java",
-  "java/src/org/chromium/chrome/browser/site_settings/LocationCategory.java",
   "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
-  "java/src/org/chromium/chrome/browser/site_settings/NfcCategory.java",
-  "java/src/org/chromium/chrome/browser/site_settings/NotificationCategory.java",
-  "java/src/org/chromium/chrome/browser/site_settings/PermissionInfo.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SettingsNavigationSource.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SingleWebsiteSettings.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteDataCleaner.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteSettings.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteSettingsCategory.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteSettingsClient.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/site_settings/SiteSettingsPreferenceFragment.java",
-  "java/src/org/chromium/chrome/browser/site_settings/StorageInfo.java",
-  "java/src/org/chromium/chrome/browser/site_settings/TriStateSiteSettingsPreference.java",
-  "java/src/org/chromium/chrome/browser/site_settings/Website.java",
-  "java/src/org/chromium/chrome/browser/site_settings/WebsiteAddress.java",
-  "java/src/org/chromium/chrome/browser/site_settings/WebsitePermissionsFetcher.java",
-  "java/src/org/chromium/chrome/browser/site_settings/WebsitePreference.java",
-  "java/src/org/chromium/chrome/browser/site_settings/WebsitePreferenceBridge.java",
   "java/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBar.java",
   "java/src/org/chromium/chrome/browser/sms/SmsReceiverUma.java",
-  "java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorMediator.java",
   "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorProperties.java",
@@ -1524,7 +1472,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/suggestions/NavigationRecorder.java",
   "java/src/org/chromium/chrome/browser/suggestions/OfflinableSuggestion.java",
   "java/src/org/chromium/chrome/browser/suggestions/SiteSuggestion.java",
-  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsBinder.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsConfig.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsDependencyFactory.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsEventReporter.java",
@@ -1532,14 +1479,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsMetrics.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsOfflineModelObserver.java",
-  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsRanker.java",
-  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsRecyclerView.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegate.java",
   "java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/suggestions/ThumbnailGradient.java",
   "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
   "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
-  "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesUtils.java",
+  "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesFaviconHelper.java",
+  "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesHost.java",
+  "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesMetadataUtils.java",
   "java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java",
   "java/src/org/chromium/chrome/browser/suggestions/tile/SiteSectionViewHolder.java",
   "java/src/org/chromium/chrome/browser/suggestions/tile/SuggestionsTileView.java",
@@ -1561,6 +1508,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
   "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
   "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java",
   "java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java",
   "java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java",
   "java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java",
@@ -1569,39 +1517,35 @@ 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/TrustedVaultKeyRetrievalProxyActivity.java",
   "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java",
-  "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptor.java",
-  "java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java",
-  "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptorTabHelper.java",
+  "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateClientImpl.java",
+  "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTabHelper.java",
+  "java/src/org/chromium/chrome/browser/tab/RedirectHandlerTabHelper.java",
   "java/src/org/chromium/chrome/browser/tab/SadTab.java",
   "java/src/org/chromium/chrome/browser/tab/SadTabView.java",
-  "java/src/org/chromium/chrome/browser/tab/Tab.java",
   "java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java",
-  "java/src/org/chromium/chrome/browser/tab/TabAttributeKeys.java",
-  "java/src/org/chromium/chrome/browser/tab/TabAttributes.java",
   "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
   "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelper.java",
   "java/src/org/chromium/chrome/browser/tab/TabBuilder.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java",
-  "java/src/org/chromium/chrome/browser/tab/TabCreationState.java",
   "java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java",
   "java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
   "java/src/org/chromium/chrome/browser/tab/TabHelpers.java",
-  "java/src/org/chromium/chrome/browser/tab/TabHidingType.java",
   "java/src/org/chromium/chrome/browser/tab/TabIdManager.java",
   "java/src/org/chromium/chrome/browser/tab/TabImpl.java",
   "java/src/org/chromium/chrome/browser/tab/TabImportanceManager.java",
-  "java/src/org/chromium/chrome/browser/tab/TabLifecycle.java",
-  "java/src/org/chromium/chrome/browser/tab/TabObserver.java",
   "java/src/org/chromium/chrome/browser/tab/TabParentIntent.java",
-  "java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java",
   "java/src/org/chromium/chrome/browser/tab/TabState.java",
   "java/src/org/chromium/chrome/browser/tab/TabStateBrowserControlsVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/tab/TabThemeColorHelper.java",
   "java/src/org/chromium/chrome/browser/tab/TabUma.java",
   "java/src/org/chromium/chrome/browser/tab/TabUtils.java",
   "java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java",
+  "java/src/org/chromium/chrome/browser/tab/TabViewManager.java",
+  "java/src/org/chromium/chrome/browser/tab/TabViewProvider.java",
   "java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java",
   "java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java",
   "java/src/org/chromium/chrome/browser/tab/TabWebContentsUserData.java",
@@ -1625,7 +1569,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java",
   "java/src/org/chromium/chrome/browser/tabmodel/EmptyTabModel.java",
   "java/src/org/chromium/chrome/browser/tabmodel/EmptyTabModelFilter.java",
-  "java/src/org/chromium/chrome/browser/tabmodel/EmptyTabModelObserver.java",
   "java/src/org/chromium/chrome/browser/tabmodel/EmptyTabModelSelectorObserver.java",
   "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java",
   "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImplCreator.java",
@@ -1658,10 +1601,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/TabbedModeTabPersistencePolicy.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/AsyncTabCreationParams.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java",
+  "java/src/org/chromium/chrome/browser/tasks/ConditionalTabStripUtils.java",
   "java/src/org/chromium/chrome/browser/tasks/EngagementTimeUtil.java",
   "java/src/org/chromium/chrome/browser/tasks/JourneyManager.java",
   "java/src/org/chromium/chrome/browser/tasks/ReturnToChromeExperimentsUtil.java",
-  "java/src/org/chromium/chrome/browser/tasks/TaskRecognizer.java",
   "java/src/org/chromium/chrome/browser/tasks/TasksUma.java",
   "java/src/org/chromium/chrome/browser/toolbar/AppThemeColorProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/ButtonData.java",
@@ -1671,6 +1614,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/IncognitoStateProvider.java",
   "java/src/org/chromium/chrome/browser/toolbar/IncognitoToggleTabLayout.java",
   "java/src/org/chromium/chrome/browser/toolbar/KeyboardNavigationListener.java",
+  "java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java",
   "java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/MenuButton.java",
   "java/src/org/chromium/chrome/browser/toolbar/NewTabButton.java",
@@ -1689,6 +1633,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBar.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarAnimatingView.java",
   "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java",
+  "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsProperties.java",
@@ -1751,7 +1696,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/translate/TranslateUtils.java",
   "java/src/org/chromium/chrome/browser/ui/BottomContainer.java",
   "java/src/org/chromium/chrome/browser/ui/BottomSheetManager.java",
-  "java/src/org/chromium/chrome/browser/ui/ImmersiveModeManager.java",
   "java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/ui/TabObscuringHandler.java",
   "java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java",
@@ -1782,7 +1726,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/vr/ArDelegate.java",
   "java/src/org/chromium/chrome/browser/vr/ArDelegateProvider.java",
   "java/src/org/chromium/chrome/browser/webapps/ActivateWebApkActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/ActivityAssigner.java",
   "java/src/org/chromium/chrome/browser/webapps/AddToHomescreenVerifier.java",
   "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java",
   "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.java",
@@ -1791,29 +1734,17 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/SplashController.java",
   "java/src/org/chromium/chrome/browser/webapps/SplashDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/SplashscreenObserver.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity0.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity1.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity2.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity3.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity4.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity5.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity6.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity7.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity8.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkActivity9.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivityCoordinator.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivityLifecycleUmaTracker.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkExtras.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProviderFactory.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkManagedActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkOfflineDialog.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkPostShareTargetNavigator.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkServiceClient.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkShareTarget.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkShareTargetUtil.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkSplashNetworkErrorObserver.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkUkmRecorder.java",
@@ -1826,16 +1757,6 @@ chrome_java_sources = [
   "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",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity0.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity1.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity2.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity3.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity4.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity5.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity6.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity7.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity8.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappActivity9.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivityCoordinator.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivityTabController.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappAuthenticator.java",
@@ -1851,9 +1772,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProviderFactory.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappIntentUtils.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappManagedActivity.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappLocator.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebappSplashDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappVerifier.java",
   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java",
   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java",
@@ -1877,7 +1797,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java",
   "java/src/org/chromium/chrome/browser/widget/ScrimView.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java",
-  "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContent.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetController.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserver.java",
   "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetector.java",
diff --git a/chromium/chrome/android/chrome_junit_test_java_sources.gni b/chromium/chrome/android/chrome_junit_test_java_sources.gni
index 4f4ea804fb3..8cbbae98078 100644
--- a/chromium/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_junit_test_java_sources.gni
@@ -1,6 +1,6 @@
 chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/AppIndexingUtilTest.java",
-  "junit/src/org/chromium/chrome/browser/ChromeActionModeHandlerTest.java",
+  "junit/src/org/chromium/chrome/browser/ChromeActionModeHandlerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/ChromeBackupAgentTest.java",
   "junit/src/org/chromium/chrome/browser/DeferredStartupHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandlerTest.java",
@@ -11,6 +11,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/ShadowIdleHandlerAwareMessageQueue.java",
   "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/autofill/AutofillUiUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskTest.java",
@@ -24,6 +25,11 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationChannelPreserverTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/NotificationPermissionUpdaterTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/PermissionUpdaterTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/DisclosureAcceptanceBroadcastReceiverTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/DisclosureUiPickerTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/FilledLazy.java",
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientAppDataRecorderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/CurrentPageVerifierTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TestVerifier.java",
@@ -31,6 +37,9 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureControllerTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorderTest.java",
   "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaVerifierTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureInfobarTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureNotificationTest.java",
+  "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/DisclosureSnackbarTest.java",
   "junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImplTest.java",
   "junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimationHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimatorTest.java",
@@ -60,6 +69,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/directactions/FindInPageDirectActionHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/directactions/GoBackDirectActionHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutControllerTest.java",
+  "junit/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManagerTest.java",
   "junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntryTest.java",
   "junit/src/org/chromium/chrome/browser/download/home/FileDeletionQueueTest.java",
@@ -90,9 +100,11 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/history/HistoryDeletionBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java",
   "junit/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcherTest.java",
+  "junit/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherFactoryTest.java",
   "junit/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherTest.java",
   "junit/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcherTest.java",
+  "junit/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcherTest.java",
   "junit/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotControllerTest.java",
   "junit/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupportTest.java",
   "junit/src/org/chromium/chrome/browser/init/AsyncInitTaskRunnerTest.java",
@@ -121,14 +133,11 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/notifications/NotificationSystemStatusUtilUnitTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationTriggerBackgroundTaskTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationTriggerSchedulerTest.java",
-  "junit/src/org/chromium/chrome/browser/notifications/channels/ChannelDefinitionsTest.java",
+  "junit/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitionsTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/TitleUtilTest.java",
-  "junit/src/org/chromium/chrome/browser/ntp/cards/ContentSuggestionsUnitTestUtils.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/InnerNodeTest.java",
-  "junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java",
-  "junit/src/org/chromium/chrome/browser/ntp/cards/SectionListTest.java",
-  "junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfoTest.java",
-  "junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java",
+  "junit/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoVariationManagerTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/CctOfflinePageModelObserverTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/ClientIdTest.java",
@@ -157,22 +166,17 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTrackerTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediatorUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessorUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionProcessorTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProcessorUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/SimpleHorizontalLayoutViewTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionSpannableUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessorTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessorUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/header/HeaderViewBinderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/tail/AlignmentManagerUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceUnitTest.java",
   "junit/src/org/chromium/chrome/browser/page_info/PermissionParamsListBuilderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksFaviconThrottleTest.java",
+  "junit/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReaderTest.java",
   "junit/src/org/chromium/chrome/browser/password_manager/settings/DialogManagerTest.java",
   "junit/src/org/chromium/chrome/browser/password_manager/settings/EnsureAsyncPostingRule.java",
   "junit/src/org/chromium/chrome/browser/password_manager/settings/ExportWarningDialogFragmentTest.java",
@@ -182,9 +186,12 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/password_manager/settings/TimedCallbackDelayerTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java",
+  "junit/src/org/chromium/chrome/browser/photo_picker/FileEnumWorkerTaskTest.java",
   "junit/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewTest.java",
   "junit/src/org/chromium/chrome/browser/preferences/PrefServiceBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/reengagement/ReengagementNotificationControllerTest.java",
   "junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetricsTest.java",
   "junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java",
   "junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java",
@@ -210,10 +217,14 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelperTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegateTest.java",
+  "junit/src/org/chromium/chrome/browser/tab/TabViewManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImplTest.java",
   "junit/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorProfileSupplierTest.java",
   "junit/src/org/chromium/chrome/browser/tabstate/TabStateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tasks/EngagementTimeUtilTest.java",
   "junit/src/org/chromium/chrome/browser/tasks/JourneyManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandlerTest.java",
+  "junit/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImplTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/load_progress/LoadProgressMediatorTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/top/OptionalBrowsingModeButtonControllerTest.java",
   "junit/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarMediatorUnitTest.java",
@@ -228,6 +239,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/webapps/WebappDirectoryManagerTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDisclosureSnackbarControllerTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java",
+  "junit/src/org/chromium/chrome/browser/webapps/WebappIntentUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogViewTest.java",
diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni
index e4d85aef1f6..4438f47bcfd 100644
--- a/chromium/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni
@@ -4,6 +4,7 @@
 
 import("//android_webview/variables.gni")
 import("//base/android/linker/config.gni")
+import("//base/android/resource_exclusions.gni")
 import("//build/config/android/extract_unwind_tables.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/compiler/compiler.gni")
@@ -139,7 +140,9 @@ template("chrome_public_common_apk_or_module_tmpl") {
   }
 
   target(_target_type, target_name) {
-    forward_variables_from(invoker, "*")
+    # TODO(crbug.com/1076896): remove "disable_library_rename" after
+    # chrome_public_apk is removed
+    forward_variables_from(invoker, "*", [ "disable_library_rename" ])
     if (defined(shared_resources_whitelist_target)) {
       shared_resources_allowlist_target = shared_resources_whitelist_target
       shared_resources_allowlist_locales = shared_resources_whitelist_locales
@@ -152,25 +155,46 @@ template("chrome_public_common_apk_or_module_tmpl") {
     } else if (_is_modern) {
       min_sdk_version = 21
     } else {
-      min_sdk_version = 19
+      min_sdk_version = 21
     }
     target_sdk_version = android_sdk_version
 
-    # Match drawables, but not mipmaps.
-    resource_exclusion_regex = "drawable[^/]*-xxxhdpi"
+    resource_exclusion_regex = common_resource_exclusion_regex
+    resource_exclusion_exceptions = common_resource_exclusion_exceptions
+
+    # Exceptions (rationale in https://crbug.com/691733):
+    resource_exclusion_exceptions += [
+      "*ic_file_download_white*",  # Bottom edge seems misaligned.
+      "*ic_lock.*",  # Bottom edge seems misaligned.
+      "*ic_group_*",  # Appear only in xxxhdpi.
+    ]
+
     if (min_sdk_version >= 21) {
       # Resources used by AndroidManifest.xml only for pre-21.
       resource_exclusion_regex += "|app_single_page_icon"
     }
 
-    # Exception rationale in https://crbug.com/691733.
-    resource_exclusion_exceptions = [
-      "*shadow*",  # Combination of gradient & transparency cause pixelation.
-      "*.9.*",  # Most nine-patches contain shadows.
-      "*ic_file_download_white*",  # Bottom edge seems misaligned.
-      "*ic_lock.*",  # Bottom edge seems misaligned.
-      "*ic_group_*",  # Appear only in xxxhdpi.
+    # Used only by alert dialog on tiny screens.
+    _material_package = "com_google_android_material_material.*"
+    resource_exclusion_regex += "|${_material_package}values-small"
+
+    # Material design layouts that cause views to be kept that we don't use.
+    # Instead of manually filtering, unused resource removal would be better:
+    # https://crbug.com/636448
+    resource_exclusion_regex += "|${_material_package}/layout"
+    _material_package = "*com_google_android_material_material*"
+    resource_exclusion_exceptions += [
+      # AppBarLayout
+      "${_material_package}design_appbar_*",
+
+      # TabLayout
+      "${_material_package}_tab*",
+
+      # TextInputLayout
+      "${_material_package}/design_text_*",
+      "${_material_package}/text_*",
     ]
+    resource_values_filter_rules = [ "${_material_package}:mtrl_alert" ]
 
     if (!_is_monochrome) {
       product_config_java_packages = [ "org.chromium.chrome.browser" ]
@@ -225,6 +249,23 @@ template("chrome_public_common_apk_or_module_tmpl") {
         loadable_modules = []
       }
       loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
+      library_always_compress = [
+        "libchrome_crashpad_handler.so",
+        "libchromium_android_linker.so",
+      ]
+
+      # TODO(crbug.com/1076896): remove disable_library_rename check after
+      # chrome_public_apk is removed.
+      if (!(defined(invoker.disable_library_rename) &&
+            invoker.disable_library_rename) &&
+          (_is_modern || android_64bit_target_cpu)) {
+        # This adds the "crazy." prefix to avoid the file being extracted upon
+        # install.
+        library_renames = [
+          "libchrome.so",
+          "libchromefortest.so",
+        ]
+      }
     }
 
     if (_enable_multidex) {
@@ -277,6 +318,21 @@ template("chrome_public_common_apk_or_module_tmpl") {
     }
 
     if (use_chromium_linker) {
+      _is_trichrome_3264 =
+          !_is_trichrome || !android_64bit_target_cpu || _is_64_bit_browser
+
+      if (_is_trichrome_3264) {
+        deps += [ "//base/android/linker:chromium_android_linker" ]
+        loadable_modules +=
+            [ "$root_out_dir/libchromium_android_linker$shlib_extension" ]
+      } else {
+        _secondary_linker = "//base/android/linker:chromium_android_linker($android_secondary_abi_toolchain)"
+        deps += [ _secondary_linker ]
+        _secondary_out_dir = get_label_info(_secondary_linker, "root_out_dir")
+        secondary_abi_loadable_modules +=
+            [ "$_secondary_out_dir/libchromium_android_linker$shlib_extension" ]
+      }
+
       if (!defined(load_library_from_apk)) {
         # Whether native libraries should be loaded from within the apk.
         # Only attempt loading the library from the APK for 64 bit devices
diff --git a/chromium/chrome/android/chrome_test_java_sources.gni b/chromium/chrome/android/chrome_test_java_sources.gni
index 5d25b6ec790..05f9d5f7524 100644
--- a/chromium/chrome/android/chrome_test_java_sources.gni
+++ b/chromium/chrome/android/chrome_test_java_sources.gni
@@ -15,11 +15,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/CopylessPasteTest.java",
   "javatests/src/org/chromium/chrome/browser/ExampleUiCaptureTest.java",
   "javatests/src/org/chromium/chrome/browser/FeaturesAnnotationsTest.java",
-  "javatests/src/org/chromium/chrome/browser/FieldTrialsTest.java",
   "javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java",
   "javatests/src/org/chromium/chrome/browser/HTTPSTabsOpenedFromExternalAppTest.java",
   "javatests/src/org/chromium/chrome/browser/InstalledAppTest.java",
-  "javatests/src/org/chromium/chrome/browser/InstantStartTest.java",
   "javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java",
   "javatests/src/org/chromium/chrome/browser/LauncherShortcutTest.java",
@@ -51,15 +49,16 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java",
   "javatests/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayoutTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/DataSaverAppMenuTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/OverviewAppMenuTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/TabbedAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/DataSaverAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/OverviewAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/TabbedAppMenuTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillUpstreamTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java",
+  "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillTestRule.java",
   "javatests/src/org/chromium/chrome/browser/background_sync/BackgroundSyncTest.java",
@@ -70,9 +69,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.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/BookmarkReorderTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java",
+  "javatests/src/org/chromium/chrome/browser/browserservices/RunningInChromeTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityShareTargetTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTest.java",
@@ -152,6 +151,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/dom_distiller/DistillabilityServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java",
+  "javatests/src/org/chromium/chrome/browser/dom_distiller/ReaderModeTest.java",
   "javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadForegroundServiceTest.java",
@@ -161,7 +161,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadTestRule.java",
-  "javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/download/MockDownloadNotificationService.java",
   "javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java",
@@ -177,7 +176,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryCardViewTest.java",
   "javatests/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java",
-  "javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java",
   "javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java",
@@ -186,6 +184,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestRule.java",
   "javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java",
   "javatests/src/org/chromium/chrome/browser/findinpage/FindTest.java",
+  "javatests/src/org/chromium/chrome/browser/firstrun/DisableFirstRun.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java",
@@ -211,11 +210,13 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java",
+  "javatests/src/org/chromium/chrome/browser/identity_disc/IdentityDiscControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoCookieLeakageTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoDataTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoHistoryLeakageTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoNotificationServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoPermissionLeakageTest.java",
+  "javatests/src/org/chromium/chrome/browser/incognito/IncognitoStorageLeakageTest.java",
   "javatests/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncherTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarAppearanceTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java",
@@ -255,9 +256,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/night_mode/ChromeNightModeTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/night_mode/settings/ThemeSettingsFragmentTest.java",
-  "javatests/src/org/chromium/chrome/browser/notifications/ChromeNotificationBuilderTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilderTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/NotificationBuilderBaseTest.java",
+  "javatests/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeIntentTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/NotificationTestRule.java",
@@ -271,11 +272,8 @@ chrome_test_java_sources = [
   "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/NewTabPageUiCaptureTest.java",
-  "javatests/src/org/chromium/chrome/browser/ntp/NtpUiCaptureTestData.java",
   "javatests/src/org/chromium/chrome/browser/ntp/RecentTabsPageTest.java",
-  "javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java",
-  "javatests/src/org/chromium/chrome/browser/ntp/snippets/ArticleSnippetsTest.java",
+  "javatests/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/MHTMLPageTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageArchivePublisherBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageAutoFetchTest.java",
@@ -290,7 +288,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfigurationTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchFeedFlowTest.java",
-  "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchFlowTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestOfflinePageService.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestSuggestionsService.java",
   "javatests/src/org/chromium/chrome/browser/omaha/ExponentialBackoffSchedulerTest.java",
@@ -312,6 +309,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/CookieControlsViewTest.java",
   "javatests/src/org/chromium/chrome/browser/page_info/PageInfoControllerTest.java",
+  "javatests/src/org/chromium/chrome/browser/page_info/PageInfoViewTest.java",
   "javatests/src/org/chromium/chrome/browser/paint_preview/services/PaintPreviewTabServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationIntegrationTestRule.java",
   "javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationUnitTestRule.java",
@@ -330,6 +328,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/ExpandablePaymentHandlerChangePaymentMethodTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/IsReadyToPayServiceHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/MockPackageManagerDelegate.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentErrorStringsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentHandlerChangePaymentMethodTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentHandlerEnableDelegationsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentManifestDownloaderTest.java",
@@ -419,13 +418,21 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/portals/PortalsTest.java",
   "javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandlerTest.java",
+  "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/PrivacyPreferencesManagerNativeTest.java",
+  "javatests/src/org/chromium/chrome/browser/profiles/ProfileTest.java",
   "javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarkNodeUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java",
   "javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java",
   "javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java",
   "javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
+  "javatests/src/org/chromium/chrome/browser/query_tiles/ListMatchers.java",
+  "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java",
+  "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionToOmniboxTest.java",
+  "javatests/src/org/chromium/chrome/browser/query_tiles/TileMatchers.java",
+  "javatests/src/org/chromium/chrome/browser/query_tiles/ViewActions.java",
+  "javatests/src/org/chromium/chrome/browser/reengagement/ReengagementNotificationControllerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java",
@@ -444,28 +451,31 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/AccountPickerDialogFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogIntegrationTest.java",
+  "javatests/src/org/chromium/chrome/browser/signin/ConfirmSyncDataIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/DummyAccountPickerTargetFragment.java",
   "javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/ProfileDataCacheRenderTest.java",
+  "javatests/src/org/chromium/chrome/browser/signin/ProfileDataCacheWithBadgeRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SignOutDialogRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SigninSignoutIntegrationTest.java",
+  "javatests/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsClientTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/CookieControlsBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/PermissionInfoTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/SiteSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/SiteSettingsTestUtils.java",
-  "javatests/src/org/chromium/chrome/browser/site_settings/WebsiteAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/site_settings/WebsitePermissionsFetcherTest.java",
   "javatests/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/ssl/CaptivePortalTest.java",
   "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorTest.java",
   "javatests/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorViewBinderTest.java",
-  "javatests/src/org/chromium/chrome/browser/suggestions/ContentSuggestionsTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/NavigationRecorderTest.java",
-  "javatests/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesUtilsTest.java",
+  "javatests/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesFaviconHelperTest.java",
+  "javatests/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesHostTest.java",
+  "javatests/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesMetadataUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayoutTest.java",
   "javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupTest.java",
   "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
@@ -487,7 +497,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tab/RepostFormWarningTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java",
-  "javatests/src/org/chromium/chrome/browser/tab/TabRedirectHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/TabStateTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java",
@@ -500,6 +509,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/MultiInstanceMigrationTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java",
+  "javatests/src/org/chromium/chrome/browser/tabmodel/TabModelImplTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabModelObserverTest.java",
@@ -512,7 +522,6 @@ chrome_test_java_sources = [
   "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/IdentityDiscControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/LocationBarModelTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarTest.java",
@@ -531,7 +540,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/usage_stats/TabSuspensionTest.java",
   "javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java",
   "javatests/src/org/chromium/chrome/browser/video/VideoTest.java",
-  "javatests/src/org/chromium/chrome/browser/webapps/ActivityAssignerTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenCurrentPageVerifierTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/WebApkActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/WebApkActivityTestRule.java",
diff --git a/chromium/chrome/android/examples/partner_browser_customizations_provider/BUILD.gn b/chromium/chrome/android/examples/partner_browser_customizations_provider/BUILD.gn
deleted file mode 100644
index edcb3454099..00000000000
--- a/chromium/chrome/android/examples/partner_browser_customizations_provider/BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-android_resources("partner_browser_customizations_example_apk_resources") {
-  resource_dirs = [ "res" ]
-  android_manifest = "AndroidManifest.xml"
-  custom_package = "org.chromium.example.partnercustomizations"
-}
-
-android_apk("partner_browser_customizations_example_apk") {
-  skip_jetify = true
-  sources = [
-    "src/org/chromium/example/partnercustomizations/PartnerBookmarksProviderExample.java",
-    "src/org/chromium/example/partnercustomizations/PartnerBrowserCustomizationsProviderExample.java",
-  ]
-  android_manifest = "AndroidManifest.xml"
-  min_sdk_version = 21
-  target_sdk_version = 21
-  apk_name = "PartnerCustomizationProviderExample"
-  deps = [ ":partner_browser_customizations_example_apk_resources" ]
-  chromium_code = false
-  never_incremental = true
-}
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index 45ce1b39b9c..7e20e804015 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -35,8 +35,12 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/settings:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
+    "//components/autofill/android:autofill_java",
+    "//components/browser_ui/android/bottomsheet:java",
     "//components/browser_ui/modaldialog/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/policy/android:policy_java",
@@ -232,6 +236,7 @@ android_library("test_java") {
 
   sources = [
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantAccessibilityIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantActionsCarouselUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantAutostartTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantBottomsheetTest.java",
@@ -245,10 +250,12 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantGenericUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantKeyboardIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPasswordManagerIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPersonalDataManagerTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPromptNavigationIntegrationTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
@@ -268,6 +275,7 @@ android_library("test_java") {
     "//chrome/browser/preferences:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
+    "//components/browser_ui/android/bottomsheet:java",
     "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
index 163cbcedf76..5fd39cdf0f5 100644
--- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
+++ b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_autofill_assistant_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_autofill_assistant_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_autofill_assistant_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_autofill_assistant_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_autofill_assistant_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_autofill_assistant_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_autofill_assistant_strings.xml" lang="ta" type="android" />
@@ -179,6 +180,15 @@
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_BUY_MOVIE_TICKETS" desc="Onboarding message describing autofill assistant's capability for movie tickets.">
         Buy movie tickets \n in just a few taps
       </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FOOD_ORDERING" desc="Onboarding message describing autofill assistant's capability for food ordering.">
+        Order food \n in just a few taps
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FLIGHTS_CHECKIN" desc="Onboarding message describing autofill assistant's capability for flights.">
+        Check in to your flight \n in just a few taps
+      </message>
+      <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_VOICE_SEARCH" desc="Onboarding message describing autofill assistant's capability for voice search.">
+        Try voice actions \n on websites
+      </message>
       <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE" desc="Onboarding message describing autofill assistant's capability.">
         Google Assistant saves you time by helping you complete actions on the web, like search and checkout.
       </message>
diff --git a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
index 414c852d226..3056de839e5 100644
--- a/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chromium/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -3,17 +3,49 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
-import("//chrome/android/features/cablev2_authenticator/config.gni")
 
-java_group("public_java") {
-  deps = [ "factory:public_java" ]
+android_library("java") {
+  sources = [
+    "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.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",
+  ]
+
+  deps = [
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_fido_java",
+    "$google_play_services_package:google_play_services_tasks_java",
+    "$google_play_services_package:google_play_services_vision_common_java",
+    "$google_play_services_package:google_play_services_vision_java",
+    "//base:base_java",
+    "//base:jni_java",
+    "//chrome/android:chrome_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//ui/android:ui_full_java",
+  ]
+
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java" ]
 }
 
-# Only chrome_all_java and test targets should depend on this internal target.
-java_group("internal_java") {
-  deps = [ "factory:internal_java" ]
+source_set("native") {
+  sources = [ "native/cablev2_authenticator_android.cc" ]
 
-  if (enable_android_cablev2_authenticator) {
-    deps += [ "internal:internal_java" ]
-  }
+  deps = [
+    ":jni_headers",
+    "//base",
+    "//components/cbor",
+    "//components/device_event_log",
+    "//content/public/browser",
+    "//crypto",
+    "//device/fido",
+    "//third_party/boringssl",
+  ]
 }
diff --git a/chromium/chrome/android/features/cablev2_authenticator/config.gni b/chromium/chrome/android/features/cablev2_authenticator/config.gni
deleted file mode 100644
index 3e91dd816aa..00000000000
--- a/chromium/chrome/android/features/cablev2_authenticator/config.gni
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/channel.gni")
-
-declare_args() {
-  enable_android_cablev2_authenticator = false
-}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn
deleted file mode 100644
index 5a3e5b8ab02..00000000000
--- a/chromium/chrome/android/features/cablev2_authenticator/factory/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//chrome/android/features/android_library_factory_tmpl.gni")
-import("//chrome/android/features/cablev2_authenticator/config.gni")
-
-if (enable_android_cablev2_authenticator) {
-  _factory_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUIFactory.java" ]
-} else {
-  _factory_sources = [ "dummy/java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUIFactory.java" ]
-}
-
-android_library_factory("public_java") {
-  sources = _factory_sources
-}
-
-android_library("internal_java") {
-  deps = [
-    "//chrome/android/features/cablev2_authenticator/internal:internal_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-  ]
-  sources = _factory_sources
-}
diff --git a/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn b/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn
deleted file mode 100644
index 255cad0f7b7..00000000000
--- a/chromium/chrome/android/features/cablev2_authenticator/internal/BUILD.gn
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//chrome/android/features/cablev2_authenticator/config.gni")
-
-if (enable_android_cablev2_authenticator) {
-  android_library("internal_java") {
-    sources = [
-      "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.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",
-    ]
-
-    deps = [
-      "$google_play_services_package:google_play_services_base_java",
-      "$google_play_services_package:google_play_services_fido_java",
-      "$google_play_services_package:google_play_services_tasks_java",
-      "$google_play_services_package:google_play_services_vision_common_java",
-      "$google_play_services_package:google_play_services_vision_java",
-      "//base:base_java",
-      "//base:jni_java",
-      "//chrome/android:chrome_java",
-      "//content/public/android:content_java",
-      "//third_party/android_deps:android_support_v7_appcompat_java",
-      "//third_party/android_deps:androidx_annotation_annotation_java",
-      "//ui/android:ui_full_java",
-    ]
-
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  }
-} else {
-  java_group("internal_java") {
-    deps = [
-      # This is needed to prevent a build-error. See comment in
-      # https://chromium-review.googlesource.com/c/chromium/src/+/2079613/12/chrome/android/features/cablev2_authenticator/internal/BUILD.gn#9
-      "//third_party/android_deps:androidx_annotation_annotation_java",
-    ]
-  }
-}
-
-generate_jni("jni_headers") {
-  sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/BLEHandler.java" ]
-}
-
-# Native code cannot change between different release channels and so this is
-# always enabled.
-source_set("native") {
-  sources = [ "native/cablev2_authenticator_android.cc" ]
-
-  deps = [
-    ":jni_headers",
-    "//base",
-    "//components/cbor",
-    "//components/device_event_log",
-    "//content/public/browser",
-    "//crypto",
-    "//device/fido",
-    "//third_party/boringssl",
-  ]
-}
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index 062b52006e0..235b10d804e 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -61,6 +61,7 @@ android_library("test_java") {
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index 82919c4d719..5a710458c6e 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -17,6 +17,7 @@ android_library("internal_java") {
     "//chrome/android/features/keyboard_accessory/public:public_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index c7814076c38..a5b5f8f355f 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_keyboard_accessory_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_keyboard_accessory_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_keyboard_accessory_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_keyboard_accessory_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_keyboard_accessory_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_keyboard_accessory_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_keyboard_accessory_strings.xml" lang="ta" type="android" />
diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
index 839d0492a89..842e677b7bc 100644
--- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -23,7 +23,7 @@ android_library("public_java") {
 java_cpp_enum("java_enums_srcjar") {
   sources = [
     "//chrome/browser/autofill/manual_filling_view_interface.h",
-    "//chrome/browser/password_manager/password_accessory_metrics_util.h",
+    "//chrome/browser/password_manager/android/password_accessory_metrics_util.h",
   ]
   visibility = [ ":*" ]
 }
diff --git a/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd b/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
index 65cc7bfe5c1..6e1a69c80db 100644
--- a/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
+++ b/chromium/chrome/android/features/media_router/java/strings/android_chrome_media_router_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_media_router_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_media_router_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_media_router_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_media_router_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_media_router_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_media_router_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_media_router_strings.xml" lang="ta" type="android" />
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index 4631becd4f6..aaa9a0223f5 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -55,6 +55,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
+    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceStackLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java",
   ]
 
@@ -65,6 +66,7 @@ android_library("java") {
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/messages/android:java",
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
diff --git a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd b/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
index e05f88b286b..1ddd5a6863e 100644
--- a/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
+++ b/chromium/chrome/android/features/start_surface/internal/java/strings/android_chrome_start_surface_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_start_surface_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_start_surface_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_start_surface_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_start_surface_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_start_surface_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_start_surface_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_start_surface_strings.xml" lang="ta" type="android" />
diff --git a/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni b/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni
index df6c7447be3..92bb05ab8f2 100644
--- a/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni
+++ b/chromium/chrome/android/features/start_surface/internal/javatests/start_surface_test_java_sources.gni
@@ -5,6 +5,7 @@
 start_surface_test_java_sources = [
   "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/BottomBarViewBinderTest.java",
   "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinderTest.java",
+  "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java",
   "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinderTest.java",
   "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutPerfTest.java",
   "//chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java",
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index 3c9d21d78dc..ce21a8e0666 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -28,15 +28,11 @@ android_resources("java_resources") {
     "java/res/anim/iph_touch_point_background_alpha_animation.xml",
     "java/res/anim/iph_touch_point_background_animation.xml",
     "java/res/color/dark_text_color_list.xml",
-    "java/res/drawable-hdpi/tabstrip_selected.png",
-    "java/res/drawable-mdpi/tabstrip_selected.png",
     "java/res/drawable-v21/fake_search_box_bg_incognito.xml",
-    "java/res/drawable-xhdpi/tabstrip_selected.png",
-    "java/res/drawable-xxhdpi/tabstrip_selected.png",
-    "java/res/drawable-xxxhdpi/tabstrip_selected.png",
     "java/res/drawable/fake_search_box_text_box_bg_incognito.xml",
     "java/res/drawable/hovered_tab_grid_card_background.xml",
     "java/res/drawable/ic_check_googblue_20dp_animated.xml",
+    "java/res/drawable/ic_group_icon_16dp.xml",
     "java/res/drawable/iph_drag_and_drop_animated_drawable.xml",
     "java/res/drawable/iph_drag_and_drop_drawable.xml",
     "java/res/drawable/popup_bg_dark.xml",
@@ -46,12 +42,18 @@ android_resources("java_resources") {
     "java/res/drawable/tab_grid_dialog_background.xml",
     "java/res/drawable/tab_grid_dialog_background_incognito.xml",
     "java/res/drawable/tab_grid_selection_list_icon.xml",
+    "java/res/drawable/tab_strip_fading_edge_end.xml",
+    "java/res/drawable/tab_strip_fading_edge_start.xml",
+    "java/res/drawable/tab_strip_favicon_circle.xml",
+    "java/res/drawable/tab_strip_selected_ring.xml",
+    "java/res/drawable/tab_strip_selected_ring_incognito.xml",
     "java/res/drawable/tabstrip_favicon_background.xml",
     "java/res/drawable/ungroup_bar_background.xml",
     "java/res/layout/bottom_tab_grid_toolbar.xml",
     "java/res/layout/bottom_tab_strip_toolbar.xml",
     "java/res/layout/closable_tab_grid_card_item.xml",
     "java/res/layout/closable_tab_list_card_item.xml",
+    "java/res/layout/incognito_description_container_layout.xml",
     "java/res/layout/iph_drag_and_drop_dialog_layout.xml",
     "java/res/layout/new_tab_tile_card_item.xml",
     "java/res/layout/selectable_tab_grid_card_item.xml",
@@ -92,8 +94,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksView.java",
     "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java",
-    "java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/IphMessageCardViewModel.java",
@@ -118,10 +118,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParent.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogCoordinator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogMediator.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogParent.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogProperties.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogViewBinder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java",
@@ -183,15 +180,18 @@ android_library("java") {
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/favicon:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
+    "//components/content_settings/android:content_settings_enums_java",
     "//components/embedder_support/android:util_java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
+    "//components/infobars/core:infobar_enums_java",
     "//components/policy/android:policy_java",
     "//components/search_engines/android:java",
     "//content/public/android:content_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 4822c50885f..e94261fc27d 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
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_tab_ui_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_tab_ui_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_tab_ui_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_tab_ui_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_tab_ui_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_tab_ui_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_tab_ui_strings.xml" lang="ta" type="android" />
@@ -205,6 +206,9 @@
       <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_EXPAND_TAB_SHEET" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the '^' sign.">
         Show group's tabs in fullscreen grid
       </message>
+        <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_CLOSE_STRIP" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the 'X' sign. When user clicks on it, the tab strip will be closed.">
+        Close tab strip
+      </message>
 
       <!-- Tab Group Tab Switcher strings -->
       <message name="IDS_TABSWITCHER_CREATE_GROUP" desc="This flat button is shown in the Tab Switcher, under an open tab. When the user taps the button, Chrome creates a new group of tabs that includes the existing tab. It's okay to use any of the following verbs in order to keep the text under 45 characters: Create, Make, Add.">
@@ -218,6 +222,12 @@
       <message name="IDS_TAB_SELECTION_EDITOR_TOOLBAR_SELECT_TABS" desc="Label shown on Tab Selection Editor Toolbar asking user to select tabs from the list.">
         Select tabs
       </message>
+      <message name="IDS_ACCESSIBILITY_TAB_SELECTION_EDITOR_GROUP_BUTTON" desc="The accessibility text to read when the 'Group' text button in the selection mode toolbar is focused. When this button is tapped, all the selected tabs will be grouped together.">
+        {TABS_COUNT, plural,
+          =1 {Group <ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> selected tab}
+          other {Group <ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> selected tabs}
+        }
+      </message>
 
       <!-- Tab Grid Dialog strings -->
       <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group.">
@@ -256,7 +266,7 @@
       </message>
 
       <!-- Tab Suggestion strings -->
-      <message name="IDS_TAB_SUGGESTION_REVIEW_BUTTON" desc="This text button shows next the message 'X of your tabs haven't been used lately. Close them?'. When a user clicks this 'Review' text button, they will enter a selection mode where they can see the suggested tabs to close, see the rest of their open tabs, and choose what tabs to close.">
+      <message name="IDS_TAB_SUGGESTION_REVIEW_BUTTON" desc="This text button shows next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. When a user clicks this 'Review' text button, they will enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
           Review
       </message>
       <message name="IDS_TAB_SUGGESTION_CLOSE_TAB_ACTION_BUTTON" desc="When a user chooses to review suggested tabs to close, they enter a section mode to review and close the tabs. In that selection mode, this text button in the toolbar lets the user finalize their choices. When this button is tapped, all the selected tabs will be closed.">
@@ -265,13 +275,20 @@
       <message name="IDS_TAB_SUGGESTION_CLOSE_STALE_MESSAGE" desc="On Chrome mobile, this text shows as a suggestion under a user's tabs. The suggestion prompts the user to automatically close some tabs that haven't been used lately. The placeholder denotes the number of suggested tabs to close, which will always be 2 or more (so 'tabs' should be plural).">
           <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> of your tabs haven't been used lately. Close them?
       </message>
+      <message name="IDS_TAB_SUGGESTION_GROUP_TABS_MESSAGE" desc="On Chrome mobile, this text shows as a suggestion under a user's tabs. The suggestion prompts the user to automatically group some tabs that haven been detected as closely related to each other. The placeholder denotes the number of suggested tabs to group, which will always be 2 or more (so 'tabs' should be plural).">
+          <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
+      </message>
+
       <!-- Accessibility strings for Tab Suggestion -->
-      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close, see the rest of their open tabs, and choose what tabs to close.">
+      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_REVIEW_BUTTON" desc="The accessibility text to read when the text button 'Review' is focused. The 'Review' button is shown next to the message 'X of your tabs haven't been used lately. Close them?', or 'X tabs seem related. Group them?'. User uses that text button to enter a selection mode where they can see the suggested tabs to close or to group, see the rest of their open tabs, and choose what tabs to close or to group.">
         Review the suggestions.
       </message>
       <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_CLOSE_STALE_MESSAGE" desc="The accessibility text to read when the TAB_SUGGESTION card is focused">
         Suggestion: <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> of your tabs haven't been used lately. Close them?
       </message>
+      <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_GROUP_TABS_MESSAGE" desc="The accessibility text to read when the TAB_SUGGESTION card is focused">
+        Suggestion: <ph name="NUMBER_OF_TABS">%1$s<ex>2</ex></ph> tabs seem related. Group them?
+      </message>
       <message name="IDS_ACCESSIBILITY_TAB_SUGGESTION_DISMISS_BUTTON" desc="The accessibility text to read when the 'X' button on the TAB_SUGGESTION card is focused">
         Dismiss the suggestions.
       </message>
@@ -295,6 +312,20 @@
        <message name="IDS_ACCESSIBILITY_TAB_MOVEMENT_DOWN" desc="This text button shows in the accessibility mode action menu. When user selects a tab, triggers action menu and clicks on this button, the current tab will switch position with the tab below it in the grid to achieve reordering.">
           Move tab down
       </message>
+
+      <!-- Strings for Conditional Tab Strip -->
+      <message name="IDS_UNDO_TAB_STRIP_CLOSURE_MESSAGE" desc="Message shown on the snack bar when the conditional tab strip is closed.">
+          Closed tab strip
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_QUESTION" desc="This text is shown on the info bar when the user has dismissed the tab strip for multiple times. It is to ask whether users want the tab strip to hide permanently or they still want it to show sometime later.">
+          Don't show tab strip again?
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_NO_RESHOW" desc="This text is shown on the info bar action button and serves as one answer to &quot;Don't show tab strip again?&quot;. When a user clicks this button, tab strip will never show again for this user.">
+          Don't show again
+      </message>
+      <message name="IDS_TAB_STRIP_INFO_BAR_RESHOW" desc="This text is shown on the info bar action button and serves as one answer to &quot;Don't show tab strip again?&quot;. When a user clicks this button, tab strip will keep showing for this user.">
+          Show later
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
index 90c36784cbe..a042947ae5c 100644
--- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -9,6 +9,8 @@ public_tab_management_java_sources = [
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/MostVisitedListProperties.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurface.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCache.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUi.java",
@@ -30,13 +32,13 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/SingleTabViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TasksViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/ConditionalTabStripTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/RecyclerViewMatcherUtils.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridAccessibilityHelperTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java",
-  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiTest.java",
@@ -48,6 +50,7 @@ tab_management_test_java_sources = [
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorTestingRobot.java",
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMultiWindowTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TestRecyclerViewSimpleViewBinder.java",
@@ -61,9 +64,9 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCacheUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtilsUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/ConditionalTabStripUtilsUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardProviderMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java",
-  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java",
@@ -77,6 +80,7 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserverTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcherTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestratorTest.java",
 ]
diff --git a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
deleted file mode 100644
index 7f001c66b1a..00000000000
--- a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/buildflag_header.gni")
-import("//build/config/android/rules.gni")
-import("//chrome/android/modules/buildflags.gni")
-import("//tools/grit/grit_rule.gni")
-
-android_resources("java_resources") {
-  sources = [ "java/res/raw/dummy_resource" ]
-  custom_package = "org.chromium.chrome.features.test_dummy"
-}
-
-android_library("java") {
-  deps = [
-    ":base_module_java",
-    ":java_resources",
-    "//base:base_java",
-    "//chrome/android/features/test_dummy/public:java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-  ]
-  sources =
-      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
-
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  deps += [ "//base:jni_java" ]
-}
-
-source_set("native") {
-  sources = [ "test_dummy_impl.cc" ]
-
-  deps = [
-    ":jni_headers",
-    ":resources_native",
-    "//base",
-    "//ui/base",
-  ]
-}
-
-# Java code that should go into the base module. If this were a normal feature,
-# this target would reside in the client code using the module. Since this is a
-# test dummy module, it has no pre-existing client, and hence the target is
-# squatting here for convenience. The same is true for the corresponding native
-# target.
-android_library("base_module_java") {
-  deps = [
-    "//base:base_java",
-    "//chrome/android/features/test_dummy/public:java",
-    "//chrome/android/modules/test_dummy/provider:java",
-    "//chrome/android/modules/test_dummy/public:java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-  ]
-  sources = [
-    "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",
-  ]
-}
-
-generate_jni("jni_headers") {
-  sources =
-      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
-}
-
-# Cannot call this just "resources" since all targets with that name in
-# //chrome/android need a build_config, which grit targets don't have.
-grit("resources_native") {
-  source = "resources/resources.grd"
-  outputs = [
-    "grit/test_dummy_resources.h",
-    "test_dummy_resources.pak",
-  ]
-  output_dir = "$root_gen_dir/chrome"
-}
diff --git a/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd b/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd
deleted file mode 100644
index 2f90200e989..00000000000
--- a/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0"
-      current_release="1"
-      output_all_resource_defines="false">
-  <outputs>
-    <output filename="grit/test_dummy_resources.h"
-            type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="test_dummy_resources.pak"
-            type="data_package" />
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include name="IDR_TEST_DUMMY_TEST_RESOURCE"
-               file="test_resource.txt"
-               type="BINDATA" />
-    </includes>
-  </release>
-</grit>
diff --git a/chromium/chrome/android/features/test_dummy/public/BUILD.gn b/chromium/chrome/android/features/test_dummy/public/BUILD.gn
deleted file mode 100644
index 2018bea5c16..00000000000
--- a/chromium/chrome/android/features/test_dummy/public/BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-android_library("java") {
-  sources =
-      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummy.java" ]
-}
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index ac1da8c95ae..7bd362cbbbf 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -76,10 +76,15 @@ android_library("java") {
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
+    "//chrome/browser/tab:java",
+    "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/modaldialog/android:java",
+    "//components/browser_ui/notifications/android:java",
     "//components/embedder_support/android:content_view_java",
+    "//components/external_intents/android:java",
     "//components/infobars/core:infobar_enums_java",
+    "//components/page_info/android:java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",
diff --git a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
index c130fb83032..d88e733b75b 100644
--- a/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
+++ b/chromium/chrome/android/features/vr/java/strings/android_chrome_vr_strings.grd
@@ -68,6 +68,7 @@
     <output filename="values-sl/android_chrome_vr_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_chrome_vr_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_chrome_vr_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_chrome_vr_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_chrome_vr_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_chrome_vr_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_chrome_vr_strings.xml" lang="ta" type="android" />
diff --git a/chromium/chrome/android/feed/feed_java_sources.gni b/chromium/chrome/android/feed/feed_java_sources.gni
index 266d746d029..41efe35881a 100644
--- a/chromium/chrome/android/feed/feed_java_sources.gni
+++ b/chromium/chrome/android/feed/feed_java_sources.gni
@@ -12,12 +12,12 @@ if (enable_feed_in_chrome) {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_cardview_cardview_java",
     "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_interpolator_interpolator_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
+    "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",
-    "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   feed_java_sources = [
@@ -35,7 +35,6 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLifecycleBridge.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java",
-    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineBridge.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineIndicator.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
@@ -44,7 +43,9 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSchedulerBridge.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/FeedSurfaceMediator.java",
+    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedUma.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FutureTaskConsumer.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/NtpStreamLifecycleManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/StreamLifecycleManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/TestNetworkClient.java",
@@ -110,6 +111,7 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/stream/TooltipSupportedApi.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionmanager/ActionManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionmanager/ActionReader.java",
+    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionmanager/ViewActionManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionParser.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionParserFactory.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/internal/actionparser/ActionSource.java",
@@ -375,12 +377,15 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollRestoreHelper.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollTracker.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/ui/MaterialSpinnerView.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/tooltip/BasicTooltipApi.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/tooltip/BasicTooltipSupportedApi.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/tooltip/FeedTooltipUtils.java",
-    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedActionHandler.java",
+    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedListContentManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedServiceBridge.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java",
+    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/NativeViewListRenderer.java",
   ]
 
   feed_srcjar_deps = [ "//components/feed/core:feed_core_java_enums_srcjar" ]
@@ -412,6 +417,7 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/hostimpl/storage/testing/InMemoryJournalStorage.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/testing/FakeFrameAdapter.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/testing/actionmanager/FakeActionReader.java",
+    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/testing/actionmanager/FakeViewActionManager.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/testing/android/LinearLayoutManagerForTest.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/testing/conformance/network/NetworkClientConformanceTest.java",
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/testing/conformance/scheduler/SchedulerConformanceTest.java",
@@ -638,6 +644,9 @@ if (enable_feed_in_chrome) {
     "junit/src/org/chromium/chrome/browser/feed/FutureTaskConsumerTest.java",
     "junit/src/org/chromium/chrome/browser/feed/NtpStreamLifecycleManagerTest.java",
     "junit/src/org/chromium/chrome/browser/feed/action/FeedActionHandlerTest.java",
+    "junit/src/org/chromium/chrome/browser/feed/v2/FeedListContentManagerTest.java",
+    "junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurfaceTest.java",
+    "junit/src/org/chromium/chrome/browser/feed/v2/NativeViewListRendererTest.java",
   ]
 
   feed_test_java_sources = [
@@ -669,6 +678,7 @@ if (enable_feed_in_chrome) {
     "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedNewTabPageTest.java",
     "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedRefreshTaskTest.java",
     "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/FeedSchedulerBridgeConformanceTest.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/tooltip/FeedTooltipTest.java",
   ]
 
@@ -681,7 +691,6 @@ if (enable_feed_in_chrome) {
   feed_deps = []
   feed_java_sources = [
     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedAppLifecycle.java",
-    "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedRefreshTask.java",
     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java",
diff --git a/chromium/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni b/chromium/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni
new file mode 100644
index 00000000000..c008922b4e1
--- /dev/null
+++ b/chromium/chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni
@@ -0,0 +1,8 @@
+cablev2_authenticator_module_desc = {
+  name = "cablev2_authenticator"
+  android_manifest = "//chrome/android/modules/cablev2_authenticator/internal/java/AndroidManifest.xml"
+  java_deps = [ "//chrome/android/modules/cablev2_authenticator/internal:java" ]
+  native_deps =
+      [ "//chrome/android/modules/cablev2_authenticator/internal:native" ]
+  load_native_on_get_impl = true
+}
diff --git a/chromium/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn b/chromium/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
new file mode 100644
index 00000000000..48c20151e2d
--- /dev/null
+++ b/chromium/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
@@ -0,0 +1,45 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//chrome/android/modules/buildflags.gni")
+
+android_library("java") {
+  sources = [ "java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java" ]
+  deps = [
+    "//base:base_java",
+    "//chrome/android/features/cablev2_authenticator:java",
+    "//chrome/android/modules/cablev2_authenticator/public:java",
+  ]
+}
+
+# This group is effectively alias representing the module's native code,
+# allowing it to be named "native" for clarity in module descriptors. The
+# component target must be named according to the feature, so that the
+# component build's .cr.co library is named properly (ie.
+# libcablev2_authenticator.cr.so).
+group("native") {
+  deps = [ ":cablev2_authenticator" ]
+}
+
+component("cablev2_authenticator") {
+  sources = [ "entrypoints.cc" ]
+  deps = [
+    ":jni_registration",
+    "//base",
+    "//chrome/android/features/cablev2_authenticator:native",
+  ]
+
+  # caBLE v2 authenticator native entrypoints belong in the partition.
+  if (use_native_partitions) {
+    cflags = [ "-fsymbol-partition=cablev2_authenticator_partition" ]
+  }
+}
+
+generate_jni_registration("jni_registration") {
+  no_transitive_deps = true
+  targets = [ "//chrome/android/features/cablev2_authenticator:java" ]
+  header_output = "$target_gen_dir/jni_registration.h"
+  namespace = "cablev2_authenticator"
+}
diff --git a/chromium/chrome/android/modules/cablev2_authenticator/public/BUILD.gn b/chromium/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
new file mode 100644
index 00000000000..3102adcbe44
--- /dev/null
+++ b/chromium/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  sources = [
+    "java/src/org/chromium/chrome/modules/cablev2_authenticator/CableAuthenticatorModuleProvider.java",
+    "java/src/org/chromium/chrome/modules/cablev2_authenticator/Module.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//components/module_installer/android:module_installer_java",
+    "//components/module_installer/android:module_interface_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+  ]
+  annotation_processor_deps =
+      [ "//components/module_installer/android:module_interface_processor" ]
+}
diff --git a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
index f71e03fcde5..76b0d11a6a2 100644
--- a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
+++ b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni
@@ -77,10 +77,11 @@ template("chrome_bundle") {
                              "base_module_target",
                              "bundle_name",
                              "compress_shared_libraries",
-                             "failed_proguard_expectation_file",
                              "keystore_name",
                              "keystore_password",
                              "keystore_path",
+                             "lint_suppressions_file",
+                             "manifest_package",
                              "min_sdk_version",
                              "proguard_android_sdk_dep",
                              "proguard_jar_path",
@@ -88,6 +89,7 @@ template("chrome_bundle") {
                              "static_library_provider",
                              "static_library_synchronized_proguard",
                              "verify_proguard_flags",
+                             "verify_native_libs_and_assets",
                              "version_code",
                            ])
     command_line_flags_file = "chrome-command-line"
@@ -97,6 +99,11 @@ template("chrome_bundle") {
     system_image_locale_allowlist = android_apk_locales
     is_multi_abi = _is_multi_abi
 
+    # List of DFMs that are installed by default by wrapper scripts, to make
+    # testing easier. This removes the need to manually specify, e.g.,
+    # "-m dev_ui" on every install or run.
+    default_modules_for_testing = [ "dev_ui" ]
+
     # NOTE: Only sign bundle for official builds since this is very slow.
     if (enable_chrome_android_internal && use_signing_keys &&
         is_official_build) {
diff --git a/chromium/chrome/android/modules/chrome_feature_modules.gni b/chromium/chrome/android/modules/chrome_feature_modules.gni
index 016da28efcf..37554ee4e40 100644
--- a/chromium/chrome/android/modules/chrome_feature_modules.gni
+++ b/chromium/chrome/android/modules/chrome_feature_modules.gni
@@ -8,6 +8,8 @@ import(
 import("//chrome/android/features/dev_ui/dev_ui_module.gni")
 import("//chrome/android/features/tab_ui/tab_ui_module.gni")
 import("//chrome/android/modules/buildflags.gni")
+import(
+    "//chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni")
 import("//chrome/android/modules/chime/chime_module.gni")
 import("//chrome/android/modules/extra_icu/extra_icu_module.gni")
 import("//chrome/android/modules/image_editor/image_editor_module.gni")
@@ -69,6 +71,7 @@ if (!disable_autofill_assistant_dfm) {
 if (!disable_tab_ui_dfm) {
   monochrome_module_descs += [ tab_ui_module_desc ]
 }
+monochrome_module_descs += [ cablev2_authenticator_module_desc ]
 
 # Modules shipped in Trichrome (Android Q+).
 trichrome_module_descs = monochrome_module_descs
diff --git a/chromium/chrome/android/modules/image_editor/image_editor_module.gni b/chromium/chrome/android/modules/image_editor/image_editor_module.gni
index 4023fb6e6f6..f6db4b290d8 100644
--- a/chromium/chrome/android/modules/image_editor/image_editor_module.gni
+++ b/chromium/chrome/android/modules/image_editor/image_editor_module.gni
@@ -20,7 +20,7 @@ image_editor_module_desc = {
   java_deps = [ "//chrome/android/modules/image_editor/internal:java" ]
 
   if (enable_chrome_android_internal) {
-    if (target_cpu == "x86") {
+    if (target_cpu == "x86" || target_cpu == "x64") {
       loadable_modules_32_bit = [ "$_ink_dir/x86/libsketchology_native.so" ]
       loadable_modules_64_bit = [ "$_ink_dir/x86_64/libsketchology_native.so" ]
     } else {
diff --git a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn
index 3d89b3657b9..23ae81de902 100644
--- a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn
+++ b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn
@@ -6,13 +6,26 @@ import("//build/config/android/rules.gni")
 import("//chrome/android/modules/buildflags.gni")
 
 android_library("java") {
-  sources = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderDummyImpl.java" ]
+  sources = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderModuleContentsImpl.java" ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android/modules/stack_unwinder/public:java",
   ]
 }
 
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderModuleContentsImpl.java" ]
+}
+
+generate_jni_registration("jni_registration") {
+  targets = [ ":java" ]
+  header_output = "$target_gen_dir/jni_registration.h"
+  namespace = "stack_unwinder"
+  no_transitive_deps = true
+}
+
 # This group is effectively an alias representing the module's native code,
 # allowing it to be named "native" for clarity in module descriptors. The
 # component target must be named according to the feature, so that the component
@@ -22,8 +35,13 @@ group("native") {
 }
 
 component("stack_unwinder") {
-  sources = [ "entrypoints.cc" ]
+  sources = [
+    "entrypoints.cc",
+    "stack_unwinder_module_contents_impl.cc",
+  ]
   deps = [
+    ":jni_headers",
+    ":jni_registration",
     "//base",
     "//chrome/android/features/stack_unwinder/public:memory_regions_map",
   ]
diff --git a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn
index 546491ba614..0ea5726014b 100644
--- a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn
+++ b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  sources = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderDummyInterface.java" ]
+  sources = [ "java/src/org/chromium/chrome/modules/stack_unwinder/StackUnwinderModuleContents.java" ]
   deps = [
     "//base:base_java",
     "//components/module_installer/android:module_installer_java",
diff --git a/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn b/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn
index e9989ec3a8c..e32169d2878 100644
--- a/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn
+++ b/chromium/chrome/android/modules/test_dummy/internal/BUILD.gn
@@ -9,9 +9,9 @@ android_library("java") {
   sources = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProviderImpl.java" ]
   deps = [
     "//base:base_java",
-    "//chrome/android/features/test_dummy/internal:java",
-    "//chrome/android/features/test_dummy/public:java",
     "//chrome/android/modules/test_dummy/public:java",
+    "//chrome/browser/test_dummy:java",
+    "//chrome/browser/test_dummy/internal:java",
   ]
 }
 
@@ -28,7 +28,7 @@ component("test_dummy") {
   deps = [
     ":jni_registration",
     "//base",
-    "//chrome/android/features/test_dummy/internal:native",
+    "//chrome/browser/test_dummy/internal:native",
   ]
 
   # Test dummy native entrypoints belong in the partition.
@@ -39,7 +39,7 @@ component("test_dummy") {
 
 generate_jni_registration("jni_registration") {
   no_transitive_deps = true
-  targets = [ "//chrome/android/features/test_dummy/internal:java" ]
+  targets = [ "//chrome/browser/test_dummy/internal:java" ]
   header_output = "$target_gen_dir/jni_registration.h"
   namespace = "test_dummy"
 }
diff --git a/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn b/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn
index 5932e88c653..b35bd1e607d 100644
--- a/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn
+++ b/chromium/chrome/android/modules/test_dummy/provider/BUILD.gn
@@ -8,8 +8,8 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
-    "//chrome/android/features/test_dummy/public:java",
     "//chrome/android/modules/test_dummy/public:java",
+    "//chrome/browser/test_dummy:java",
   ]
   sources = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyModuleProvider.java" ]
 }
diff --git a/chromium/chrome/android/modules/test_dummy/public/BUILD.gn b/chromium/chrome/android/modules/test_dummy/public/BUILD.gn
index 51dcedce1e8..66e42a740fd 100644
--- a/chromium/chrome/android/modules/test_dummy/public/BUILD.gn
+++ b/chromium/chrome/android/modules/test_dummy/public/BUILD.gn
@@ -10,7 +10,7 @@ android_library("java") {
   ]
   deps = [
     "//base:base_java",
-    "//chrome/android/features/test_dummy/public:java",
+    "//chrome/browser/test_dummy:java",
     "//components/module_installer/android:module_installer_java",
     "//components/module_installer/android:module_interface_java",
   ]
diff --git a/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni b/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni
index 89b20c8bdc4..c28e9177e54 100644
--- a/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni
+++ b/chromium/chrome/android/modules/test_dummy/test_dummy_module.gni
@@ -9,15 +9,14 @@ test_dummy_module_desc = {
   android_manifest =
       "//chrome/android/modules/test_dummy/internal/java/AndroidManifest.xml"
   java_deps = [
-    "//chrome/android/features/test_dummy/internal:java",
     "//chrome/android/modules/test_dummy/internal:java",
+    "//chrome/browser/test_dummy/internal:java",
   ]
   native_deps = [
-    "//chrome/android/features/test_dummy/internal:native",
     "//chrome/android/modules/test_dummy/internal:native",
+    "//chrome/browser/test_dummy/internal:native",
   ]
   paks = [ "$root_gen_dir/chrome/test_dummy_resources.pak" ]
-  pak_deps =
-      [ "//chrome/android/features/test_dummy/internal:resources_native" ]
+  pak_deps = [ "//chrome/browser/test_dummy/internal:resources_native" ]
   load_native_on_get_impl = true
 }
diff --git a/chromium/chrome/android/static_initializers.gni b/chromium/chrome/android/static_initializers.gni
index 6b5a9bb460d..29bd242bde2 100644
--- a/chromium/chrome/android/static_initializers.gni
+++ b/chromium/chrome/android/static_initializers.gni
@@ -12,6 +12,9 @@ import("//build/config/sanitizers/sanitizers.gni")
 if (current_toolchain == default_toolchain &&
     (!is_debug && !using_sanitizer && proprietary_codecs)) {
   # Define expectations only for target_cpu covered by trybots.
+  # Currently static_initializers come from:
+  # * iostream.cpp
+  # * token.cc
   if (target_cpu == "arm" || target_cpu == "arm64") {
     expected_static_initializer_count = 2
   }
diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni
index 587a828c12d..aff10998c5d 100644
--- a/chromium/chrome/android/trichrome.gni
+++ b/chromium/chrome/android/trichrome.gni
@@ -47,6 +47,8 @@ template("trichrome_library_apk_tmpl") {
                              "min_sdk_version",
                              "proguard_jar_path",
                              "target_sdk_version",
+                             "verify_manifest",
+                             "verify_native_libs_and_assets",
                            ])
 
     # TODO(torne): since there's no real java code in the library right now,
@@ -161,11 +163,6 @@ template("trichrome_library_apk_tmpl") {
         "//third_party/crashpad/crashpad/handler:crashpad_handler_trampoline",
       ]
       loadable_modules = [ "$root_out_dir/libcrashpad_handler_trampoline.so" ]
-
-      if (chromium_linker_supported) {
-        deps += [ "//base/android/linker:chromium_android_linker" ]
-        loadable_modules += [ "$root_out_dir/libchromium_android_linker.so" ]
-      }
     }
     if (_include_secondary_support) {
       _trampoline =
@@ -178,13 +175,6 @@ template("trichrome_library_apk_tmpl") {
       _secondary_out_dir = get_label_info(_trampoline, "root_out_dir")
       secondary_abi_loadable_modules =
           [ "$_secondary_out_dir/libcrashpad_handler_trampoline.so" ]
-
-      if (chromium_linker_supported) {
-        deps += [ "//base/android/linker:chromium_android_linker" +
-                  "($android_secondary_abi_toolchain)" ]
-        secondary_abi_loadable_modules +=
-            [ "$_secondary_out_dir/libchromium_android_linker.so" ]
-      }
     }
 
     # http://crbug.com/1042107.
diff --git a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
index 85f81dda3fa..89d860a1118 100644
--- a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
+++ b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
@@ -6,6 +6,8 @@ import("//build/config/android/rules.gni")
 
 # Implements service which uses {@link WebApkServiceImpl} for testing.
 android_apk("apk_with_webapk_service") {
+  testonly = true
+
   # Used as an additional_apk in test scripts.
   never_incremental = true
 
diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
index b7034b2de3d..04a3ce9f422 100644
--- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
@@ -44,11 +44,7 @@ mustache_pass("generate_new_style_manifest_for_upload") {
 # name conflict.
 template("webapk_java") {
   android_library(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "android_manifest_for_lint",
-                             "deps",
-                           ])
+    forward_variables_from(invoker, [ "deps" ])
 
     sources = [
       "src/org/chromium/webapk/shell_apk/ChooseHostBrowserDialog.java",
@@ -60,7 +56,6 @@ template("webapk_java") {
       "src/org/chromium/webapk/shell_apk/IdentityService.java",
       "src/org/chromium/webapk/shell_apk/InstallHostBrowserDialog.java",
       "src/org/chromium/webapk/shell_apk/LaunchHostBrowserSelector.java",
-      "src/org/chromium/webapk/shell_apk/MainActivity.java",
       "src/org/chromium/webapk/shell_apk/TransparentLauncherActivity.java",
       "src/org/chromium/webapk/shell_apk/WebApkSharedPreferences.java",
       "src/org/chromium/webapk/shell_apk/WebApkUtils.java",
@@ -76,24 +71,18 @@ template("webapk_java") {
       "//chrome/android/webapk/libs/common:common_java",
       "//chrome/android/webapk/libs/common:splash_java",
     ]
-    min_sdk_version = 19
   }
 }
 
 template("webapk_with_service_java") {
   android_library(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "android_manifest_for_lint",
-                             "deps",
-                           ])
+    forward_variables_from(invoker, [ "deps" ])
 
     sources = [
       "src/org/chromium/webapk/shell_apk/WebApkServiceFactory.java",
       "src/org/chromium/webapk/shell_apk/WebApkServiceImplWrapper.java",
     ]
     deps += [ ":compiled_in_runtime_library_java" ]
-    min_sdk_version = 19
   }
 }
 
@@ -212,10 +201,12 @@ template("webapk_tmpl") {
       "res/values-hdpi/is_splash_icon_maskable_bool.xml",
       "res/values-mdpi/is_splash_icon_maskable_bool.xml",
       "res/values-v17/styles.xml",
+      "res/values-v24/default_enabled_activity.xml",
       "res/values-xhdpi/is_splash_icon_maskable_bool.xml",
       "res/values-xxhdpi/is_splash_icon_maskable_bool.xml",
       "res/values-xxxhdpi/is_splash_icon_maskable_bool.xml",
       "res/values/colors.xml",
+      "res/values/default_enabled_activity.xml",
       "res/values/dimens.xml",
       "res/xml/shortcuts.xml",
     ]
@@ -227,7 +218,6 @@ template("webapk_tmpl") {
   }
 
   webapk_java(_java_without_services_target_name) {
-    android_manifest_for_lint = _manifest_output
     deps = [
       ":$_manifest_target_name",
       ":$_resources_target_name",
@@ -235,7 +225,6 @@ template("webapk_tmpl") {
   }
 
   webapk_with_service_java(_java_with_services_target_name) {
-    android_manifest_for_lint = _manifest_output
     deps = [
       ":$_java_without_services_target_name",
       ":$_manifest_target_name",
@@ -243,12 +232,16 @@ template("webapk_tmpl") {
   }
 
   android_apk(target_name) {
-    forward_variables_from(invoker, [ "apk_name" ])
+    forward_variables_from(invoker,
+                           [
+                             "apk_name",
+                             "testonly",
+                           ])
     deps = [ ":$_java_with_services_target_name" ]
 
     android_manifest = _manifest_output
     android_manifest_dep = ":$_manifest_target_name"
-    min_sdk_version = 19
+    min_sdk_version = 21
     target_sdk_version = 29
     never_incremental = true
     enable_multidex = false
@@ -295,6 +288,7 @@ webapk_tmpl("maps_go_webapk") {
 }
 
 webapk_tmpl("uiautomator_maps_go_webapk") {
+  testonly = true
   config_file = "manifest/maps_go_manifest_config.json"
   manifest_to_upload_dep = ":generate_old_style_manifest_for_upload"
   apk_name = "JavatestsMapsWebApk"
@@ -318,6 +312,7 @@ webapk_tmpl("new_splash_webapk") {
 
 # Used by javatests
 webapk_tmpl("javatests_webapk") {
+  testonly = true
   config_file = "manifest/bound_manifest_config.json"
   manifest_to_upload_dep = ":generate_old_style_manifest_for_upload"
   delta_config_file = "manifest/javatest_manifest_config_delta.json"
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 0d8e6a71a40..0cad3b880e8 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 = 125
+current_shell_apk_version = 128
diff --git a/chromium/chrome/android/webapk/strings/android_webapk_strings.grd b/chromium/chrome/android/webapk/strings/android_webapk_strings.grd
index 4e4c13389a8..06a43b365bc 100644
--- a/chromium/chrome/android/webapk/strings/android_webapk_strings.grd
+++ b/chromium/chrome/android/webapk/strings/android_webapk_strings.grd
@@ -67,6 +67,7 @@
     <output filename="values-sl/android_webapk_strings.xml" lang="sl" type="android" />
     <output filename="values-sq/android_webapk_strings.xml" lang="sq" type="android" />
     <output filename="values-sr/android_webapk_strings.xml" lang="sr" type="android" />
+    <output filename="values-b+sr+Latn/android_webapk_strings.xml" lang="sr-Latn" type="android" />
     <output filename="values-sv/android_webapk_strings.xml" lang="sv" type="android" />
     <output filename="values-sw/android_webapk_strings.xml" lang="sw" type="android" />
     <output filename="values-ta/android_webapk_strings.xml" lang="ta" type="android" />
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-06 12:48:11 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-10-13 09:33:43 +0000
commit	7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch)
tree	fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/chrome/android
parent	79b4f909db1049fca459c07cca55af56a9b54fe3 (diff)
download	qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz