diff options
Diffstat (limited to 'chromium/chrome/android')
34 files changed, 685 insertions, 432 deletions
diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn index 2e9596b4a61..363ef7af63b 100644 --- a/chromium/chrome/android/BUILD.gn +++ b/chromium/chrome/android/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be +# Copyright 2014 The Chromium Authors. All rights reserved. # found in the LICENSE file. import("//build/android/resource_sizes.gni") @@ -88,15 +88,18 @@ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/an # Chosen to match what CQ bots exist. _enable_libs_and_assets_verification = - !is_component_build && + public_android_sdk && !is_component_build && ((target_cpu == "arm" && android_channel == "stable") || - (target_cpu == "arm64" && android_channel == "default")) + (target_cpu == "arm64" && android_channel == "default" && + # Disable checks in official arm64 builds due to unwind assets. + !is_official_build)) # 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" + !is_java_debug && !enable_chrome_android_internal && + android_channel == "stable" jinja_template("chrome_public_android_manifest") { input = "java/AndroidManifest.xml" @@ -184,10 +187,14 @@ android_resources("chrome_app_java_resources") { "//chrome/android/webapk/libs/common:splash_resources", "//chrome/app:java_strings_grd", "//chrome/browser/ui/android/appmenu:java_resources", + "//chrome/browser/ui/android/default_browser_promo:java_resources", "//chrome/browser/ui/android/favicon:java_resources", "//chrome/browser/ui/android/strings:ui_strings_grd", "//chrome/browser/ui/messages/android:java_resources", "//components/autofill/android:autofill_java_resources", + "//components/blocked_content/android:java_resources", + "//components/browser_ui/android/bottomsheet:java_resources", + "//components/browser_ui/http_auth/android:java_resources", "//components/browser_ui/modaldialog/android:java_resources", "//components/browser_ui/settings/android:java_resources", "//components/browser_ui/strings/android:browser_ui_strings_grd", @@ -201,6 +208,7 @@ android_resources("chrome_app_java_resources") { "//components/policy:app_restrictions_resources", "//components/strings:components_locale_settings_grd", "//components/strings:components_strings_grd", + "//components/translate/content/android:java_resources", "//content/public/android:content_java_resources", "//third_party/android_data_chart:android_data_chart_java_resources", "//third_party/android_deps:android_support_v7_appcompat_java", @@ -218,8 +226,6 @@ if (enable_vr) { # the VR resurces to chrome_app_java_resources. android_resources("chrome_vr_java_resources") { sources = [ - "//chrome/android/java/res_vr/drawable-nodpi/daydream_icon_background.png", - "//chrome/android/java/res_vr/drawable-nodpi/daydream_icon_foreground.png", "//chrome/android/java/res_vr/values-v17/styles.xml", "//chrome/android/java/res_vr/values-vrheadset-v26/styles.xml", "//chrome/android/java/res_vr/values/values.xml", @@ -228,15 +234,6 @@ if (enable_vr) { } } -# TODO (crbug/1058764) Unfork credential leak dialog password change when prototype is done. -if (enable_password_change_in_leaked_dialog) { - android_resources("password_change_resources") { - sources = [ "//chrome/android/java/res_password_change/layout/password_manager_dialog_with_help_button_password_change.xml" ] - deps = [ ":chrome_app_java_resources" ] - custom_package = "org.chromium.chrome.password_change" - } -} - # TODO(chouinard): Remove this wrapper target after downstream dependencies on it are replaced. android_resources("chrome_download_java_resources") { sources = [] @@ -303,11 +300,14 @@ android_library("chrome_java") { "//chrome/browser/android/lifecycle:java", "//chrome/browser/android/thin_webview:factory_java", "//chrome/browser/android/thin_webview:java", + "//chrome/browser/browser_controls/android:java", + "//chrome/browser/contextmenu: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/fullscreen/android:java", "//chrome/browser/image_editor/public:java", "//chrome/browser/image_fetcher:java", "//chrome/browser/notifications/chime/android:java", @@ -316,13 +316,17 @@ android_library("chrome_java") { "//chrome/browser/performance_hints/android:java", "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", + "//chrome/browser/safe_browsing/android:java", + "//chrome/browser/safety_check/android:java", "//chrome/browser/settings:java", "//chrome/browser/share/android:java_resources", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel: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/default_browser_promo:java", "//chrome/browser/ui/android/favicon:java", "//chrome/browser/ui/android/native_page:java", "//chrome/browser/ui/messages/android:java", @@ -333,13 +337,20 @@ 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:factory_java", "//components/browser_ui/android/bottomsheet:java", + "//components/browser_ui/android/bottomsheet:manager_java", + "//components/browser_ui/client_certificate/android:java", + "//components/browser_ui/http_auth/android:java", + "//components/browser_ui/media/android:java", "//components/browser_ui/modaldialog/android:java", "//components/browser_ui/notifications/android:java", "//components/browser_ui/settings/android:java", + "//components/browser_ui/share/android:java", "//components/browser_ui/site_settings/android:java", "//components/browser_ui/styles/android:java", "//components/browser_ui/util/android:java", + "//components/browser_ui/webshare/android:java", "//components/browser_ui/widget/android:java", "//components/content_capture/android:java", "//components/content_settings/android:content_settings_enums_java", @@ -367,6 +378,7 @@ android_library("chrome_java") { "//components/find_in_page/android:java", "//components/gcm_driver/android:gcm_driver_java", "//components/gcm_driver/instance_id/android:instance_id_driver_java", + "//components/infobars/android:java", "//components/infobars/core:infobar_enums_java", "//components/javascript_dialogs/android:java", "//components/language/android:language_bridge_java", @@ -385,6 +397,7 @@ android_library("chrome_java") { "//components/payments/mojom:mojom_java", "//components/permissions/android:java", "//components/policy/android:policy_java", + "//components/prefs/android:java", "//components/query_tiles:java", "//components/safe_browsing/android:safe_browsing_java", "//components/schema_org/common:mojom_java", @@ -399,10 +412,13 @@ android_library("chrome_java") { "//components/sync/android:sync_java", "//components/sync/protocol:protocol_java", "//components/url_formatter/android:url_formatter_java", + "//components/user_prefs/android:java", "//components/variations/android:variations_java", "//components/version_info/android:version_constants_java", "//components/viz/common:common_java", "//components/viz/service:service_java", + "//components/webapk/android/libs/client:java", + "//components/webapk/android/libs/common:java", "//components/webrtc/android:java", "//content/public/android:content_java", "//device/gamepad:java", @@ -429,6 +445,7 @@ android_library("chrome_java") { "//third_party/android_data_chart:android_data_chart_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_deps:androidx_collection_collection_java", "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java", "//third_party/android_deps:androidx_core_core_java", @@ -479,15 +496,14 @@ android_library("chrome_java") { ":sync_user_settings_enums_java", ":vr_build_config", "//chrome:assist_ranker_prediction_enum_javagen", - "//chrome:context_menu_image_format_enum_javagen", "//chrome:instant_apps_reasons_enum_javagen", "//chrome:offline_pages_enum_javagen", "//chrome:partner_bookmarks_javagen", - "//chrome:payments_journey_logger_enum_javagen", "//chrome:quick_action_category_enum_javagen", "//chrome:supervised_user_url_filter_enum_javagen", "//chrome/browser:sharing_dialog_type_generated_enum", "//chrome/browser:sharing_send_message_result_generated_enum", + "//chrome/browser/net:secure_dns_management_mode_generated_enum", "//chrome/browser/notifications/scheduler/public:jni_enums", "//chrome/browser/supervised_user/supervised_user_error_page:enums_srcjar", "//chrome/browser/updates/announcement_notification:jni_enums", @@ -507,6 +523,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//content/public/browser:contacts_picker_properties_requested_javagen", "//net:effective_connection_type_java", + "//net/dns:secure_dns_mode_generated_enum", ] # From java_sources.gni. @@ -528,9 +545,6 @@ android_library("chrome_java") { deps += [ ":chrome_vr_java_resources" ] } - if (enable_password_change_in_leaked_dialog) { - deps += [ ":password_change_resources" ] - } srcjar_deps += [ ":chrome_vr_android_java_enums_srcjar" ] if (enable_feed_in_chrome) { deps += [ "//chrome/android/feed:chrome_feed_java_resources" ] @@ -554,9 +568,6 @@ 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") { @@ -575,6 +586,7 @@ java_group("chrome_all_java") { "//chrome/browser/test_dummy/internal:base_module_java", "//chrome/browser/touch_to_fill/android/internal:java", "//chrome/browser/ui/android/appmenu/internal:java", + "//components/browser_ui/android/bottomsheet/internal:java", ] if (disable_autofill_assistant_dfm) { @@ -646,6 +658,7 @@ java_cpp_enum("chrome_android_java_enums_srcjar") { "//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/installable/installed_webapp_geolocation_bridge.cc", "//chrome/browser/notifications/notification_channels_provider_android.h", "//chrome/browser/notifications/notification_handler.h", "//chrome/browser/notifications/notification_platform_bridge_android.cc", @@ -659,7 +672,6 @@ java_cpp_enum("chrome_vr_android_java_enums_srcjar") { sources = [ "//chrome/browser/android/vr/vr_core_info.h", "//chrome/browser/android/vr/vr_shell_delegate.h", - "//chrome/browser/vr/metrics/consent_flow_metrics_helper.h", "//chrome/browser/vr/text_edit_action.h", "//chrome/browser/vr/ui_test_input.h", "//chrome/browser/vr/ui_unsupported_mode.h", @@ -695,6 +707,7 @@ java_cpp_template("resource_id_javagen") { package_path = "org/chromium/chrome/browser/resources" inputs = [ "../browser/android/resource_id.h", + "//components/resources/android/blocked_content_resource_id.h", "//components/resources/android/page_info_resource_id.h", "//components/resources/android/permissions_resource_id.h", ] @@ -723,55 +736,119 @@ junit_binary("chrome_junit_tests") { "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", + "//base:jni_java", + "//chrome/android:update_proto_java", + "//chrome/android:usage_stats_proto_java", "//chrome/android/features/keyboard_accessory:internal_java", + "//chrome/android/features/start_surface/internal:java", "//chrome/android/features/tab_ui:java", "//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/common:common_java", + "//chrome/android/webapk/libs/common:splash_java", "//chrome/android/webapk/test:junit_test_support", + "//chrome/browser/android/lifecycle:java", + "//chrome/browser/browser_controls/android:java", + "//chrome/browser/browser_controls/android:junit", + "//chrome/browser/download/android:java", + "//chrome/browser/download/android:junit_tests", "//chrome/browser/flags:flags_junit_tests", + "//chrome/browser/flags:java", + "//chrome/browser/fullscreen/android:java", "//chrome/browser/image_fetcher:java", "//chrome/browser/optimization_guide/android:junit_tests", + "//chrome/browser/performance_hints/android:java", + "//chrome/browser/preferences:java", "//chrome/browser/preferences:preferences_junit_tests", + "//chrome/browser/profiles/android:java", + "//chrome/browser/safety_check/android:java", + "//chrome/browser/safety_check/android:junit", + "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/thumbnail:java", + "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/appmenu/internal:junit", + "//chrome/browser/ui/android/default_browser_promo:java", + "//chrome/browser/ui/android/default_browser_promo:junit", + "//chrome/browser/ui/android/favicon:java", + "//chrome/browser/ui/android/native_page:java", + "//chrome/browser/ui/messages/android:java", "//chrome/browser/ui/messages/android:junit", + "//chrome/browser/util:java", + "//chrome/browser/xsurface:java", "//chrome/test/android:chrome_java_test_support", "//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/util/android:junit", - "//components/browser_ui/widget/android:junit", + "//components/browser_ui/android/bottomsheet:java", + "//components/browser_ui/media/android:java", + "//components/browser_ui/notifications/android:java", + "//components/browser_ui/share/android:java", + "//components/browser_ui/site_settings/android:java", + "//components/browser_ui/util/android:java", + "//components/browser_ui/widget/android:java", + "//components/content_settings/android:content_settings_enums_java", + "//components/dom_distiller/core/android:dom_distiller_core_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:junit_test_support", + "//components/embedder_support/android:util_java", + "//components/feature_engagement/public:public_java", + "//components/feed/core/proto:proto_java", + "//components/feed/core/proto:proto_java_v2", "//components/minidump_uploader:minidump_uploader_java", "//components/module_installer/android:module_installer_java", "//components/offline_items_collection/core:core_java", + "//components/omnibox/browser:browser_java", "//components/page_info/android:java", "//components/payments/content/android:java", "//components/payments/mojom:mojom_java", + "//components/prefs/android:java", "//components/schema_org/common:mojom_java", + "//components/search_engines/android:java", + "//components/security_state/content/android:java", + "//components/security_state/core:security_state_enums_java", "//components/signin/core/browser/android:java", "//components/signin/core/browser/android:signin_java_test_support", + "//components/signin/public/android:java", "//components/sync:sync_java_test_support", "//components/sync/android:sync_java", "//components/url_formatter/android:url_formatter_java", "//components/variations/android:variations_java", + "//components/version_info/android:version_constants_java", + "//components/webapk/android/libs/client:java", + "//components/webapk/android/libs/common:java", "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", "//mojo/public/java:bindings_java", "//mojo/public/java:system_java", "//net/android:net_java", "//services/media_session/public/cpp/android:media_session_java", + "//services/media_session/public/mojom:mojom_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_collection_collection_java", "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java", "//third_party/android_deps:androidx_mediarouter_mediarouter_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java", + "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java", + "//third_party/android_deps:androidx_test_core_java", + "//third_party/android_deps:com_google_dagger_dagger_java", + "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java", "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java", "//third_party/android_sdk/androidx_browser:androidx_browser_java", "//third_party/blink/public:blink_headers_java", "//third_party/blink/public/mojom:android_mojo_bindings_java", + "//third_party/blink/public/mojom:mojom_platform_java", "//third_party/cacheinvalidation:cacheinvalidation_javalib", + "//third_party/gif_player:gif_player_java", "//third_party/google-truth:google_truth_java", + "//third_party/guava:guava_android_java", "//third_party/hamcrest:hamcrest_java", "//ui/android:ui_java", + "//ui/base/mojom:mojom_java", + "//url:gurl_java", + "//url:origin_java", "//url/mojom:url_mojom_gurl_java", ] @@ -812,10 +889,10 @@ android_library("chrome_test_util_java") { "//content/public/test/android:content_java_test_support", "//net/android:net_java_test_support", "//third_party/android_deps:android_support_v4_java", + "//third_party/android_deps:espresso_java", "//third_party/android_media:android_media_resources", "//third_party/android_sdk/androidx_browser:androidx_browser_java", "//third_party/android_support_test_runner:runner_java", - "//third_party/espresso:espresso_all_java", "//third_party/junit:junit", ] } @@ -853,26 +930,34 @@ android_library("chrome_test_java") { "//chrome/android/webapk/libs/common:common_java", "//chrome/browser/android/crypto:java", "//chrome/browser/android/lifecycle:java", - "//chrome/browser/android/metrics:ukm_java_test_support", - "//chrome/browser/android/metrics:ukm_javatests", + "//chrome/browser/browser_controls/android:java", "//chrome/browser/download/android:java", "//chrome/browser/enterprise/util:java", "//chrome/browser/flags:java", + "//chrome/browser/fullscreen/android:java", + "//chrome/browser/offline_pages/android:java", "//chrome/browser/password_manager/android_test_helpers:test_support_java", "//chrome/browser/performance_hints/android:java", "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", + "//chrome/browser/safety_check/android:java", "//chrome/browser/settings:java", "//chrome/browser/settings:javatests", + "//chrome/browser/settings:test_support_java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/thumbnail:java", "//chrome/browser/thumbnail:javatests", "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/appmenu/test:test_support_java", + "//chrome/browser/ui/android/default_browser_promo:java", + "//chrome/browser/ui/android/default_browser_promo:javatests", "//chrome/browser/ui/android/favicon:java", + "//chrome/browser/ui/android/native_page:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", "//chrome/test:sync_integration_test_support_java", + "//chrome/test/android:chrome_java_test_pagecontroller", "//chrome/test/android:chrome_java_test_support", "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java", "//components/autofill/android:autofill_java", @@ -881,15 +966,23 @@ android_library("chrome_test_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/android/bottomsheet/test:java", "//components/browser_ui/modaldialog/android:java", "//components/browser_ui/modaldialog/android:javatests", + "//components/browser_ui/notifications/android:java", + "//components/browser_ui/notifications/android:test_support_java", "//components/browser_ui/settings/android:java", + "//components/browser_ui/share/android:java", + "//components/browser_ui/share/android:javatests", + "//components/browser_ui/site_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", "//components/browser_ui/widget/android:javatests", "//components/browser_ui/widget/android:test_support_java", + "//components/content_settings/android:content_settings_enums_java", + "//components/content_settings/android:java", "//components/crash/android:java", "//components/dom_distiller/core/android:dom_distiller_core_java", "//components/dom_distiller/core/mojom:mojom_java", @@ -908,6 +1001,8 @@ android_library("chrome_test_java") { "//components/gcm_driver/android:gcm_driver_java", "//components/gcm_driver/instance_id/android:instance_id_driver_java", "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java", + "//components/infobars/android:java", + "//components/infobars/android:javatests", "//components/infobars/core:infobar_enums_java", "//components/javascript_dialogs/android:java", "//components/location/android:location_java", @@ -919,12 +1014,14 @@ android_library("chrome_test_java") { "//components/offline_pages/core/prefetch:offline_prefetch_proto_java", "//components/omnibox/browser:browser_java", "//components/page_info/android:java", + "//components/page_info/android:page_info_action_enum_java", "//components/paint_preview/player/android:javatests", "//components/payments/content/android:java", "//components/payments/mojom:mojom_java", "//components/permissions/android:java", "//components/policy/android:policy_java", "//components/policy/android:policy_java_test_support", + "//components/prefs/android:java", "//components/query_tiles:public_java", "//components/query_tiles:test_support_java", "//components/safe_browsing/android:safe_browsing_java", @@ -941,6 +1038,8 @@ android_library("chrome_test_java") { "//components/sync/android:sync_javatests", "//components/sync/protocol:protocol_java", "//components/url_formatter/android:url_formatter_java", + "//components/user_prefs/android:java", + "//components/webapk/android/libs/client:java", "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", "//media/base/android:java_switches", @@ -959,10 +1058,13 @@ android_library("chrome_test_java") { "//third_party/android_data_chart:android_data_chart_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_deps:androidx_collection_collection_java", "//third_party/android_deps:androidx_lifecycle_lifecycle_common_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", + "//url:origin_java", # TODO (bjoyce): Remove recyclerview_v7 when espresso tests are migrated # to androidx. @@ -970,6 +1072,7 @@ android_library("chrome_test_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_deps:espresso_java", "//third_party/android_sdk:android_test_base_java", "//third_party/android_sdk:android_test_mock_java", "//third_party/android_sdk:android_test_runner_java", @@ -981,7 +1084,6 @@ android_library("chrome_test_java") { "//third_party/blink/public/mojom:mojom_mhtml_load_result_java", "//third_party/blink/public/mojom:mojom_platform_java", "//third_party/cacheinvalidation:cacheinvalidation_javalib", - "//third_party/espresso:espresso_all_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/mockito:mockito_java", @@ -1023,9 +1125,12 @@ android_library("chrome_test_java") { "//components/test/data/payments/", "//content/test/data/browsing_data/", "//content/test/data/android/authenticator.html", + "//content/test/data/android/auto_downloads_permissions.html", + "//content/test/data/android/eme_permissions.html", "//content/test/data/android/geolocation.html", "//content/test/data/android/installedapp.html", "//content/test/data/android/media_permissions.html", + "//content/test/data/android/midi_permissions.html", "//content/test/data/android/permission_navigation.html", "//content/test/data/android/quota_permissions.html", "//content/test/data/android/webshare.html", @@ -1121,55 +1226,47 @@ if (enable_vr || enable_arcore) { sources = [ "javatests/src/org/chromium/chrome/browser/vr/EmulatedVrController.java", "javatests/src/org/chromium/chrome/browser/vr/TestVrShellDelegate.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserCompositorViewHolderTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserControllerInputTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserDialogTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserNativeUiTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserNavigationTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserTestFramework.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserTransitionTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrBrowserWebInputEditingTest.java", "javatests/src/org/chromium/chrome/browser/vr/VrDaydreamReadyModuleInstallTest.java", - "javatests/src/org/chromium/chrome/browser/vr/VrFeedbackInfoBarTest.java", "javatests/src/org/chromium/chrome/browser/vr/VrInstallUpdateInfoBarTest.java", - "javatests/src/org/chromium/chrome/browser/vr/WebXrVrConsentTest.java", - "javatests/src/org/chromium/chrome/browser/vr/WebXrVrConsentTestFramework.java", "javatests/src/org/chromium/chrome/browser/vr/WebXrVrDeviceTest.java", "javatests/src/org/chromium/chrome/browser/vr/WebXrVrInputTest.java", + "javatests/src/org/chromium/chrome/browser/vr/WebXrVrPermissionTest.java", + "javatests/src/org/chromium/chrome/browser/vr/WebXrVrPermissionTestFramework.java", "javatests/src/org/chromium/chrome/browser/vr/WebXrVrTabTest.java", "javatests/src/org/chromium/chrome/browser/vr/WebXrVrTestFramework.java", "javatests/src/org/chromium/chrome/browser/vr/WebXrVrTransitionTest.java", - "javatests/src/org/chromium/chrome/browser/vr/jsdialog/VrBrowserJavaScriptModalDialogTest.java", "javatests/src/org/chromium/chrome/browser/vr/mock/MockBrowserKeyboardInterface.java", "javatests/src/org/chromium/chrome/browser/vr/mock/MockVrCoreVersionChecker.java", "javatests/src/org/chromium/chrome/browser/vr/mock/MockVrDaydreamApi.java", - "javatests/src/org/chromium/chrome/browser/vr/nfc_apk/SimNfcActivity.java", "javatests/src/org/chromium/chrome/browser/vr/rules/ChromeTabbedActivityVrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr/rules/CustomTabActivityVrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr/rules/VrActivityRestrictionRule.java", "javatests/src/org/chromium/chrome/browser/vr/rules/VrModuleNotInstalled.java", - "javatests/src/org/chromium/chrome/browser/vr/rules/VrSettingsFile.java", "javatests/src/org/chromium/chrome/browser/vr/rules/VrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr/rules/WebappActivityVrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr/util/NativeUiUtils.java", - "javatests/src/org/chromium/chrome/browser/vr/util/NfcSimUtils.java", "javatests/src/org/chromium/chrome/browser/vr/util/RenderTestUtils.java", - "javatests/src/org/chromium/chrome/browser/vr/util/VrBrowserTransitionUtils.java", "javatests/src/org/chromium/chrome/browser/vr/util/VrInfoBarUtils.java", - "javatests/src/org/chromium/chrome/browser/vr/util/VrSettingsServiceUtils.java", "javatests/src/org/chromium/chrome/browser/vr/util/VrShellDelegateUtils.java", "javatests/src/org/chromium/chrome/browser/vr/util/VrTestRuleUtils.java", "javatests/src/org/chromium/chrome/browser/vr/util/VrTransitionUtils.java", ] - deps = chrome_test_xr_java_deps + [ - ":chrome_test_util_java", - "//chrome/android:chrome_test_xr_java", - "//components/module_installer/android:module_installer_java", - "//third_party/gvr-android-sdk:controller_test_api_java", - "//third_party/gvr-android-sdk:gvr_common_java", - "//ui/android:ui_java_test_support", - ] + deps = + chrome_test_xr_java_deps + [ + ":chrome_test_util_java", + "//chrome/android:chrome_test_xr_java", + "//components/module_installer/android:module_installer_java", + "//components/browser_ui/site_settings/android:java", + "//components/content_settings/android:content_settings_enums_java", + "//chrome/browser/profiles/android:java", + "//chrome/browser/settings:java", + "//chrome/browser/tabmodel:java", + + "//third_party/gvr-android-sdk:controller_test_api_java", + "//third_party/gvr-android-sdk:gvr_common_java", + "//ui/android:ui_java_test_support", + ] data = [ "//chrome/android/shared_preference_files/test/", @@ -1289,18 +1386,38 @@ jinja_template_resources("chrome_test_apk_template_resources") { } # Chrome APK's native library. -chrome_common_shared_library("libchrome") { - sources = [ - "../browser/android/chrome_entry_point.cc", - chrome_jni_registration_header, - ] - deps = [ ":chrome_jni_registration($default_toolchain)" ] +template("libchrome_impl") { + chrome_common_shared_library(target_name) { + sources = [ + "../browser/android/chrome_entry_point.cc", + chrome_jni_registration_header, + ] + deps = [ ":chrome_jni_registration($default_toolchain)" ] + if (defined(invoker.deps)) { + deps += invoker.deps + } - if (enable_vr) { - deps += [ "//chrome/browser/android/vr:module_factory" ] + if (enable_vr) { + deps += [ "//chrome/browser/android/vr:module_factory" ] + } + + module_descs = chrome_modern_module_descs + forward_variables_from(invoker, "*", [ "deps" ]) } +} - module_descs = chrome_modern_module_descs +if (enable_resource_whitelist_generation) { + libchrome_impl("libchrome_pak_whitelist_inputs") { + collect_inputs_only = true + } +} + +libchrome_impl("libchrome") { + if (enable_resource_whitelist_generation) { + # Make sure whitelist_inputs is built first so when concurrent_links == 1 + # it comes before the actual (very slow) link step. + deps = [ ":libchrome_pak_whitelist_inputs" ] + } } chrome_common_shared_library("libchromefortest") { @@ -1314,7 +1431,6 @@ chrome_common_shared_library("libchromefortest") { ":chrome_jni_for_test_registration($default_toolchain)", "//base/test:test_support", "//chrome:chrome_android_core", - "//chrome/browser/android/metrics:ukm_utils_for_test", "//chrome/browser/password_manager/android_test_helpers:android_wrappers", "//chrome/browser/subresource_filter:test_support", "//components/autofill_assistant/browser:test_support", @@ -1388,9 +1504,9 @@ if (current_toolchain == default_toolchain) { if (enable_resource_whitelist_generation) { if (_is_trichrome || _is_monochrome) { - _lib = "libmonochrome" + _lib = "libmonochrome_pak_whitelist_inputs" } else { - _lib = "libchrome" + _lib = "libchrome_pak_whitelist_inputs" } _resource_whitelist_target = "${_variant}_resource_whitelist" _resource_whitelist_file = @@ -1576,13 +1692,15 @@ if (current_toolchain == default_toolchain) { # Monochrome equivalent of Chrome's APK or bundle library template. template("libmonochrome_apk_or_bundle_tmpl") { chrome_common_shared_library(target_name) { - forward_variables_from(invoker, "*") sources = [ "../browser/android/monochrome_entry_point.cc" ] deps = [ "//android_webview/lib", "//android_webview/nonembedded", "//components/crash/android:crashpad_main", ] + if (defined(invoker.deps)) { + deps += invoker.deps + } if (webview_includes_weblayer) { defines = [ "WEBVIEW_INCLUDES_WEBLAYER" ] @@ -1595,13 +1713,26 @@ template("libmonochrome_apk_or_bundle_tmpl") { is_monochrome = true module_descs = monochrome_module_descs + + forward_variables_from(invoker, "*", [ "deps" ]) } } if (!android_64bit_target_cpu || current_toolchain == android_secondary_abi_toolchain) { - # Monochrome APK native library. + if (enable_resource_whitelist_generation) { + # Avoiding a real link for this step allows the actual libmonochrome to + # run at the same time as R8. + libmonochrome_apk_or_bundle_tmpl("libmonochrome_pak_whitelist_inputs") { + collect_inputs_only = true + } + } libmonochrome_apk_or_bundle_tmpl("libmonochrome") { + if (enable_resource_whitelist_generation) { + # Make sure whitelist_inputs is built first so when concurrent_links == 1 + # it comes before the actual (very slow) link step. + deps = [ ":libmonochrome_pak_whitelist_inputs" ] + } } if (android_64bit_target_cpu) { @@ -1639,7 +1770,6 @@ java_group("chrome_public_base_module_java_for_test") { ":browser_java_test_support", ":chrome_public_base_module_java", "//chrome/android/features/autofill_assistant:autofill_assistant_java_test_support", - "//chrome/browser/android/metrics:ukm_java_test_support", "//chrome/browser/password_manager/android_test_helpers:test_support_java", "//chrome/browser/subresource_filter:subresource_filter_java_test_support", "//chrome/browser/thumbnail:thumbnail_java_test_support", @@ -1665,7 +1795,7 @@ generate_jni("test_support_jni_headers") { "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java", "javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java", "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java", - "javatests/src/org/chromium/chrome/browser/prerender/PrerenderTestHelper.java", + "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileFakeServer.java", "javatests/src/org/chromium/chrome/browser/test/MockCertVerifierRuleAndroid.java", ] } @@ -1677,7 +1807,7 @@ android_library("browser_java_test_support") { "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java", "javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java", "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java", - "javatests/src/org/chromium/chrome/browser/prerender/PrerenderTestHelper.java", + "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileFakeServer.java", "javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java", "javatests/src/org/chromium/chrome/browser/test/MockCertVerifierRuleAndroid.java", ] @@ -1705,14 +1835,17 @@ static_library("browser_test_support") { "../browser/android/ssl/mock_cert_verifier_rule_android.h", "../browser/offline_pages/android/offline_test_util_jni.cc", "../browser/offline_pages/android/prefetch_test_bridge.cc", - "../browser/prerender/prerender_test_helper.cc", + "../browser/query_tiles/query_tile_fake_server.cc", ] deps = [ ":test_support_jni_headers", "//chrome/browser", "//chrome/browser/thumbnail:test_support", "//components/offline_pages/core/background:test_support", + "//components/query_tiles", + "//components/query_tiles/test:test_support", "//content/test:test_support", + "//net:test_support", ] } @@ -1745,6 +1878,8 @@ template("chrome_public_apk_or_module_tmpl") { "is_modern", "target_type", "enable_multidex", + "lint_suppressions_dep", + "lint_suppressions_file", # TODO(crbug.com/1076896): remove # "disable_library_rename" when we remove chrome @@ -1893,11 +2028,11 @@ template("monochrome_public_apk_or_module_tmpl") { [ "apk_name", "bundle_target", + "expected_android_manifest", "include_32_bit_webview", "include_64_bit_webview", "is_64_bit_browser", "is_base_module", - "proguard_jar_path", "resource_ids_provider_dep", "static_library_provider", "static_library_synchronized_proguard", @@ -1905,7 +2040,6 @@ template("monochrome_public_apk_or_module_tmpl") { "use_chromium_linker", "use_modern_linker", "use_trichrome_library", - "verify_manifest", "version_code", "version_name", ]) @@ -1969,8 +2103,13 @@ trichrome_library_apk_tmpl("trichrome_library_apk") { chrome_target = ":trichrome_chrome_bundle" } - verify_manifest = _enable_manifest_verification - verify_native_libs_and_assets = _enable_libs_and_assets_verification + if (_enable_manifest_verification) { + expected_android_manifest = + "expectations/trichrome_library_apk.AndroidManifest.expected" + } + if (_enable_libs_and_assets_verification) { + expected_libs_and_assets = "expectations/trichrome_library_apk.$target_cpu.libs_and_assets.expected" + } } if (android_64bit_target_cpu) { @@ -2012,8 +2151,6 @@ chrome_public_test_vr_apk_manifest = "$root_gen_dir/chrome_public_test_vr_apk_manifest/AndroidManifest.xml" monochrome_public_test_ar_apk_manifest = "$root_gen_dir/monochrome_public_test_ar_apk_manifest/AndroidManifest.xml" -vr_nfc_simulator_apk_manifest = - "$root_gen_dir/vr_nfc_simulator_apk_manifest/AndroidManifest.xml" jinja_template("chrome_public_test_apk_manifest") { input = "javatests/AndroidManifest.xml" @@ -2057,13 +2194,6 @@ jinja_template("monochrome_public_test_ar_apk_manifest") { ] } -jinja_template("vr_nfc_simulator_apk_manifest") { - input = - "javatests/src/org/chromium/chrome/browser/vr/nfc_apk/AndroidManifest.xml" - output = vr_nfc_simulator_apk_manifest - variables = chrome_public_jinja_variables -} - template("chrome_test_apk_tmpl") { chrome_public_common_apk_or_module_tmpl(target_name) { forward_variables_from(invoker, @@ -2212,18 +2342,6 @@ if (enable_vr) { module_name = "vr" load_native_on_get_impl = false } - - android_apk("vr_nfc_simulator_apk") { - testonly = true - apk_name = "VrNfcSimulator" - android_manifest = vr_nfc_simulator_apk_manifest - android_manifest_dep = ":vr_nfc_simulator_apk_manifest" - min_sdk_version = 24 - target_sdk_version = 24 - - deps = [ ":chrome_test_vr_java" ] - proguard_enabled = false - } } if (enable_arcore) { @@ -2472,7 +2590,9 @@ chrome_bundle("chrome_modern_public_bundle") { module_descs = chrome_modern_module_descs version_code = chrome_modern_version_code - verify_native_libs_and_assets = _enable_libs_and_assets_verification + if (_enable_libs_and_assets_verification) { + expected_libs_and_assets = "expectations/chrome_modern_public_bundle.$target_cpu.libs_and_assets.expected" + } } if (is_official_build) { @@ -2546,6 +2666,7 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { monochrome_public_apk_or_module_tmpl(_base_module_target_name) { forward_variables_from(invoker, [ + "expected_android_manifest", "is_64_bit_browser", "include_32_bit_webview", "include_64_bit_webview", @@ -2553,7 +2674,6 @@ 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 @@ -2574,8 +2694,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", + "expected_libs_and_assets", + "expected_proguard_config", ]) base_module_target = ":$_base_module_target_name" bundle_name = _bundle_name @@ -2602,10 +2722,14 @@ if (public_android_sdk) { include_64_bit_webview = 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 + if (_enable_manifest_verification) { + expected_android_manifest = + "expectations/monochrome_public_bundle.AndroidManifest.expected" + expected_proguard_config = + "expectations/monochrome_public_bundle.proguard_flags.expected" + } + if (_enable_libs_and_assets_verification) { + expected_libs_and_assets = "expectations/monochrome_public_bundle.$target_cpu.libs_and_assets.expected" } } @@ -2637,8 +2761,46 @@ if (public_android_sdk) { include_64_bit_webview = true } - verify_manifest = _enable_manifest_verification - verify_native_libs_and_assets = _enable_libs_and_assets_verification + if (_enable_manifest_verification) { + expected_android_manifest = + "expectations/trichrome_chrome_bundle.AndroidManifest.expected" + } + if (_enable_libs_and_assets_verification) { + expected_libs_and_assets = "expectations/trichrome_chrome_bundle.$target_cpu.libs_and_assets.expected" + } + } + + if (is_official_build) { + _trichrome_library_basename = "TrichromeLibrary.apk" + _trichrome_chrome_basename = "TrichromeChrome.minimal.apks" + _trichrome_webview_basename = "TrichromeWebView.minimal.apks" + + write_ssargs_trichrome("ssargs_trichrome") { + ssargs_path = "$root_build_dir/apks/Trichrome.ssargs" + trichrome_library_basename = _trichrome_library_basename + trichrome_chrome_basename = _trichrome_chrome_basename + trichrome_webview_basename = _trichrome_webview_basename + } + + # Used for binary size monitoring. + create_app_bundle_minimal_apks("trichrome_chrome_minimal_apks") { + deps = [ ":trichrome_chrome_bundle" ] + bundle_path = "$root_build_dir/apks/TrichromeChrome.aab" + } + + android_resource_sizes_test("resource_sizes_trichrome") { + apk_name = "Trichrome" + trichrome_library_path = + "$root_build_dir/apks/$_trichrome_library_basename" + trichrome_chrome_path = "$root_build_dir/apks/$_trichrome_chrome_basename" + trichrome_webview_path = + "$root_build_dir/apks/$_trichrome_webview_basename" + data_deps = [ + ":trichrome_chrome_minimal_apks", + ":trichrome_library_apk", + "//android_webview:trichrome_webview_minimal_apks", + ] + } } if (android_64bit_target_cpu) { @@ -2702,7 +2864,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/IntentHeadersRecorder.java", "java/src/org/chromium/chrome/browser/IntentHelper.java", "java/src/org/chromium/chrome/browser/NearOomMonitor.java", - "java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java", "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java", "java/src/org/chromium/chrome/browser/ServiceTabLauncher.java", "java/src/org/chromium/chrome/browser/ShortcutHelper.java", @@ -2711,6 +2872,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridge.java", "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java", "java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java", + "java/src/org/chromium/chrome/browser/app/tab_activity_glue/ReparentingTask.java", "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java", "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java", "java/src/org/chromium/chrome/browser/autofill/AutofillNameFixFlowBridge.java", @@ -2730,6 +2892,7 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java", "java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java", "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java", + "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappGeolocationBridge.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/UrlFilterBridge.java", @@ -2914,7 +3077,6 @@ generate_jni("chrome_jni_headers") { "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", - "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java", "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java", @@ -2935,7 +3097,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java", "java/src/org/chromium/chrome/browser/signin/SigninUtils.java", "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/sms/SmsReceiverInfoBar.java", "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java", @@ -2947,10 +3108,9 @@ generate_jni("chrome_jni_headers") { "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", - "java/src/org/chromium/chrome/browser/tab/TabState.java", - "java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java", + "java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroidImpl.java", "java/src/org/chromium/chrome/browser/tab/TrustedCdn.java", - "java/src/org/chromium/chrome/browser/tab_activity_glue/ReparentingTask.java", + "java/src/org/chromium/chrome/browser/tab/WebContentsStateBridge.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java", "java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java", @@ -2969,6 +3129,7 @@ generate_jni("chrome_jni_headers") { "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", + "java/src/org/chromium/chrome/browser/webauth/Fido2Helper.java", ] # Used for testing only, should not be shipped to end users. @@ -2994,10 +3155,6 @@ generate_jni("chrome_jni_headers") { if (enable_vr) { sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ] } - - if (enable_password_change_in_leaked_dialog) { - sources += [ "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogPasswordChangeBridge.java" ] - } } native_java_unittests_tests = [ @@ -3006,6 +3163,8 @@ native_java_unittests_tests = [ "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/DropdownItemViewInfoListBuilderUnitTest.java", + "native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManagerUnitTest.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", @@ -3034,16 +3193,21 @@ android_library("native_java_unittests_java") { "//base:jni_java", "//base/test:test_support_java", "//chrome/android:chrome_java", + "//chrome/browser/contextmenu:java", "//chrome/browser/flags:java", "//chrome/browser/image_fetcher:java", + "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", + "//chrome/browser/ui/android/favicon: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/payments/mojom:mojom_java", "//components/query_tiles:java", "//components/search_engines/android:java", "//components/security_state/content/android:java", @@ -3051,6 +3215,7 @@ android_library("native_java_unittests_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:androidx_collection_collection_java", "//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", @@ -3080,3 +3245,26 @@ generate_jni("native_j_unittests_jni_headers") { sources = native_java_unittests_tests feature_list_file = "//chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java" } + +# Used by android-binary-size trybot to know which expectations to validate. +group("validate_expectations") { + deps = [] + if (_enable_libs_and_assets_verification) { + deps += [ + ":chrome_modern_public_bundle_validate_libs_and_assets", + ":monochrome_public_bundle_validate_libs_and_assets", + ":trichrome_chrome_bundle_validate_libs_and_assets", + ":trichrome_library_apk_validate_libs_and_assets", + ] + } + if (_enable_manifest_verification) { + deps += [ + ":monochrome_public_bundle__base_bundle_module_validate_android_manifest", + ":monochrome_public_bundle_validate_proguard_config", + ":trichrome_chrome_bundle__base_bundle_module_validate_android_manifest", + ":trichrome_library_apk_validate_android_manifest", + "//android_webview:system_webview_base_bundle_module_validate_android_manifest", + "//android_webview:trichrome_webview_base_bundle_module_validate_android_manifest", + ] + } +} diff --git a/chromium/chrome/android/chrome_common_shared_library.gni b/chromium/chrome/android/chrome_common_shared_library.gni index 2eba08fe40d..0887d6f9a0a 100644 --- a/chromium/chrome/android/chrome_common_shared_library.gni +++ b/chromium/chrome/android/chrome_common_shared_library.gni @@ -33,28 +33,36 @@ template("chrome_common_shared_library") { _is_monochrome = defined(invoker.is_monochrome) && invoker.is_monochrome _is_webview = defined(invoker.is_webview) && invoker.is_webview _export_java_symbols = _is_monochrome || _is_webview + _collect_inputs_only = + defined(invoker.collect_inputs_only) && invoker.collect_inputs_only - _linker_script = "$target_gen_dir/${target_name}_linker_script.txt" - _linker_script_target = "${target_name}_linker_script" + # When _collect_inputs_only && !(!_is_webview && enable_vr). + not_needed(["_export_java_symbols"]) # Create a partitioned libraries if the build config supports it, and the # invoker has supplied module descriptors. - _generate_partitions = defined(invoker.module_descs) && use_native_partitions + _generate_partitions = defined(invoker.module_descs) && + use_native_partitions && !_collect_inputs_only _module_descs = [] if (defined(invoker.module_descs)) { _module_descs = invoker.module_descs } - # Create a custom linker script based on JNI and feature module requirements. - generate_linker_version_script(_linker_script_target) { - linker_script = _linker_script - export_java_symbols = _export_java_symbols - export_feature_registrations = true - if (_generate_partitions) { - export_symbol_allowlist_files = [] - foreach(_module_desc, invoker.module_descs) { - if (defined(_module_desc.native_entrypoints)) { - export_symbol_allowlist_files += [ _module_desc.native_entrypoints ] + if (!_collect_inputs_only) { + _linker_script_target = "${target_name}_linker_script" + _linker_script = "$target_gen_dir/${target_name}_linker_script.txt" + + # Create a custom linker script based on JNI and feature module requirements. + generate_linker_version_script(_linker_script_target) { + linker_script = _linker_script + export_java_symbols = _export_java_symbols + export_feature_registrations = true + if (_generate_partitions) { + export_symbol_allowlist_files = [] + foreach(_module_desc, invoker.module_descs) { + if (defined(_module_desc.native_entrypoints)) { + export_symbol_allowlist_files += [ _module_desc.native_entrypoints ] + } } } } @@ -77,13 +85,19 @@ template("chrome_common_shared_library") { # Use a dynamically-generated linker script. configs -= [ "//build/config/android:hide_all_but_jni_onload" ] - deps += [ ":$_linker_script_target" ] - inputs = [ "$_linker_script" ] if (!defined(ldflags)) { ldflags = [] } - ldflags += [ "-Wl,--version-script=" + - rebase_path(_linker_script, root_build_dir) ] + if (_collect_inputs_only) { + metadata = { + } + ldflags += [ "--collect-inputs-only" ] + } else { + deps += [ ":$_linker_script_target" ] + inputs = [ "$_linker_script" ] + ldflags += [ "-Wl,--version-script=" + + rebase_path(_linker_script, root_build_dir) ] + } # Handle VR JNI registration and dependencies. if (!_is_webview && enable_vr) { @@ -107,6 +121,12 @@ template("chrome_common_shared_library") { deps += _module_desc.native_deps } } + } else if (_collect_inputs_only) { + foreach(_module_desc, _module_descs) { + if (defined(_module_desc.native_deps)) { + deps += _module_desc.native_deps + } + } } # Compress relocations if needed. @@ -132,7 +152,7 @@ template("chrome_common_shared_library") { } } - if (!_generate_partitions) { + if (!_generate_partitions && !_collect_inputs_only) { # Make helper targets so that we always have module native targets no matter # whether partitions are enabled. foreach(_module_desc, _module_descs) { diff --git a/chromium/chrome/android/chrome_java_resources.gni b/chromium/chrome/android/chrome_java_resources.gni index bd5a1b199e6..f20267bc8df 100644 --- a/chromium/chrome/android/chrome_java_resources.gni +++ b/chromium/chrome/android/chrome_java_resources.gni @@ -26,8 +26,6 @@ chrome_java_resources = [ "java/res/color/white_mode_tint.xml", "java/res/drawable-hdpi-v21/navigation_bubble_shadow.9.png", "java/res/drawable-hdpi/amex_card.png", - "java/res/drawable-hdpi/audio_playing.png", - "java/res/drawable-hdpi/audio_playing_square.png", "java/res/drawable-hdpi/badge_update_dark.png", "java/res/drawable-hdpi/badge_update_light.png", "java/res/drawable-hdpi/bg_tabstrip_background_tab_outline.9.png", @@ -85,24 +83,16 @@ chrome_java_resources = [ "java/res/drawable-hdpi/ic_error_white_24dp_filled.png", "java/res/drawable-hdpi/ic_event_googblue_36dp.png", "java/res/drawable-hdpi/ic_exit_to_app_white_24dp.png", - "java/res/drawable-hdpi/ic_fast_forward_white_36dp.png", - "java/res/drawable-hdpi/ic_fast_rewind_white_36dp.png", "java/res/drawable-hdpi/ic_file_download_white_24dp.png", "java/res/drawable-hdpi/ic_history_googblue_24dp.png", "java/res/drawable-hdpi/ic_link_grey600_36dp.png", "java/res/drawable-hdpi/ic_logo_googleg_24dp.png", "java/res/drawable-hdpi/ic_mobile_friendly_grey600_24dp.png", "java/res/drawable-hdpi/ic_most_visited_placeholder.png", - "java/res/drawable-hdpi/ic_pause_white_24dp.png", - "java/res/drawable-hdpi/ic_pause_white_36dp.png", "java/res/drawable-hdpi/ic_phone_googblue_36dp.png", "java/res/drawable-hdpi/ic_photo_camera.png", "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_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_suggestion_magnifier.png", "java/res/drawable-hdpi/ic_warning_white_24dp.png", "java/res/drawable-hdpi/ic_watch_later_24dp.png", @@ -110,13 +100,11 @@ chrome_java_resources = [ "java/res/drawable-hdpi/incognito_small.png", "java/res/drawable-hdpi/incognito_splash.png", "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_mobile_friendly.png", "java/res/drawable-hdpi/infobar_restore.png", "java/res/drawable-hdpi/infobar_screen_share.png", "java/res/drawable-hdpi/infobar_translate.png", - "java/res/drawable-hdpi/infobar_translate_compact.png", "java/res/drawable-hdpi/jcb_card.png", "java/res/drawable-hdpi/location_bar_incognito_badge.png", "java/res/drawable-hdpi/logo_card_back.png", @@ -129,7 +117,6 @@ chrome_java_resources = [ "java/res/drawable-hdpi/permission_push_notification_off.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/reader_mode_prefs_icon.png", @@ -151,7 +138,6 @@ chrome_java_resources = [ "java/res/drawable-hdpi/tabswitcher_border_frame_shadow.9.png", "java/res/drawable-hdpi/toolbar_shadow_focused.png", "java/res/drawable-hdpi/toolbar_shadow_normal.png", - "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-ldrtl-hdpi-v17/btn_suggestion_refine.png", @@ -189,8 +175,6 @@ chrome_java_resources = [ "java/res/drawable-ldrtl-xxxhdpi-v17/ic_suggestion_magnifier.png", "java/res/drawable-mdpi-v21/navigation_bubble_shadow.9.png", "java/res/drawable-mdpi/amex_card.png", - "java/res/drawable-mdpi/audio_playing.png", - "java/res/drawable-mdpi/audio_playing_square.png", "java/res/drawable-mdpi/badge_update_dark.png", "java/res/drawable-mdpi/badge_update_light.png", "java/res/drawable-mdpi/bg_tabstrip_background_tab_outline.9.png", @@ -248,24 +232,16 @@ chrome_java_resources = [ "java/res/drawable-mdpi/ic_error_white_24dp_filled.png", "java/res/drawable-mdpi/ic_event_googblue_36dp.png", "java/res/drawable-mdpi/ic_exit_to_app_white_24dp.png", - "java/res/drawable-mdpi/ic_fast_forward_white_36dp.png", - "java/res/drawable-mdpi/ic_fast_rewind_white_36dp.png", "java/res/drawable-mdpi/ic_file_download_white_24dp.png", "java/res/drawable-mdpi/ic_history_googblue_24dp.png", "java/res/drawable-mdpi/ic_link_grey600_36dp.png", "java/res/drawable-mdpi/ic_logo_googleg_24dp.png", "java/res/drawable-mdpi/ic_mobile_friendly_grey600_24dp.png", "java/res/drawable-mdpi/ic_most_visited_placeholder.png", - "java/res/drawable-mdpi/ic_pause_white_24dp.png", - "java/res/drawable-mdpi/ic_pause_white_36dp.png", "java/res/drawable-mdpi/ic_phone_googblue_36dp.png", "java/res/drawable-mdpi/ic_photo_camera.png", "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_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_suggestion_magnifier.png", "java/res/drawable-mdpi/ic_warning_white_24dp.png", "java/res/drawable-mdpi/ic_watch_later_24dp.png", @@ -273,13 +249,11 @@ chrome_java_resources = [ "java/res/drawable-mdpi/incognito_small.png", "java/res/drawable-mdpi/incognito_splash.png", "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_mobile_friendly.png", "java/res/drawable-mdpi/infobar_restore.png", "java/res/drawable-mdpi/infobar_screen_share.png", "java/res/drawable-mdpi/infobar_translate.png", - "java/res/drawable-mdpi/infobar_translate_compact.png", "java/res/drawable-mdpi/jcb_card.png", "java/res/drawable-mdpi/location_bar_incognito_badge.png", "java/res/drawable-mdpi/logo_card_back.png", @@ -292,7 +266,6 @@ chrome_java_resources = [ "java/res/drawable-mdpi/permission_push_notification_off.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/reader_mode_prefs_icon.png", @@ -314,14 +287,8 @@ chrome_java_resources = [ "java/res/drawable-mdpi/tabswitcher_border_frame_shadow.9.png", "java/res/drawable-mdpi/toolbar_shadow_focused.png", "java/res/drawable-mdpi/toolbar_shadow_normal.png", - "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-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", @@ -333,8 +300,6 @@ chrome_java_resources = [ "java/res/drawable-sw600dp-xxxhdpi/google_logo.png", "java/res/drawable-sw600dp/toolbar_shadow.xml", "java/res/drawable-sw600dp/window_background.xml", - "java/res/drawable-sw720dp-v19/window_background.xml", - "java/res/drawable-sw720dp/window_background.xml", "java/res/drawable-v19/action_bar_activity_bg.xml", "java/res/drawable-v19/navigation_bubble_shadow.xml", "java/res/drawable-v21/button_borderless_compat.xml", @@ -346,8 +311,6 @@ chrome_java_resources = [ "java/res/drawable-v21/web_notification_small_icon_background.xml", "java/res/drawable-xhdpi-v21/navigation_bubble_shadow.9.png", "java/res/drawable-xhdpi/amex_card.png", - "java/res/drawable-xhdpi/audio_playing.png", - "java/res/drawable-xhdpi/audio_playing_square.png", "java/res/drawable-xhdpi/badge_update_dark.png", "java/res/drawable-xhdpi/badge_update_light.png", "java/res/drawable-xhdpi/bg_tabstrip_background_tab_outline.9.png", @@ -405,24 +368,16 @@ chrome_java_resources = [ "java/res/drawable-xhdpi/ic_error_white_24dp_filled.png", "java/res/drawable-xhdpi/ic_event_googblue_36dp.png", "java/res/drawable-xhdpi/ic_exit_to_app_white_24dp.png", - "java/res/drawable-xhdpi/ic_fast_forward_white_36dp.png", - "java/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png", "java/res/drawable-xhdpi/ic_file_download_white_24dp.png", "java/res/drawable-xhdpi/ic_history_googblue_24dp.png", "java/res/drawable-xhdpi/ic_link_grey600_36dp.png", "java/res/drawable-xhdpi/ic_logo_googleg_24dp.png", "java/res/drawable-xhdpi/ic_mobile_friendly_grey600_24dp.png", "java/res/drawable-xhdpi/ic_most_visited_placeholder.png", - "java/res/drawable-xhdpi/ic_pause_white_24dp.png", - "java/res/drawable-xhdpi/ic_pause_white_36dp.png", "java/res/drawable-xhdpi/ic_phone_googblue_36dp.png", "java/res/drawable-xhdpi/ic_photo_camera.png", "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_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_suggestion_magnifier.png", "java/res/drawable-xhdpi/ic_warning_white_24dp.png", "java/res/drawable-xhdpi/ic_watch_later_24dp.png", @@ -430,13 +385,11 @@ chrome_java_resources = [ "java/res/drawable-xhdpi/incognito_small.png", "java/res/drawable-xhdpi/incognito_splash.png", "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_mobile_friendly.png", "java/res/drawable-xhdpi/infobar_restore.png", "java/res/drawable-xhdpi/infobar_screen_share.png", "java/res/drawable-xhdpi/infobar_translate.png", - "java/res/drawable-xhdpi/infobar_translate_compact.png", "java/res/drawable-xhdpi/jcb_card.png", "java/res/drawable-xhdpi/location_bar_incognito_badge.png", "java/res/drawable-xhdpi/logo_card_back.png", @@ -449,7 +402,6 @@ chrome_java_resources = [ "java/res/drawable-xhdpi/permission_push_notification_off.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/reader_mode_prefs_icon.png", @@ -471,13 +423,10 @@ chrome_java_resources = [ "java/res/drawable-xhdpi/tabswitcher_border_frame_shadow.9.png", "java/res/drawable-xhdpi/toolbar_shadow_focused.png", "java/res/drawable-xhdpi/toolbar_shadow_normal.png", - "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-xxhdpi-v21/navigation_bubble_shadow.9.png", "java/res/drawable-xxhdpi/amex_card.png", - "java/res/drawable-xxhdpi/audio_playing.png", - "java/res/drawable-xxhdpi/audio_playing_square.png", "java/res/drawable-xxhdpi/badge_update_dark.png", "java/res/drawable-xxhdpi/badge_update_light.png", "java/res/drawable-xxhdpi/bg_tabstrip_background_tab_outline.9.png", @@ -532,24 +481,16 @@ chrome_java_resources = [ "java/res/drawable-xxhdpi/ic_error_white_24dp_filled.png", "java/res/drawable-xxhdpi/ic_event_googblue_36dp.png", "java/res/drawable-xxhdpi/ic_exit_to_app_white_24dp.png", - "java/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png", - "java/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png", "java/res/drawable-xxhdpi/ic_file_download_white_24dp.png", "java/res/drawable-xxhdpi/ic_history_googblue_24dp.png", "java/res/drawable-xxhdpi/ic_link_grey600_36dp.png", "java/res/drawable-xxhdpi/ic_logo_googleg_24dp.png", "java/res/drawable-xxhdpi/ic_mobile_friendly_grey600_24dp.png", "java/res/drawable-xxhdpi/ic_most_visited_placeholder.png", - "java/res/drawable-xxhdpi/ic_pause_white_24dp.png", - "java/res/drawable-xxhdpi/ic_pause_white_36dp.png", "java/res/drawable-xxhdpi/ic_phone_googblue_36dp.png", "java/res/drawable-xxhdpi/ic_photo_camera.png", "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_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_suggestion_magnifier.png", "java/res/drawable-xxhdpi/ic_warning_white_24dp.png", "java/res/drawable-xxhdpi/ic_watch_later_24dp.png", @@ -557,13 +498,11 @@ chrome_java_resources = [ "java/res/drawable-xxhdpi/incognito_small.png", "java/res/drawable-xxhdpi/incognito_splash.png", "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_mobile_friendly.png", "java/res/drawable-xxhdpi/infobar_restore.png", "java/res/drawable-xxhdpi/infobar_screen_share.png", "java/res/drawable-xxhdpi/infobar_translate.png", - "java/res/drawable-xxhdpi/infobar_translate_compact.png", "java/res/drawable-xxhdpi/jcb_card.png", "java/res/drawable-xxhdpi/location_bar_incognito_badge.png", "java/res/drawable-xxhdpi/mc_card.png", @@ -575,7 +514,6 @@ chrome_java_resources = [ "java/res/drawable-xxhdpi/permission_push_notification_off.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/reader_mode_prefs_icon.png", @@ -597,13 +535,10 @@ chrome_java_resources = [ "java/res/drawable-xxhdpi/tabswitcher_border_frame_shadow.9.png", "java/res/drawable-xxhdpi/toolbar_shadow_focused.png", "java/res/drawable-xxhdpi/toolbar_shadow_normal.png", - "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-xxxhdpi-v21/navigation_bubble_shadow.9.png", "java/res/drawable-xxxhdpi/amex_card.png", - "java/res/drawable-xxxhdpi/audio_playing.png", - "java/res/drawable-xxxhdpi/audio_playing_square.png", "java/res/drawable-xxxhdpi/badge_update_dark.png", "java/res/drawable-xxxhdpi/badge_update_light.png", "java/res/drawable-xxxhdpi/bg_tabstrip_background_tab_outline.9.png", @@ -656,24 +591,16 @@ chrome_java_resources = [ "java/res/drawable-xxxhdpi/ic_error_white_24dp_filled.png", "java/res/drawable-xxxhdpi/ic_event_googblue_36dp.png", "java/res/drawable-xxxhdpi/ic_exit_to_app_white_24dp.png", - "java/res/drawable-xxxhdpi/ic_fast_forward_white_36dp.png", - "java/res/drawable-xxxhdpi/ic_fast_rewind_white_36dp.png", "java/res/drawable-xxxhdpi/ic_file_download_white_24dp.png", "java/res/drawable-xxxhdpi/ic_history_googblue_24dp.png", "java/res/drawable-xxxhdpi/ic_link_grey600_36dp.png", "java/res/drawable-xxxhdpi/ic_logo_googleg_24dp.png", "java/res/drawable-xxxhdpi/ic_mobile_friendly_grey600_24dp.png", "java/res/drawable-xxxhdpi/ic_most_visited_placeholder.png", - "java/res/drawable-xxxhdpi/ic_pause_white_24dp.png", - "java/res/drawable-xxxhdpi/ic_pause_white_36dp.png", "java/res/drawable-xxxhdpi/ic_phone_googblue_36dp.png", "java/res/drawable-xxxhdpi/ic_photo_camera.png", "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_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_suggestion_magnifier.png", "java/res/drawable-xxxhdpi/ic_warning_white_24dp.png", "java/res/drawable-xxxhdpi/ic_watch_later_24dp.png", @@ -681,13 +608,11 @@ chrome_java_resources = [ "java/res/drawable-xxxhdpi/incognito_small.png", "java/res/drawable-xxxhdpi/incognito_splash.png", "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_mobile_friendly.png", "java/res/drawable-xxxhdpi/infobar_restore.png", "java/res/drawable-xxxhdpi/infobar_screen_share.png", "java/res/drawable-xxxhdpi/infobar_translate.png", - "java/res/drawable-xxxhdpi/infobar_translate_compact.png", "java/res/drawable-xxxhdpi/jcb_card.png", "java/res/drawable-xxxhdpi/location_bar_incognito_badge.png", "java/res/drawable-xxxhdpi/mc_card.png", @@ -698,7 +623,6 @@ chrome_java_resources = [ "java/res/drawable-xxxhdpi/permission_push_notification_off.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/sad_tab.png", @@ -719,7 +643,6 @@ chrome_java_resources = [ "java/res/drawable-xxxhdpi/tabswitcher_border_frame_shadow.9.png", "java/res/drawable-xxxhdpi/toolbar_shadow_focused.png", "java/res/drawable-xxxhdpi/toolbar_shadow_normal.png", - "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/accessibility_tab_switcher_divider.xml", @@ -780,7 +703,10 @@ chrome_java_resources = [ "java/res/drawable/ic_event_round.xml", "java/res/drawable/ic_file_download_24dp.xml", "java/res/drawable/ic_file_download_36dp.xml", + "java/res/drawable/ic_file_download_scheduled_24dp.xml", "java/res/drawable/ic_fingerprint_grey500_36dp.xml", + "java/res/drawable/ic_full_screen_exit_white_24dp.xml", + "java/res/drawable/ic_full_screen_white_24dp.xml", "java/res/drawable/ic_globe_24dp.xml", "java/res/drawable/ic_google_round.xml", "java/res/drawable/ic_info_outline_grey.xml", @@ -805,6 +731,7 @@ chrome_java_resources = [ "java/res/drawable/ic_signal_cellular_4_bar.xml", "java/res/drawable/ic_site_timer.xml", "java/res/drawable/ic_swap_vert_round.xml", + "java/res/drawable/ic_sync_badge_off_20dp.xml", "java/res/drawable/ic_sync_error_40dp.xml", "java/res/drawable/ic_sync_green_40dp.xml", "java/res/drawable/ic_toolbar_share_offset_24dp.xml", @@ -815,7 +742,6 @@ chrome_java_resources = [ "java/res/drawable/ic_volume_off_white_24dp.xml", "java/res/drawable/ic_volume_on_white_24dp.xml", "java/res/drawable/ic_vpn_key_blue.xml", - "java/res/drawable/ic_vpn_key_grey.xml", "java/res/drawable/ic_warning_red.xml", "java/res/drawable/ic_wb_sunny_round.xml", "java/res/drawable/incognito_switch_track.xml", @@ -842,6 +768,8 @@ 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/photo_picker_seekbar_thumb.xml", + "java/res/drawable/photo_picker_seekbar_track.xml", "java/res/drawable/popup_bg_bottom_tinted.xml", "java/res/drawable/qr_code.xml", "java/res/drawable/rating_bar.xml", @@ -855,6 +783,7 @@ chrome_java_resources = [ "java/res/drawable/signin_header_animation.xml", "java/res/drawable/smartphone_black_24dp.xml", "java/res/drawable/store_locally_tooltip_background.xml", + "java/res/drawable/switch_to_tab.xml", "java/res/drawable/tab_indicator.xml", "java/res/drawable/telephone.xml", "java/res/drawable/thumbnail_gradient_top_left.xml", @@ -880,6 +809,7 @@ chrome_java_resources = [ "java/res/layout/account_chooser_dialog_item.xml", "java/res/layout/account_chooser_dialog_title.xml", "java/res/layout/account_management_account_row.xml", + "java/res/layout/account_picker_bottom_sheet_view.xml", "java/res/layout/account_picker_dialog_body.xml", "java/res/layout/account_picker_new_account_row.xml", "java/res/layout/account_picker_new_account_row_legacy.xml", @@ -911,7 +841,6 @@ chrome_java_resources = [ "java/res/layout/bookmark_widget_icons_only.xml", "java/res/layout/bookmark_widget_item.xml", "java/res/layout/bottom_control_container.xml", - "java/res/layout/bottom_sheet.xml", "java/res/layout/bottom_toolbar.xml", "java/res/layout/bottom_toolbar_browsing.xml", "java/res/layout/bottom_toolbar_menu_button.xml", @@ -953,7 +882,6 @@ chrome_java_resources = [ "java/res/layout/device_item_list.xml", "java/res/layout/distilled_page_font_family_spinner.xml", "java/res/layout/distilled_page_prefs_view.xml", - "java/res/layout/edit_url_suggestion_layout.xml", "java/res/layout/editable_option_editor_footer.xml", "java/res/layout/editable_option_editor_icons.xml", "java/res/layout/empty_accessory_sheet.xml", @@ -980,7 +908,6 @@ chrome_java_resources = [ "java/res/layout/history_privacy_disclaimer_header.xml", "java/res/layout/history_toolbar.xml", "java/res/layout/homepage_editor.xml", - "java/res/layout/http_auth_dialog.xml", "java/res/layout/icon_row_menu_footer.xml", "java/res/layout/incognito_description_layout.xml", "java/res/layout/incognito_toggle_tabs.xml", @@ -1076,12 +1003,12 @@ chrome_java_resources = [ "java/res/layout/search_engine.xml", "java/res/layout/search_engine_recent_title.xml", "java/res/layout/search_widget_template.xml", + "java/res/layout/secure_dns_provider_preference.xml", + "java/res/layout/secure_dns_provider_spinner_item.xml", "java/res/layout/send_tab_to_self_device_picker_item.xml", "java/res/layout/send_tab_to_self_device_picker_list.xml", "java/res/layout/send_tab_to_self_device_picker_toolbar.xml", "java/res/layout/send_tab_to_self_feature_unavailable_prompt.xml", - "java/res/layout/settings_action_bar_shadow.xml", - "java/res/layout/share_dialog_item.xml", "java/res/layout/share_sheet_content.xml", "java/res/layout/share_sheet_item.xml", "java/res/layout/sharing_device_picker.xml", @@ -1195,6 +1122,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/secure_dns_settings.xml", "java/res/xml/sync_and_services_preferences.xml", "java/res/xml/theme_preferences.xml", "java/res/xml/tracing_preferences.xml", diff --git a/chromium/chrome/android/chrome_java_sources.gni b/chromium/chrome/android/chrome_java_sources.gni index b1b92faadfa..27d29dc46ff 100644 --- a/chromium/chrome/android/chrome_java_sources.gni +++ b/chromium/chrome/android/chrome_java_sources.gni @@ -12,6 +12,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ApplicationLifetime.java", "java/src/org/chromium/chrome/browser/AssistStatusHandler.java", "java/src/org/chromium/chrome/browser/BrowserRestartActivity.java", + "java/src/org/chromium/chrome/browser/ChromeAccessorActivity.java", "java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java", "java/src/org/chromium/chrome/browser/ChromeActivity.java", "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java", @@ -46,7 +47,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/NavigationPopup.java", "java/src/org/chromium/chrome/browser/NearOomMonitor.java", "java/src/org/chromium/chrome/browser/PowerBroadcastReceiver.java", - "java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java", "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java", "java/src/org/chromium/chrome/browser/ServiceTabLauncher.java", "java/src/org/chromium/chrome/browser/ShortcutHelper.java", @@ -63,6 +63,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/about_settings/AboutChromePreferenceOSVersion.java", "java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java", "java/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridge.java", + "java/src/org/chromium/chrome/browser/about_settings/HyperlinkPreference.java", "java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java", "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java", "java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java", @@ -78,6 +79,11 @@ chrome_java_sources = [ "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/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java", + "java/src/org/chromium/chrome/browser/app/tab_activity_glue/ReparentingDelegateFactory.java", + "java/src/org/chromium/chrome/browser/app/tab_activity_glue/ReparentingTask.java", + "java/src/org/chromium/chrome/browser/app/tabmodel/ChromeNextTabPolicySupplier.java", + "java/src/org/chromium/chrome/browser/app/tabmodel/ChromeTabModelFilterFactory.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", @@ -154,7 +160,6 @@ chrome_java_sources = [ "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", - "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesActivityTabController.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesIntentDataProvider.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesMetrics.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesStore.java", @@ -173,35 +178,43 @@ 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/InstalledWebappGeolocationBridge.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/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", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientAppDataRecorder.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/ClientPackageNameProvider.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/CurrentPageVerifier.java", "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManager.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureController.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorder.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaRegistrar.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaVerifier.java", - "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/Verifier.java", "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/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/controller/CurrentPageVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/EmptyVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/Verifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/ClientAppDataRecorder.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/ClientPackageNameProvider.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityDisclosureController.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityOpenTimeRecorder.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TwaRegistrar.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TwaVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/webapps/AddToHomescreenVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/webapps/WebApkVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/controller/webapps/WebappVerifier.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashController.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashDelegate.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/SplashscreenObserver.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/trustedwebactivity/SplashImageHolder.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/trustedwebactivity/TwaSplashController.java", "java/src/org/chromium/chrome/browser/browserservices/ui/splashscreen/webapps/WebappSplashController.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/DisclosureAcceptanceBroadcastReceiver.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/DisclosureUiPicker.java", "java/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/TrustedWebActivityCoordinator.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/TrustedWebActivityModel.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/DisclosureInfobar.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/DisclosureNotification.java", + "java/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/DisclosureSnackbar.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", @@ -258,6 +271,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMetrics.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java", + "java/src/org/chromium/chrome/browser/compositor/layouts/CompositorModelChangeProcessor.java", "java/src/org/chromium/chrome/browser/compositor/layouts/EmptyOverviewModeObserver.java", "java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java", "java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java", @@ -337,9 +351,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.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/contextmenu/ContextMenuItem.java", - "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java", - "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuPopulator.java", "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuTitleView.java", "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java", "java/src/org/chromium/chrome/browser/contextmenu/PlatformContextMenuUi.java", @@ -440,7 +451,6 @@ chrome_java_sources = [ "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", - "java/src/org/chromium/chrome/browser/customtabs/ExternalIntentsPolicyProvider.java", "java/src/org/chromium/chrome/browser/customtabs/FirstMeaningfulPaintObserver.java", "java/src/org/chromium/chrome/browser/customtabs/HiddenTabHolder.java", "java/src/org/chromium/chrome/browser/customtabs/NavigationInfoCaptureTrigger.java", @@ -460,8 +470,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/customtabs/content/TabObserverRegistrar.java", "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/BaseCustomTabActivityComponent.java", "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/BaseCustomTabActivityModule.java", - "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java", - "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java", "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java", "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java", "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java", @@ -574,8 +582,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/download/home/glue/OfflineContentProviderGlue.java", "java/src/org/chromium/chrome/browser/download/home/glue/ThumbnailRequestGlue.java", "java/src/org/chromium/chrome/browser/download/home/list/BatchListModel.java", - "java/src/org/chromium/chrome/browser/download/home/list/CalendarFactory.java", - "java/src/org/chromium/chrome/browser/download/home/list/CalendarUtils.java", "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListCoordinator.java", "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMediator.java", "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListView.java", @@ -674,23 +680,24 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java", "java/src/org/chromium/chrome/browser/externalauth/VerifiedHandler.java", "java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java", - "java/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandler.java", + "java/src/org/chromium/chrome/browser/externalnav/IntentWithRequestMetadataHandler.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitor.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorDelegate.java", "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotTabObserver.java", "java/src/org/chromium/chrome/browser/feature_engagement/TrackerFactory.java", "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java", + "java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java", "java/src/org/chromium/chrome/browser/feedback/DataReductionProxyFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/DuetFeedbackSource.java", + "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackReporter.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackSource.java", - "java/src/org/chromium/chrome/browser/feedback/FeedbackSourceProvider.java", "java/src/org/chromium/chrome/browser/feedback/HistogramFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/IMEFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/InterestFeedFeedbackSource.java", @@ -712,6 +719,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java", + "java/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfo.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunChooserView.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunFragment.java", @@ -731,14 +739,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", - "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java", - "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java", - "java/src/org/chromium/chrome/browser/fullscreen/TabGestureStateListener.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java", "java/src/org/chromium/chrome/browser/gcore/ConnectedTask.java", @@ -889,7 +891,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/locale/LocaleTemplateUrlLoader.java", "java/src/org/chromium/chrome/browser/locale/SogouPromoDialog.java", "java/src/org/chromium/chrome/browser/login/ChromeHttpAuthHandler.java", - "java/src/org/chromium/chrome/browser/login/LoginPrompt.java", "java/src/org/chromium/chrome/browser/media/MediaCaptureDevicesDispatcherAndroid.java", "java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java", "java/src/org/chromium/chrome/browser/media/MediaLauncherActivity.java", @@ -898,20 +899,13 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/media/PictureInPictureActivity.java", "java/src/org/chromium/chrome/browser/media/PictureInPictureController.java", "java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java", - "java/src/org/chromium/chrome/browser/media/ui/MediaButtonReceiver.java", - "java/src/org/chromium/chrome/browser/media/ui/MediaImageCallback.java", - "java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java", - "java/src/org/chromium/chrome/browser/media/ui/MediaNotificationInfo.java", - "java/src/org/chromium/chrome/browser/media/ui/MediaNotificationListener.java", + "java/src/org/chromium/chrome/browser/media/ui/ChromeMediaNotificationControllerDelegate.java", "java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java", "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/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/PackageMetrics.java", "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java", "java/src/org/chromium/chrome/browser/metrics/UkmRecorder.java", @@ -953,7 +947,6 @@ chrome_java_sources = [ "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/CustomNotificationBuilder.java", - "java/src/org/chromium/chrome/browser/notifications/ForegroundServiceUtils.java", "java/src/org/chromium/chrome/browser/notifications/NotificationBuilder.java", "java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java", "java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java", @@ -1049,6 +1042,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/offlinepages/TriggerConditions.java", "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/OfflineDetector.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", @@ -1124,6 +1118,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/status/StatusView.java", "java/src/org/chromium/chrome/browser/omnibox/status/StatusViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/status/StatusViewCoordinator.java", + "java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java", + "java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxTheme.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinatorFactory.java", @@ -1133,6 +1129,9 @@ chrome_java_sources = [ "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/DropdownItemViewInfo.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.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/OmniboxSuggestionUiType.java", @@ -1170,7 +1169,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/suggestions/basic/SuggestionViewViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessor.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java", - "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProperties.java", + "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionProcessor.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/entity/EntitySuggestionViewBinder.java", @@ -1193,7 +1192,7 @@ chrome_java_sources = [ "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/PaintPreviewHelper.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", @@ -1265,8 +1264,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/CanMakePaymentQuery.java", "java/src/org/chromium/chrome/browser/payments/CardEditor.java", "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/PaymentAppFactoryDelegate.java", "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryInterface.java", "java/src/org/chromium/chrome/browser/payments/PaymentAppFactoryParams.java", @@ -1278,16 +1275,16 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/PaymentRequestFactory.java", "java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java", "java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java", - "java/src/org/chromium/chrome/browser/payments/PaymentsExperimentalFeatures.java", - "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java", "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java", "java/src/org/chromium/chrome/browser/payments/SettingsAutofillAndPaymentsObserver.java", "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java", "java/src/org/chromium/chrome/browser/payments/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/TwaPackageManagerDelegate.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/PaymentHandlerActionModeCallback.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java", @@ -1334,6 +1331,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java", "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java", "java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java", + "java/src/org/chromium/chrome/browser/previews/HttpsImageCompressionUtils.java", "java/src/org/chromium/chrome/browser/previews/Previews.java", "java/src/org/chromium/chrome/browser/previews/PreviewsAndroidBridge.java", "java/src/org/chromium/chrome/browser/previews/PreviewsUma.java", @@ -1343,13 +1341,14 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", + "java/src/org/chromium/chrome/browser/privacy/settings/SecureDnsProviderPreference.java", + "java/src/org/chromium/chrome/browser/privacy/settings/SecureDnsSettings.java", "java/src/org/chromium/chrome/browser/provider/BaseColumns.java", "java/src/org/chromium/chrome/browser/provider/BookmarkColumns.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", "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", @@ -1358,7 +1357,6 @@ chrome_java_sources = [ "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", - "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotSource.java", "java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java", @@ -1392,24 +1390,16 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java", "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/MainSettings.java", "java/src/org/chromium/chrome/browser/settings/SettingsActivity.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/ChromeShareExtras.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", "java/src/org/chromium/chrome/browser/share/ShareButtonController.java", "java/src/org/chromium/chrome/browser/share/ShareDelegate.java", "java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java", - "java/src/org/chromium/chrome/browser/share/ShareDialogAdapter.java", "java/src/org/chromium/chrome/browser/share/ShareHelper.java", - "java/src/org/chromium/chrome/browser/share/ShareParams.java", - "java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java", - "java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java", - "java/src/org/chromium/chrome/browser/share/ShareSheetItemViewProperties.java", - "java/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilder.java", "java/src/org/chromium/chrome/browser/share/ShareUtils.java", "java/src/org/chromium/chrome/browser/sharing/SharingAdapter.java", "java/src/org/chromium/chrome/browser/sharing/SharingJNIBridge.java", @@ -1448,7 +1438,12 @@ 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/signin/account_picker/AccountPickerBottomSheetCoordinator.java", + "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetProperties.java", + "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java", + "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetViewBinder.java", "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerCoordinator.java", + "java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerDelegate.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", @@ -1457,7 +1452,6 @@ chrome_java_sources = [ "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/ManageSpaceActivity.java", "java/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBar.java", @@ -1501,6 +1495,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java", "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyController.java", + "java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java", "java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java", "java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java", "java/src/org/chromium/chrome/browser/sync/SyncController.java", @@ -1531,8 +1526,8 @@ chrome_java_sources = [ "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/TabDelegateFactory.java", "java/src/org/chromium/chrome/browser/tab/TabFavicon.java", + "java/src/org/chromium/chrome/browser/tab/TabGestureStateListener.java", "java/src/org/chromium/chrome/browser/tab/TabHelpers.java", "java/src/org/chromium/chrome/browser/tab/TabIdManager.java", "java/src/org/chromium/chrome/browser/tab/TabImpl.java", @@ -1540,26 +1535,27 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/tab/TabParentIntent.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/TabStateExtractor.java", + "java/src/org/chromium/chrome/browser/tab/TabStateFileManager.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/TabViewManagerImpl.java", + "java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroidImpl.java", "java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java", "java/src/org/chromium/chrome/browser/tab/TabWebContentsUserData.java", "java/src/org/chromium/chrome/browser/tab/TrustedCdn.java", + "java/src/org/chromium/chrome/browser/tab/WebContentsState.java", + "java/src/org/chromium/chrome/browser/tab/WebContentsStateBridge.java", "java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java", "java/src/org/chromium/chrome/browser/tab/state/EncryptedFilePersistedTabDataStorage.java", "java/src/org/chromium/chrome/browser/tab/state/FilePersistedTabDataStorage.java", + "java/src/org/chromium/chrome/browser/tab/state/MockPersistedTabData.java", "java/src/org/chromium/chrome/browser/tab/state/PersistedTabData.java", "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataConfiguration.java", "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataFactory.java", "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataStorage.java", - "java/src/org/chromium/chrome/browser/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java", - "java/src/org/chromium/chrome/browser/tab_activity_glue/ReparentingDelegateFactory.java", - "java/src/org/chromium/chrome/browser/tab_activity_glue/ReparentingTask.java", "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java", "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java", "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java", @@ -1567,32 +1563,19 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/tabmodel/AsyncTabParams.java", "java/src/org/chromium/chrome/browser/tabmodel/AsyncTabParamsManager.java", "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/EmptyTabModelSelectorObserver.java", "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java", "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImplCreator.java", "java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabList.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModel.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelDelegate.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelFilter.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelFilterProvider.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserver.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderControllerImpl.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserver.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorProfileSupplier.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabModelObserver.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserver.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorUma.java", - "java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java", "java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java", "java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java", "java/src/org/chromium/chrome/browser/tabmodel/TabPersister.java", @@ -1625,6 +1608,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonView.java", "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonViewBinder.java", "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherDrawable.java", + "java/src/org/chromium/chrome/browser/toolbar/ToolbarAppMenuManager.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarColors.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarCommonPropertiesModel.java", @@ -1726,14 +1710,9 @@ 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/AddToHomescreenVerifier.java", "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java", - "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.java", "java/src/org/chromium/chrome/browser/webapps/GooglePlayWebApkInstallDelegate.java", "java/src/org/chromium/chrome/browser/webapps/SameTaskWebApkActivity.java", - "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/WebApkActivityCoordinator.java", "java/src/org/chromium/chrome/browser/webapps/WebApkActivityLifecycleUmaTracker.java", "java/src/org/chromium/chrome/browser/webapps/WebApkExtras.java", @@ -1751,14 +1730,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java", "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateTask.java", - "java/src/org/chromium/chrome/browser/webapps/WebApkVerifier.java", "java/src/org/chromium/chrome/browser/webapps/WebApkVersionManager.java", "java/src/org/chromium/chrome/browser/webapps/WebDisplayMode.java", "java/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappActiveTabUmaTracker.java", "java/src/org/chromium/chrome/browser/webapps/WebappActivity.java", "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", "java/src/org/chromium/chrome/browser/webapps/WebappCustomTabTimeSpentLogger.java", "java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java", @@ -1774,7 +1751,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.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/WebappVerifier.java", "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenCoordinator.java", "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogView.java", "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenInstaller.java", @@ -1782,24 +1758,13 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenProperties.java", "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinder.java", "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewDelegate.java", - "java/src/org/chromium/chrome/browser/webapps/dependency_injection/WebappActivityComponent.java", - "java/src/org/chromium/chrome/browser/webapps/dependency_injection/WebappActivityModule.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java", "java/src/org/chromium/chrome/browser/webauth/Fido2ApiHandler.java", "java/src/org/chromium/chrome/browser/webauth/Fido2CredentialRequest.java", "java/src/org/chromium/chrome/browser/webauth/Fido2Helper.java", "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", - "java/src/org/chromium/chrome/browser/webshare/BlobReceiver.java", - "java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", - "java/src/org/chromium/chrome/browser/webshare/SharedFileCollator.java", "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/BottomSheetController.java", - "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetObserver.java", - "java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetector.java", - "java/src/org/chromium/chrome/browser/widget/bottomsheet/EmptyBottomSheetObserver.java", - "java/src/org/chromium/chrome/browser/widget/bottomsheet/TouchRestrictingFrameLayout.java", ] diff --git a/chromium/chrome/android/chrome_junit_test_java_sources.gni b/chromium/chrome/android/chrome_junit_test_java_sources.gni index 8cbbae98078..bc4c7d8d018 100644 --- a/chromium/chrome/android/chrome_junit_test_java_sources.gni +++ b/chromium/chrome/android/chrome_junit_test_java_sources.gni @@ -6,7 +6,6 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandlerTest.java", "junit/src/org/chromium/chrome/browser/DeviceConditionsTest.java", "junit/src/org/chromium/chrome/browser/IntentHeadersRecorderTest.java", - "junit/src/org/chromium/chrome/browser/SSLClientCertificateRequestTest.java", "junit/src/org/chromium/chrome/browser/ShadowDeviceConditions.java", "junit/src/org/chromium/chrome/browser/ShadowIdleHandlerAwareMessageQueue.java", "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java", @@ -23,26 +22,29 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/browserservices/ClientAppDataRegisterTest.java", "junit/src/org/chromium/chrome/browser/browserservices/SessionDataHolderTest.java", "junit/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappGeolocationBridgeTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/permissiondelegation/LocationPermissionUpdaterTest.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", "junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManagerTest.java", - "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/browserservices/ui/controller/CurrentPageVerifierTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/controller/TestVerifier.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/ClientAppDataRecorderTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityDisclosureControllerTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityOpenTimeRecorderTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TwaVerifierTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/DisclosureAcceptanceBroadcastReceiverTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/DisclosureUiPickerTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/trustedwebactivity/FilledLazy.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/DisclosureInfobarTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/DisclosureNotificationTest.java", + "junit/src/org/chromium/chrome/browser/browserservices/ui/view/trustedwebactivity/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", + "junit/src/org/chromium/chrome/browser/compositor/layouts/CompositorModelChangeProcessorUnitTest.java", "junit/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutUpdateHost.java", "junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java", "junit/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuCoordinatorTest.java", @@ -87,11 +89,12 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryUnitTest.java", "junit/src/org/chromium/chrome/browser/explore_sites/ExploreSitesPageStateUnitTest.java", "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.java", - "junit/src/org/chromium/chrome/browser/feedback/FeedbackCollectorTest.java", + "junit/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollectorTest.java", + "junit/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollectorTest.java", + "junit/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfoTest.java", "junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java", "junit/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationUnitTest.java", "junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java", - "junit/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegateTest.java", "junit/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerUnitTest.java", "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java", "junit/src/org/chromium/chrome/browser/gsa/GSAStateUnitTest.java", @@ -111,17 +114,15 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/installedapp/PackageHashTest.java", "junit/src/org/chromium/chrome/browser/invalidation/ResumableDelayedTaskRunnerTest.java", "junit/src/org/chromium/chrome/browser/invalidation/SessionsInvalidationManagerTest.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationActionsUpdatedTest.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationButtonComputationTest.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationFaviconTest.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerServiceActionsTest.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerServiceLifecycleTest.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java", - "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerThrottlerTest.java", + "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationServiceActionsTest.java", + "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationServiceLifecycleTest.java", + "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestBase.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestShadowResources.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestTabHolder.java", + "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationThrottlerTest.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTitleUpdatedTest.java", "junit/src/org/chromium/chrome/browser/metrics/VariationsSessionTest.java", "junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java", @@ -147,6 +148,8 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsUnitTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/TaskExtrasPackerTest.java", + "junit/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetectorUnitTest.java", + "junit/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2UnitTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/prefetch/OfflineNotificationBackgroundTaskUnitTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskUnitTest.java", "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", @@ -166,6 +169,7 @@ 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/styles/OmniboxResourceProviderTest.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", @@ -189,6 +193,7 @@ chrome_junit_test_java_sources = [ "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/policy/EnterpriseInfoTest.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", @@ -208,6 +213,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/signin/SigninPreferencesManagerTest.java", "junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java", "junit/src/org/chromium/chrome/browser/signin/SigninUtilsStartActivityTest.java", + "junit/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerMediatorTest.java", "junit/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorMediatorTest.java", "junit/src/org/chromium/chrome/browser/suggestions/SuggestionsImageFetcherTest.java", "junit/src/org/chromium/chrome/browser/suggestions/tile/TileGroupUnitTest.java", @@ -215,15 +221,18 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/tab/TabAttributesTest.java", "junit/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelperTest.java", "junit/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelperTest.java", + "junit/src/org/chromium/chrome/browser/tab/TabStateExtractorTest.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/tab/TabViewManagerUnitTest.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/MenuButtonTest.java", + "junit/src/org/chromium/chrome/browser/toolbar/ToolbarAppMenuManagerTest.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", @@ -245,7 +254,4 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogViewTest.java", "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenMediatorTest.java", "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinderTest.java", - "junit/src/org/chromium/chrome/browser/webshare/ShareServiceImplTest.java", - "junit/src/org/chromium/chrome/browser/webshare/SharedFileCollatorTest.java", - "junit/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetSwipeDetectorTest.java", ] diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni index 4438f47bcfd..f5fab3e7ff2 100644 --- a/chromium/chrome/android/chrome_public_apk_tmpl.gni +++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni @@ -92,7 +92,8 @@ template("chrome_public_common_apk_or_module_tmpl") { } else { _needs_32bit_lib = target_cpu == "arm" || - (_is_monochrome && target_cpu == "arm64" && !_is_64_bit_browser) + (_is_monochrome && target_cpu == "arm64" && !_is_64_bit_browser) || + (_is_trichrome && target_cpu == "arm64" && !_is_64_bit_browser) _add_unwind_tables = _needs_32bit_lib && _add_unwind_tables_in_chrome_32bit_apk && ((android_64bit_target_cpu && @@ -174,14 +175,24 @@ template("chrome_public_common_apk_or_module_tmpl") { resource_exclusion_regex += "|app_single_page_icon" } + # Note most of these, with the exception of resource_exclusion_exceptions, + # are currently duplicated in system_webview_apk_tmpl.gni. + # Used only by alert dialog on tiny screens. _material_package = "com_google_android_material_material.*" resource_exclusion_regex += "|${_material_package}values-small" + # Used only by date picker (which chrome doesn't use). + resource_exclusion_regex += "|${_material_package}-(w480dp-port|w360dp-port|h480dp-land|h360dp-land)" + # 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" + resource_exclusion_regex += "|${_material_package}/color.*(choice|chip_|card_|calendar_|bottom_nav_|slider_)" + resource_exclusion_regex += + "|${_material_package}/drawable.*design_snackbar" + resource_exclusion_regex += "|${_material_package}/xml.*badge_" _material_package = "*com_google_android_material_material*" resource_exclusion_exceptions += [ # AppBarLayout @@ -194,7 +205,28 @@ template("chrome_public_common_apk_or_module_tmpl") { "${_material_package}/design_text_*", "${_material_package}/text_*", ] - resource_values_filter_rules = [ "${_material_package}:mtrl_alert" ] + + # Remove unneeded entries from material design values.xml files. + resource_values_filter_rules = [ + "${_material_package}:[Bb]adge", + "${_material_package}:[Bb]ottomNavigation", + "${_material_package}:[Bb]ottomSheet", + "${_material_package}:[Bb]uttonToggleGroup", + "${_material_package}:[Cc]alendar", + "${_material_package}:[Cc]ardView", + "${_material_package}:\b[Cc]hip", + "${_material_package}:design_snackbar", + "${_material_package}:[Ff]loatingActionButton", + "${_material_package}:[Mm]aterialAlertDialog", + "${_material_package}:mtrl_alert", + "${_material_package}:mtrl_navigation", + "${_material_package}:mtrl_slider", + "${_material_package}:[Nn]avigationView", + "${_material_package}:picker", + "${_material_package}:[Ss]nackbar", + "${_material_package}:[Ss]lider", + "${_material_package}:[Tt]oolbarLayout", + ] if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] @@ -501,7 +533,7 @@ template("monochrome_public_common_apk_or_module_tmpl") { } deps += [ - "//android_webview/glue", + "//android_webview/glue:glue_java", "//android_webview/nonembedded:nonembedded_java", "//chrome/android:monochrome_java", ] diff --git a/chromium/chrome/android/chrome_test_java_sources.gni b/chromium/chrome/android/chrome_test_java_sources.gni index 05f9d5f7524..73eb798e675 100644 --- a/chromium/chrome/android/chrome_test_java_sources.gni +++ b/chromium/chrome/android/chrome_test_java_sources.gni @@ -28,7 +28,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java", "javatests/src/org/chromium/chrome/browser/PopupTest.java", "javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java", - "javatests/src/org/chromium/chrome/browser/PrerenderTest.java", "javatests/src/org/chromium/chrome/browser/ProcessIsolationTest.java", "javatests/src/org/chromium/chrome/browser/ReachedCodeProfilerTest.java", "javatests/src/org/chromium/chrome/browser/RestoreHistogramTest.java", @@ -58,6 +57,7 @@ chrome_test_java_sources = [ "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/AutofillLocalCardEditorTest.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", @@ -72,13 +72,15 @@ chrome_test_java_sources = [ "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/TrustedWebActivityClientLocationDelegationTest.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", "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTestUtil.java", + "javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityLocationDelegationTest.java", "javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionsTest.java", "javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPreferencesUiTest.java", - "javatests/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityCurrentPageVerifierTest.java", + "javatests/src/org/chromium/chrome/browser/browserservices/ui/controller/trustedwebactivity/TrustedWebActivityCurrentPageVerifierTest.java", "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java", "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataTest.java", @@ -152,6 +154,7 @@ chrome_test_java_sources = [ "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/AutoDownloadsTest.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", @@ -166,6 +169,8 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/download/ServicificationDownloadTest.java", "javatests/src/org/chromium/chrome/browser/download/SystemDownloadNotifierTest.java", "javatests/src/org/chromium/chrome/browser/download/TestDownloadDirectoryProvider.java", + "javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadDateTimePickerDialogTest.java", + "javatests/src/org/chromium/chrome/browser/download/dialogs/DownloadLaterDialogTest.java", "javatests/src/org/chromium/chrome/browser/download/home/DownloadActivityV2Test.java", "javatests/src/org/chromium/chrome/browser/download/home/StubbedOfflineContentProvider.java", "javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java", @@ -176,7 +181,7 @@ 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/IntentWithGesturesHandlerTest.java", + "javatests/src/org/chromium/chrome/browser/externalnav/IntentWithRequestMetadataHandlerTest.java", "javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java", "javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorTest.java", "javatests/src/org/chromium/chrome/browser/feature_engagement/ScreenshotTabObserverTest.java", @@ -304,6 +309,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java", + "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/SwitchToTabTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/suggestions/VoiceSuggestionProviderTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandlerTest.java", "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java", @@ -326,8 +332,12 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java", "javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java", "javatests/src/org/chromium/chrome/browser/payments/ExpandablePaymentHandlerChangePaymentMethodTest.java", + "javatests/src/org/chromium/chrome/browser/payments/ExpandablePaymentHandlerTest.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/MockPaymentApp.java", + "javatests/src/org/chromium/chrome/browser/payments/MockTwaPackageManagerDelegate.java", + "javatests/src/org/chromium/chrome/browser/payments/PaymentDetailsUpdateServiceHelperTest.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", @@ -407,11 +417,15 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestUseStatsTest.java", "javatests/src/org/chromium/chrome/browser/payments/SkipToGPayHelperTest.java", "javatests/src/org/chromium/chrome/browser/payments/WebPaymentIntentHelperTest.java", + "javatests/src/org/chromium/chrome/browser/permissions/AutomaticEmbargoTest.java", "javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java", + "javatests/src/org/chromium/chrome/browser/permissions/MIDITest.java", "javatests/src/org/chromium/chrome/browser/permissions/MediaTest.java", + "javatests/src/org/chromium/chrome/browser/permissions/NotificationTest.java", "javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java", "javatests/src/org/chromium/chrome/browser/permissions/PermissionTestRule.java", "javatests/src/org/chromium/chrome/browser/permissions/QuotaTest.java", + "javatests/src/org/chromium/chrome/browser/permissions/RuntimePermissionTest.java", "javatests/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHostTest.java", "javatests/src/org/chromium/chrome/browser/photo_picker/DecoderServiceTest.java", "javatests/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialogTest.java", @@ -428,6 +442,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java", "javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java", "javatests/src/org/chromium/chrome/browser/query_tiles/ListMatchers.java", + "javatests/src/org/chromium/chrome/browser/query_tiles/OmniboxQueryTileSuggestionTest.java", "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java", "javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionToOmniboxTest.java", "javatests/src/org/chromium/chrome/browser/query_tiles/TileMatchers.java", @@ -446,9 +461,8 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java", "javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplTest.java", - "javatests/src/org/chromium/chrome/browser/share/ShareSheetCoordinatorTest.java", - "javatests/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilderTest.java", "javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java", + "javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetTest.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", @@ -478,6 +492,7 @@ chrome_test_java_sources = [ "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/AndroidSyncSettingsTest.java", "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java", "javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java", "javatests/src/org/chromium/chrome/browser/sync/FakeProfileSyncService.java", @@ -490,7 +505,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/sync/SyncTest.java", "javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java", "javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java", - "javatests/src/org/chromium/chrome/browser/sync/UkmTest.java", "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java", "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java", "javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java", @@ -499,9 +513,11 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.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/TabViewManagerTest.java", "javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabDataTest.java", "javatests/src/org/chromium/chrome/browser/tab/state/FilePersistedTabDataStorageTest.java", + "javatests/src/org/chromium/chrome/browser/tab/state/PersistedTabDataTest.java", "javatests/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorControllerTest.java", "javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java", "javatests/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreatorTest.java", @@ -532,6 +548,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/toolbar/top/BrandColorTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java", "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuTest.java", + "javatests/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhoneTest.java", "javatests/src/org/chromium/chrome/browser/tracing/settings/TracingSettingsTest.java", "javatests/src/org/chromium/chrome/browser/translate/TranslateCompactInfoBarTest.java", "javatests/src/org/chromium/chrome/browser/translate/TranslateOptionsTest.java", diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn index 7e20e804015..062a72afa93 100644 --- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn +++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn @@ -16,6 +16,7 @@ android_library("animated_poodle_java") { "//base:base_java", "//chrome/android:chrome_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", ] sources = [ "java/src/org/chromium/chrome/browser/" + @@ -33,6 +34,7 @@ android_library("java") { "//base:base_java", "//base:jni_java", "//chrome/android:chrome_java", + "//chrome/browser/browser_controls/android:java", "//chrome/browser/image_fetcher:java", "//chrome/browser/profiles/android:java", "//chrome/browser/settings:java", @@ -51,6 +53,7 @@ android_library("java") { "//mojo/public/java:bindings_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_deps:androidx_collection_collection_java", "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java", "//third_party/android_deps:androidx_core_core_java", @@ -133,6 +136,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java", "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java", "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderViewBinder.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantStepProgressBar.java", "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBox.java", "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxCoordinator.java", "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.java", @@ -251,6 +255,7 @@ android_library("test_java") { "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantKeyboardIntegrationTest.java", + "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantNavigationIntegrationTest.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", @@ -273,6 +278,9 @@ android_library("test_java") { "//chrome/browser/image_fetcher:java", "//chrome/browser/password_manager/android_test_helpers:test_support_java", "//chrome/browser/preferences:java", + "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", + "//chrome/browser/util:java", "//chrome/test/android:chrome_java_test_support", "//components/autofill_assistant/browser:proto_java", "//components/browser_ui/android/bottomsheet:java", @@ -284,12 +292,13 @@ android_library("test_java") { "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:com_google_android_material_material_java", "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java", + "//third_party/android_deps:espresso_java", "//third_party/android_support_test_runner:runner_java", - "//third_party/espresso:espresso_all_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/mockito:mockito_java", "//ui/android:ui_full_java", + "//url:gurl_java", ] data = [ "//components/test/data/autofill_assistant/" ] @@ -298,17 +307,32 @@ android_library("test_java") { android_resources("java_resources") { sources = [ "java/res/drawable/autofill_assistant_actions_gradient.xml", + "java/res/drawable/autofill_assistant_circle_background.xml", "java/res/drawable/autofill_assistant_default_details.xml", "java/res/drawable/autofill_assistant_details_bg.xml", "java/res/drawable/autofill_assistant_lightblue_rect_bg.xml", + "java/res/drawable/autofill_assistant_rounded_corner_background.xml", "java/res/drawable/autofill_assistant_swipe_indicator.xml", "java/res/drawable/ic_add_outline_white_24dp.xml", + "java/res/drawable/ic_airline_seat_recline_normal_black_24dp.xml", "java/res/drawable/ic_autofill_assistant_add_circle_24dp.xml", + "java/res/drawable/ic_autofill_assistant_default_progress_start_black_24dp.xml", + "java/res/drawable/ic_check_circle_black_24dp.xml", "java/res/drawable/ic_clear_black_24dp.xml", + "java/res/drawable/ic_confirmation_number_black_24dp.xml", + "java/res/drawable/ic_directions_car_black_24dp.xml", "java/res/drawable/ic_done_black_24dp.xml", + "java/res/drawable/ic_fastfood_black_24dp.xml", + "java/res/drawable/ic_grocery_black_24dp.xml", + "java/res/drawable/ic_local_dining_black_24dp.xml", "java/res/drawable/ic_logo_assistant_24dp.xml", + "java/res/drawable/ic_payment_black_24dp.xml", "java/res/drawable/ic_refresh_black_24dp.xml", "java/res/drawable/ic_remove_outline_white_24dp.xml", + "java/res/drawable/ic_settings_black_24dp.xml", + "java/res/drawable/ic_shopping_basket_black_24dp.xml", + "java/res/drawable/ic_shopping_basket_black_24dp.xml", + "java/res/drawable/ic_vpn_key_black_24dp.xml", "java/res/layout/autofill_assistant_address_full.xml", "java/res/layout/autofill_assistant_address_summary.xml", "java/res/layout/autofill_assistant_bottom_sheet_content.xml", 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 5fd39cdf0f5..d122756dff1 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 @@ -172,22 +172,25 @@ I agree </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_TITLE" desc="The title of the onboarding screen."> - Try Google Assistant \n in Chrome + Try Google Assistant\nin Chrome </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_RENT_CAR" desc="Onboarding message describing autofill assistant's capability for car rentals."> - Rent a car \n in just a few taps + Rent a car\nin just a few taps </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_BUY_MOVIE_TICKETS" desc="Onboarding message describing autofill assistant's capability for movie tickets."> - Buy movie tickets \n in just a few taps + Buy movie tickets\nin just a few taps </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FOOD_ORDERING" desc="Onboarding message describing autofill assistant's capability for food ordering."> - Order food \n in just a few taps + Order food\nin just a few taps </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_FLIGHTS_CHECKIN" desc="Onboarding message describing autofill assistant's capability for flights."> - Check in to your flight \n in just a few taps + Check in to your flight\nin just a few taps </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_VOICE_SEARCH" desc="Onboarding message describing autofill assistant's capability for voice search."> - Try voice actions \n on websites + Try voice actions\non websites + </message> + <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE_SHOPPING" desc="Onboarding message describing autofill assistant's capability for shopping."> + Buy things\nin just a few taps </message> <message name="IDS_AUTOFILL_ASSISTANT_INIT_MESSAGE" desc="Onboarding message describing autofill assistant's capability."> Google Assistant saves you time by helping you complete actions on the web, like search and checkout. diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn index 235b10d804e..9e61e4e8ad3 100644 --- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn @@ -75,8 +75,8 @@ android_library("test_java") { "//net/android:net_java_test_support", "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:com_google_android_material_material_java", + "//third_party/android_deps:espresso_java", "//third_party/android_support_test_runner:runner_java", - "//third_party/espresso:espresso_all_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//ui/android:ui_full_java", @@ -100,11 +100,28 @@ junit_binary("keyboard_accessory_junit_tests") { deps = [ ":internal_java", + "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", + "//chrome/android:chrome_java", "//chrome/android:chrome_test_util_java", + "//chrome/android/features/keyboard_accessory/public:public_java", + "//chrome/browser/flags:java", + "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", + "//chrome/test/android:chrome_java_test_support", + "//components/autofill/android:autofill_java", + "//components/embedder_support/android:content_view_java", + "//components/feature_engagement/public:public_java", "//components/module_installer/android:module_installer_java", + "//content/public/android:content_java", + "//third_party/android_deps:androidx_recyclerview_recyclerview_java", + "//third_party/android_deps:com_google_android_material_material_java", + "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/mockito:mockito_java", + "//ui/android:ui_full_java", + "//ui/android:ui_java_test_support", + "//ui/android:ui_utils_java", ] } diff --git a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn index c1d9b0964c4..d6d65c2a68c 100644 --- a/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/factory/BUILD.gn @@ -8,7 +8,11 @@ import("//chrome/android/features/android_library_factory_tmpl.gni") _factory_sources = [ "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentFactory.java" ] android_library_factory("public_java") { + # These deps will be inherited by the resulting android_library target. deps = [ "//chrome/android/features/keyboard_accessory/public:public_java" ] + + # This internal file will be replaced by a generated file so the resulting + # android_library target does not actually depend on this internal file. sources = _factory_sources } diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn index 5a710458c6e..4243bd3b403 100644 --- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn @@ -16,16 +16,20 @@ android_library("internal_java") { "//chrome/android:chrome_java", "//chrome/android/features/keyboard_accessory/public:public_java", "//chrome/browser/flags:java", + "//chrome/browser/fullscreen/android:java", "//chrome/browser/profiles/android:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/favicon:java", "//chrome/browser/util:java", "//components/autofill/android:autofill_java", + "//components/browser_ui/android/bottomsheet:java", "//components/browser_ui/widget/android:java", "//components/embedder_support/android:util_java", "//components/feature_engagement/public:public_java", "//content/public/android:content_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java", "//third_party/android_deps:androidx_viewpager_viewpager_java", "//third_party/android_deps:com_google_android_material_material_java", @@ -74,6 +78,7 @@ android_library("internal_java") { "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/DynamicInfoViewBottomSpacer.java", "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessoryInfoView.java", "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetCoordinator.java", + "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetMediator.java", "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewBinder.java", "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewBinder.java", "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/TouchToFillSheetCoordinator.java", @@ -89,6 +94,7 @@ android_library("internal_java") { android_resources("java_resources") { sources = [ "java/res/drawable/autofill_chip_inset.xml", + "java/res/drawable/ic_vpn_key_off.xml", "java/res/layout/address_accessory_sheet.xml", "java/res/layout/credit_card_accessory_sheet.xml", "java/res/layout/keyboard_accessory.xml", diff --git a/chromium/chrome/android/features/media_router/BUILD.gn b/chromium/chrome/android/features/media_router/BUILD.gn index 8b99219dae3..291d8dbec3b 100644 --- a/chromium/chrome/android/features/media_router/BUILD.gn +++ b/chromium/chrome/android/features/media_router/BUILD.gn @@ -17,6 +17,7 @@ android_library("java") { "//base:base_java", "//base:jni_java", "//chrome/android:chrome_java", + "//components/browser_ui/media/android:java", "//services/media_session/public/cpp/android:media_session_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_collection_collection_java", @@ -122,8 +123,13 @@ junit_binary("media_router_junit_tests") { deps = [ ":java", + "$google_play_services_package:google_play_services_basement_java", + "$google_play_services_package:google_play_services_cast_framework_java", + "$google_play_services_package:google_play_services_cast_java", + "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", + "//third_party/android_deps:androidx_mediarouter_mediarouter_java", ] } diff --git a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn index 5710847a845..3c2cf113950 100644 --- a/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn +++ b/chromium/chrome/android/features/stack_unwinder/public/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("memory_regions_map") { - public = [ "memory_regions_map.h" ] +source_set("native") { + public = [ + "function_types.h", + "memory_regions_map.h", + ] + sources = [ "memory_regions_map.cc" ] } diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn index aaa9a0223f5..d28445b4aa9 100644 --- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn +++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn @@ -27,9 +27,13 @@ android_resources("java_resources") { "java/res/drawable-xxhdpi/ic_home.png", "java/res/drawable-xxxhdpi/ic_explore.png", "java/res/drawable-xxxhdpi/ic_home.png", + "java/res/drawable/feed_loading_image_placeholder.xml", + "java/res/layout/feed_loading_layout.xml", "java/res/layout/ss_bottom_bar_layout.xml", "java/res/layout/ss_explore_button.xml", "java/res/layout/ss_home_button.xml", + "java/res/values-night/colors.xml", + "java/res/values/colors.xml", "java/res/values/dimens.xml", "java/res/values/ids.xml", ] @@ -64,10 +68,13 @@ android_library("java") { "//base:base_java", "//chrome/android:chrome_java", "//chrome/android/third_party/compositor_animator:compositor_animator_java", + "//chrome/browser/browser_controls/android:java", "//chrome/browser/flags:java", "//chrome/browser/preferences:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/ui/messages/android:java", + "//components/browser_ui/android/bottomsheet:java", "//components/browser_ui/widget/android:java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:com_google_android_material_material_java", @@ -76,15 +83,17 @@ android_library("java") { if (enable_feed_in_chrome) { sources += [ - "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceActionHandler.java", "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java", "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java", "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceStreamLifecycleManager.java", "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java", + "java/src/org/chromium/chrome/features/start_surface/FeedLoadingCoordinator.java", + "java/src/org/chromium/chrome/features/start_surface/FeedLoadingLayout.java", ] deps += [ "//chrome/browser/profiles/android:java", + "//components/signin/public/android:java", "//content/public/android:content_java", "//third_party/android_sdk/androidx_browser:androidx_browser_java", "//ui/android:ui_utils_java", diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn index ce21a8e0666..4fd7152bc36 100644 --- a/chromium/chrome/android/features/tab_ui/BUILD.gn +++ b/chromium/chrome/android/features/tab_ui/BUILD.gn @@ -35,6 +35,8 @@ android_resources("java_resources") { "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/message_card_background.xml", + "java/res/drawable/message_card_background_with_inset.xml", "java/res/drawable/popup_bg_dark.xml", "java/res/drawable/selected_tab_background.xml", "java/res/drawable/selected_tab_background_incognito.xml", @@ -68,6 +70,7 @@ android_resources("java_resources") { "java/res/layout/tab_selection_editor_toolbar.xml", "java/res/layout/tab_strip_item.xml", "java/res/layout/tasks_view_layout.xml", + "java/res/layout/trendy_terms_item.xml", "java/res/values/colors.xml", "java/res/values/dimens.xml", "java/res/values/drawables.xml", @@ -94,6 +97,10 @@ 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/TrendyTermsCache.java", + "java/src/org/chromium/chrome/browser/tasks/TrendyTermsCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/TrendyTermsProperties.java", + "java/src/org/chromium/chrome/browser/tasks/TrendyTermsViewBinder.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", @@ -116,7 +123,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemBinder.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/TabGridDialogView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphDialogView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java", @@ -158,7 +165,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiColorProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/BaselineStaleTabSuggestionProvider.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/BaselineTabSuggestionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java", @@ -168,6 +175,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcherResults.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java", ] deps = [ @@ -178,13 +186,17 @@ android_library("java") { "//chrome/android/features/start_surface/internal:java", "//chrome/app:java_strings_grd", "//chrome/browser/android/lifecycle:java", + "//chrome/browser/browser_controls/android:java", "//chrome/browser/flags:java", "//chrome/browser/profiles/android:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel: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/android/bottomsheet:java", + "//components/browser_ui/share/android:java", "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", "//components/content_settings/android:content_settings_enums_java", @@ -194,10 +206,12 @@ android_library("java") { "//components/infobars/core:infobar_enums_java", "//components/policy/android:policy_java", "//components/search_engines/android:java", + "//components/signin/core/browser/android:java", "//content/public/android:content_java", "//content/public/android:content_java_resources", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:androidx_appcompat_appcompat_resources_java", "//third_party/android_deps:androidx_core_core_java", "//third_party/android_deps:androidx_legacy_legacy_support_v13_java", "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java", 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 a042947ae5c..38986b1cda7 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 @@ -31,14 +31,16 @@ public_tab_management_java_sources += start_surface_public_java_sources 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/TrendyTermsCoordinatorTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/TrendyTermsViewBinderTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/ConditionalTabStripTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/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/TabGridDialogViewTest.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", @@ -60,6 +62,7 @@ tab_management_junit_java_sources = [ "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinderUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediatorUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TrendyTermsCacheUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTabUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/TabAttributeCacheUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java", @@ -83,4 +86,5 @@ tab_management_junit_java_sources = [ "//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", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcherUnitTest.java", ] diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn index 7bd362cbbbf..d22b6f77061 100644 --- a/chromium/chrome/android/features/vr/BUILD.gn +++ b/chromium/chrome/android/features/vr/BUILD.gn @@ -77,6 +77,7 @@ android_library("java") { "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", "//chrome/browser/tab:java", + "//chrome/browser/tabmodel:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", "//components/browser_ui/modaldialog/android:java", @@ -106,8 +107,6 @@ generate_jni("jni_headers") { sources = [ "java/src/org/chromium/chrome/browser/vr/AndroidUiGestureTarget.java", "java/src/org/chromium/chrome/browser/vr/AndroidVSyncHelper.java", - "java/src/org/chromium/chrome/browser/vr/ConsentFlowMetrics.java", - "java/src/org/chromium/chrome/browser/vr/VrConsentDialog.java", "java/src/org/chromium/chrome/browser/vr/VrCoreInfo.java", "java/src/org/chromium/chrome/browser/vr/VrInputConnection.java", "java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java", @@ -116,9 +115,4 @@ generate_jni("jni_headers") { "java/src/org/chromium/chrome/browser/vr/keyboard/GvrKeyboardLoaderClient.java", "java/src/org/chromium/chrome/browser/vr/keyboard/TextEditAction.java", ] - - if (enable_arcore) { - sources += - [ "java/src/org/chromium/chrome/browser/vr/ArConsentDialog.java" ] - } } diff --git a/chromium/chrome/android/features/vr/public_vr_java_sources.gni b/chromium/chrome/android/features/vr/public_vr_java_sources.gni index 219a498aa53..a74e6c266ba 100644 --- a/chromium/chrome/android/features/vr/public_vr_java_sources.gni +++ b/chromium/chrome/android/features/vr/public_vr_java_sources.gni @@ -16,15 +16,3 @@ public_vr_java_sources = [ "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModeProviderImpl.java", "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrModuleProvider.java", ] - -if (enable_vr) { - public_vr_java_sources += [ - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/ConsentFlowMetrics.java", - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrConsentDialog.java", - "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrConsentListener.java", - ] -} - -if (enable_arcore) { - public_vr_java_sources += [ "//chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/ArConsentDialog.java" ] -} diff --git a/chromium/chrome/android/feed/BUILD.gn b/chromium/chrome/android/feed/BUILD.gn index 70a71c78b7d..25ae97f0c98 100644 --- a/chromium/chrome/android/feed/BUILD.gn +++ b/chromium/chrome/android/feed/BUILD.gn @@ -19,6 +19,7 @@ if (enable_feed_in_chrome) { "core/java/res/drawable/hairline_border_card_background_with_inset.xml", "core/java/res/layout/feed_more_button.xml", "core/java/res/layout/feed_simple_list_item.xml", + "core/java/res/layout/feed_spinner.xml", "core/java/res/layout/feed_spinner_gone.xml", "core/java/res/layout/no_content.xml", "core/java/res/layout/zero_state.xml", diff --git a/chromium/chrome/android/feed/feed_java_sources.gni b/chromium/chrome/android/feed/feed_java_sources.gni index 41efe35881a..9da7021b355 100644 --- a/chromium/chrome/android/feed/feed_java_sources.gni +++ b/chromium/chrome/android/feed/feed_java_sources.gni @@ -44,6 +44,7 @@ if (enable_feed_in_chrome) { "//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/FeedV1StreamCreator.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", @@ -59,9 +60,6 @@ if (enable_feed_in_chrome) { "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/ProcessScopeBuilder.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/StreamScope.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/scope/StreamScopeBuilder.java", - "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Header.java", - "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/NonDismissibleHeader.java", - "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/client/stream/Stream.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/common/MutationContext.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/action/ActionApi.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/api/host/action/ActionEnabledApi.java", @@ -376,14 +374,20 @@ if (enable_feed_in_chrome) { "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollLogger.java", "//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/shared/stream/Header.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/stream/NonDismissibleHeader.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/stream/Stream.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/ui/MaterialSpinnerView.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/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/CardMenuBottomSheetContent.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/FeedSliceViewTracker.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStream.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/NativeViewListRenderer.java", ] @@ -634,7 +638,7 @@ if (enable_feed_in_chrome) { "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollLoggerTest.java", "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollRestoreHelperTest.java", "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/scroll/ScrollTrackerTest.java", - "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/library/sharedstream/ui/MaterialSpinnerViewTest.java", + "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/shared/ui/MaterialSpinnerViewTest.java", "junit/src/org/chromium/chrome/browser/feed/FeedApplicationInfoTest.java", "junit/src/org/chromium/chrome/browser/feed/FeedContentStorageTest.java", "junit/src/org/chromium/chrome/browser/feed/FeedImageLoaderTest.java", @@ -645,6 +649,7 @@ if (enable_feed_in_chrome) { "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/FeedSliceViewTrackerTest.java", "junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurfaceTest.java", "junit/src/org/chromium/chrome/browser/feed/v2/NativeViewListRendererTest.java", ] diff --git a/chromium/chrome/android/java_sources.gni b/chromium/chrome/android/java_sources.gni index b2f24064da7..d71e9f6da63 100644 --- a/chromium/chrome/android/java_sources.gni +++ b/chromium/chrome/android/java_sources.gni @@ -41,6 +41,7 @@ chrome_junit_test_java_sources += start_surface_junit_java_sources chrome_junit_test_java_sources += tab_management_junit_java_sources chrome_test_java_sources += tab_management_test_java_sources chrome_test_java_sources += share_test_java_sources +chrome_junit_test_java_sources += share_junit_test_java_sources if (enable_arcore) { chrome_java_sources += [ @@ -51,15 +52,3 @@ if (enable_arcore) { "java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java", ] } - -if (enable_password_change_in_leaked_dialog) { - chrome_java_sources += [ - "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogPasswordChangeBridge.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeContents.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeCoordinator.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeMediator.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeProperties.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeView.java", - "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogPasswordChangeViewBinder.java", - ] -} diff --git a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni index 76b0d11a6a2..693df7e361d 100644 --- a/chromium/chrome/android/modules/chrome_bundle_tmpl.gni +++ b/chromium/chrome/android/modules/chrome_bundle_tmpl.gni @@ -77,19 +77,19 @@ template("chrome_bundle") { "base_module_target", "bundle_name", "compress_shared_libraries", + "expected_proguard_config", "keystore_name", "keystore_password", "keystore_path", + "lint_suppressions_dep", "lint_suppressions_file", "manifest_package", "min_sdk_version", "proguard_android_sdk_dep", - "proguard_jar_path", "sign_bundle", "static_library_provider", "static_library_synchronized_proguard", - "verify_proguard_flags", - "verify_native_libs_and_assets", + "expected_libs_and_assets", "version_code", ]) command_line_flags_file = "chrome-command-line" diff --git a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn index 23ae81de902..acbf5c2329d 100644 --- a/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn +++ b/chromium/chrome/android/modules/stack_unwinder/internal/BUILD.gn @@ -43,7 +43,8 @@ component("stack_unwinder") { ":jni_headers", ":jni_registration", "//base", - "//chrome/android/features/stack_unwinder/public:memory_regions_map", + "//base:native_unwinder_android", + "//chrome/android/features/stack_unwinder/public:native", ] # stack unwinder native entrypoints belong in the partition. diff --git a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn index 0ea5726014b..488f5b253cd 100644 --- a/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn +++ b/chromium/chrome/android/modules/stack_unwinder/public/BUILD.gn @@ -20,8 +20,7 @@ source_set("module") { sources = [ "module.cc" ] deps = [ "//base", - "//chrome/android/features/stack_unwinder/public:memory_regions_map", + "//chrome/android/features/stack_unwinder/public:native", "//chrome/android/modules/stack_unwinder/provider:jni_headers", ] - libs = [ "dl" ] } diff --git a/chromium/chrome/android/third_party/compositor_animator/BUILD.gn b/chromium/chrome/android/third_party/compositor_animator/BUILD.gn index 1fe69c9fd9d..d1b46731070 100644 --- a/chromium/chrome/android/third_party/compositor_animator/BUILD.gn +++ b/chromium/chrome/android/third_party/compositor_animator/BUILD.gn @@ -6,11 +6,5 @@ import("//build/config/android/rules.gni") android_library("compositor_animator_java") { - # Turbine does not generate bridge methods in the parent class. Thus each - # child class generates its own bridge methods and adds a number of methods. - # This target would add about 30 methods if it enabled turbine. We are - # hoping to turn this back on once r8 can mitigate these extra methods. - enable_turbine = false - sources = [ "java/src/org/chromium/chrome/browser/compositor/animation/FloatProperty.java" ] } diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni index aff10998c5d..795d2190b9f 100644 --- a/chromium/chrome/android/trichrome.gni +++ b/chromium/chrome/android/trichrome.gni @@ -44,11 +44,10 @@ template("trichrome_library_apk_tmpl") { "android_manifest", "android_manifest_dep", "apk_name", + "expected_android_manifest", + "expected_libs_and_assets", "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, @@ -206,3 +205,24 @@ template("trichrome_library_apk_tmpl") { deps += [ "//chrome/android:trichrome_dummy_resources" ] } } + +# An .ssargs file is a text file to specify multiple input files with respective +# parameters, and is used by SuperSize-archive to create multi-container .size +# files. This is used to support SuperSize on Trichrome. +template("write_ssargs_trichrome") { + # Base names (i.e., no full path) are used because .ssargs files specifies + # files using paths relative to itself. It is expected for |ssargs_path| to + # be in the same directory as all Trichrome files whose sizes are measured + # by SuperSize. + ssargs_lines = [ + "# Written by build target \"${target_name}.\"", + "Library -f ${invoker.trichrome_library_basename}", + "Chrome -f ${invoker.trichrome_chrome_basename}", + + # WebView has no .so files. --java-only is needed to prevent SuperSize + # from failing. + "WebView -f ${invoker.trichrome_webview_basename} --java-only", + ] + + write_file(invoker.ssargs_path, ssargs_lines) +} diff --git a/chromium/chrome/android/webapk/libs/client/BUILD.gn b/chromium/chrome/android/webapk/libs/client/BUILD.gn index 84eac576794..32b6f20d192 100644 --- a/chromium/chrome/android/webapk/libs/client/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/client/BUILD.gn @@ -12,13 +12,12 @@ android_library("client_java") { "src/org/chromium/webapk/lib/client/WebApkIdentityServiceClient.java", "src/org/chromium/webapk/lib/client/WebApkNavigationClient.java", "src/org/chromium/webapk/lib/client/WebApkServiceConnectionManager.java", - "src/org/chromium/webapk/lib/client/WebApkValidator.java", - "src/org/chromium/webapk/lib/client/WebApkVerifySignature.java", ] deps = [ "//base:base_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", + "//components/webapk/android/libs/common:java", "//third_party/android_deps:androidx_annotation_annotation_java", ] srcjar_deps = [ ":runtime_library_version_java" ] @@ -37,16 +36,17 @@ junit_binary("webapk_client_junit_tests") { sources = [ "junit/src/org/chromium/webapk/lib/client/WebApkIdentityServiceClientTest.java", "junit/src/org/chromium/webapk/lib/client/WebApkServiceConnectionManagerTest.java", - "junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java", - "junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java", ] data = [ "//chrome/test/data/webapks/" ] deps = [ ":client_java", + "//base:base_java", "//base:base_junit_test_support", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/client:junit", + "//components/webapk/android/libs/common:java", "//testing/android/junit:junit_test_support", ] } diff --git a/chromium/chrome/android/webapk/libs/common/BUILD.gn b/chromium/chrome/android/webapk/libs/common/BUILD.gn index 4d4ef0c3e97..029d71c5efe 100644 --- a/chromium/chrome/android/webapk/libs/common/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/common/BUILD.gn @@ -8,9 +8,9 @@ android_library("common_java") { sources = [ "src/org/chromium/webapk/lib/common/WebApkCommonUtils.java", "src/org/chromium/webapk/lib/common/WebApkConstants.java", - "src/org/chromium/webapk/lib/common/WebApkMetaDataKeys.java", "src/org/chromium/webapk/lib/common/WebApkMetaDataUtils.java", ] + deps = [ "//components/webapk/android/libs/common:java" ] srcjar_deps = [ "//chrome/android/webapk/libs/common:identity_service_aidl" ] } diff --git a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn index 9626d986bc7..eaba3a5adf5 100644 --- a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn @@ -45,8 +45,9 @@ android_library("runtime_library_for_tests_java") { ] } -proguarded_dist_dex("webapk_runtime_library") { +dist_dex("webapk_runtime_library") { deps = [ ":runtime_library_for_assets_java" ] + proguard_enabled = true proguard_configs = [ "runtime_library.proguard.flags", "//base/android/proguard/chromium_code.flags", diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn index 04a3ce9f422..cbe4079714f 100644 --- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn @@ -70,6 +70,7 @@ template("webapk_java") { deps += [ "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/common:splash_java", + "//components/webapk/android/libs/common:java", ] } } @@ -314,7 +315,7 @@ webapk_tmpl("new_splash_webapk") { webapk_tmpl("javatests_webapk") { testonly = true config_file = "manifest/bound_manifest_config.json" - manifest_to_upload_dep = ":generate_old_style_manifest_for_upload" + manifest_to_upload_dep = ":generate_new_style_manifest_for_upload" delta_config_file = "manifest/javatest_manifest_config_delta.json" apk_name = "JavatestsWebApk" apk_package_name = "org.chromium.webapk.test" @@ -359,10 +360,13 @@ junit_binary("webapk_shell_apk_junit_tests") { "junit/src/org/chromium/webapk/shell_apk/WebApkUtilsTest.java", ] deps = [ + ":compiled_in_runtime_library_java", + ":webapk_generated_webapk_java", ":webapk_generated_webapk_with_service_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/common:java", ] } @@ -375,9 +379,11 @@ junit_binary("webapk_shell_apk_h2o_junit_tests") { ] deps = [ ":${h2o_junit_manifest_target_name}", + ":h2o_j_unit_webapk_generated_webapk_java", ":h2o_j_unit_webapk_generated_webapk_with_service_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/test:junit_test_support", + "//components/webapk/android/libs/common:java", ] data_deps = [ ":${h2o_junit_manifest_target_name}" ] } 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 0cad3b880e8..0736e76aa3f 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 = 128 +current_shell_apk_version = 130 diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn index 204a1eda720..ea445d160b7 100644 --- a/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/javatests/canary_lib/BUILD.gn @@ -5,26 +5,34 @@ import("//build/config/android/rules.gni") android_library("canary_lib_java") { - dex_path = "$target_out_dir/canary.dex" sources = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary.java" ] } +dist_dex("canary_dex") { + output = "$target_out_dir/canary.dex" + deps = [ ":canary_lib_java" ] +} + android_library("canary_lib2_java") { - dex_path = "$target_out_dir/canary2.dex" sources = [ "src/org/chromium/webapk/shell_apk/test/canary/Canary2.java" ] } +dist_dex("canary2_dex") { + output = "$target_out_dir/canary2.dex" + deps = [ ":canary_lib2_java" ] +} + # dex assets added to dex_optimizer_apk in order to test creating ClassLoader # from .dex in remote APK. android_assets("canary_dex_assets") { sources = [ "$target_out_dir/canary.dex" ] disable_compression = true - deps = [ ":canary_lib_java" ] + deps = [ ":canary_dex" ] } android_assets("canary_dex2_assets") { sources = [ "$target_out_dir/canary2.dex" ] disable_compression = true - deps = [ ":canary_lib2_java" ] + deps = [ ":canary2_dex" ] } diff --git a/chromium/chrome/android/webapk/test/BUILD.gn b/chromium/chrome/android/webapk/test/BUILD.gn index 008fba96676..90d04418c4b 100644 --- a/chromium/chrome/android/webapk/test/BUILD.gn +++ b/chromium/chrome/android/webapk/test/BUILD.gn @@ -11,7 +11,7 @@ java_library("junit_test_support") { sources = [ "src/org/chromium/webapk/test/WebApkTestHelper.java" ] deps = [ "//chrome/android/webapk/libs/common:common_java", + "//third_party/android_deps:robolectric_all_java", "//third_party/mockito:mockito_java", - "//third_party/robolectric:robolectric_all_java", ] } |