diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 530bccd2..513d2c3a 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -34c0c91996e05f4711a8b9c030853b7237535f7e- \ No newline at end of file +87354513bf5c5822069e914fff225062ab2732a0- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index 116b42e4..28b9eba9 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -107.0.5304.114 \ No newline at end of file +108.0.5359.56 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index bad75f98..cc4aceb6 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -a58397de73b02d076fa5f4685540e7274c1eb8e5 \ No newline at end of file +606bbd3dda16a2c38c4b0af033fda42a3fe6e8d6 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 406f6f86..44b91e9b 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -23,7 +23,6 @@ Site-setting-for-images.patch Content-settings-infrastructure.patch Add-webGL-site-setting.patch Add-webRTC-site-settings.patch -AV1-codec-support.patch Switch-to-fstack-protector-strong.patch Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch Bromite-package-name.patch diff --git a/build/chromium.gn_args b/build/chromium.gn_args index fe62619e..1536e4f1 100644 --- a/build/chromium.gn_args +++ b/build/chromium.gn_args @@ -43,5 +43,6 @@ use_errorprone_java_compiler=false use_gnome_keyring=false use_official_google_api_keys=false use_rtti=false +use_stable_package_name_for_trichrome=false use_sysroot=false webview_includes_weblayer=false diff --git a/build/chromium_patches_list.txt b/build/chromium_patches_list.txt index 188a4659..1f3b6fc9 100644 --- a/build/chromium_patches_list.txt +++ b/build/chromium_patches_list.txt @@ -1,4 +1,3 @@ -AV1-codec-support.patch exit-on-failure-of-inclusion.patch Reintroduce-override_build_timestamp.patch do-not-hide-.orig-files.patch diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index cf466d53..c60c61e0 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -32,19 +32,19 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn } configs += [ ":libaom_config" ] -@@ -259,6 +259,8 @@ static_library("libaom") { +@@ -257,6 +257,8 @@ static_library("libaom") { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] + # will detect CPU + sources += aom_ports_arm_sources } - if (is_android) { - deps += [ "//third_party/android_ndk:cpu_features" ] + if (current_cpu == "arm64" || current_cpu == "arm") { + # This is needed by all arm boards due to aom_arm_cpu_caps() diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni --- a/third_party/libaom/libaom_srcs.gni +++ b/third_party/libaom/libaom_srcs.gni -@@ -673,6 +673,11 @@ aom_rc_interface_sources = [ +@@ -635,6 +635,11 @@ aom_rc_interface_sources = [ "//third_party/libaom/source/libaom/test/yuv_video_source.h", ] diff --git a/build/patches/Chromium-package-name.patch b/build/patches/Chromium-package-name.patch index 450423ef..9446e662 100644 --- a/build/patches/Chromium-package-name.patch +++ b/build/patches/Chromium-package-name.patch @@ -8,16 +8,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +index 0f031a2868e67..b6ea9b4fe4e1e 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -46,7 +46,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { - assert(current_toolchain != android_secondary_abi_toolchain) - } +@@ -51,7 +51,7 @@ chrome_jni_registration_header = + chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h" --_default_package = "org.chromium.chrome" -+_default_package = "org.bromite.chromium" - if (android_channel != "default" && android_channel != "stable") { - # android-binary-size trybot may checks if an internal Chrome variant's - # AndroidManifest is as expected by ensuring the differences between its --- -2.25.1 + if (current_toolchain == default_toolchain) { +- _default_package = "org.chromium.chrome" ++ _default_package = "org.bromite.chromium" + if (use_stable_package_name_for_trichrome) { + _default_package += ".stable" + } else if (android_channel != "default" && android_channel != "stable") { +-- +2.30.2 + diff --git a/build/patches/Disable-feeds-support-by-default.patch b/build/patches/Disable-feeds-support-by-default.patch index ddf4008c..27d42540 100644 --- a/build/patches/Disable-feeds-support-by-default.patch +++ b/build/patches/Disable-feeds-support-by-default.patch @@ -6,13 +6,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../org/chromium/chrome/browser/feed/FeedFeatures.java | 8 +------- .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +- - components/feed/feed_feature_list.cc | 4 ++-- - 3 files changed, 4 insertions(+), 10 deletions(-) + components/feed/feed_feature_list.cc | 8 ++++---- + 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +index 7b10e5b24a8ba..ab4dd1ccfbff1 100644 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java -@@ -42,13 +42,7 @@ public final class FeedFeatures { +@@ -50,13 +50,7 @@ public final class FeedFeatures { * the user is signed in and confirms it's not a child profile. */ public static boolean isWebFeedUIEnabled() { @@ -26,8 +27,9 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe + return false; } - /** + public static boolean shouldUseWebFeedAwarenessIPH() { diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +index a4efd60024847..35b3ca107081d 100644 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java @@ -78,7 +78,7 @@ public class CachedFeatureFlags { @@ -40,22 +42,28 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true) .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false) diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc +index 198b24c5c9b5d..8e8e69154fd4f 100644 --- a/components/feed/feed_feature_list.cc +++ b/components/feed/feed_feature_list.cc -@@ -16,12 +16,12 @@ +@@ -17,14 +17,14 @@ namespace feed { - const base::Feature kInterestFeedContentSuggestions{ -- "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kInterestFeedContentSuggestions, +- "InterestFeedContentSuggestions", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "InterestFeedContentSuggestions", // must be disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default in Bromite // InterestFeedV2 takes precedence over InterestFeedContentSuggestions. // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is // changed, please update the cached one's default value in CachedFeatureFlags. - const base::Feature kInterestFeedV2{"InterestFeedV2", -- base::FEATURE_ENABLED_BY_DEFAULT}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kInterestFeedV2, +- "InterestFeedV2", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "InterestFeedV2", // must be disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // by default in Bromite - const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay", - base::FEATURE_DISABLED_BY_DEFAULT}; --- -2.25.1 + BASE_FEATURE(kInterestFeedV2Autoplay, + "InterestFeedV2Autoplay", +-- +2.30.2 + diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index e36628cb..83640f0f 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -84,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../permissions/permission_request_manager.cc | 5 +- .../safe_browsing/content/browser/BUILD.gn | 1 - .../content/common/file_type_policies.cc | 3 +- - .../safe_browsing/core/common/features.cc | 2 +- + .../safe_browsing/core/common/features.cc | 4 +- .../content/captive_portal_blocking_page.cc | 9 +- .../content/cert_report_helper.cc | 2 - .../unified_consent_service.cc | 2 +- @@ -95,9 +95,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../file_system_access_permission_context.h | 6 -- weblayer/BUILD.gn | 4 - weblayer/test/BUILD.gn | 1 - - 86 files changed, 213 insertions(+), 675 deletions(-) + 86 files changed, 214 insertions(+), 676 deletions(-) diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml +index 001ce6c5870c0..b7dcb7bf99ee3 100644 --- a/chrome/android/java/res/xml/google_services_preferences.xml +++ b/chrome/android/java/res/xml/google_services_preferences.xml @@ -26,11 +26,6 @@ found in the LICENSE file. @@ -113,6 +114,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom android:key="url_keyed_anonymized_data" android:title="@string/url_keyed_anonymized_data_title" diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml +index 231c5c00a8ce6..dfc636f01840e 100644 --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml @@ -62,11 +62,6 @@ found in the LICENSE file. @@ -128,6 +130,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j android:key="notifications" android:order="12" diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml +index eadd16fa6c6bf..4afa78d4c548d 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -18,11 +18,6 @@ found in the LICENSE file. @@ -154,6 +157,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi android:key="secure_dns" android:title="@string/settings_secure_dns_title" diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +index ba173aab43533..bbb81ffa4dd42 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java @@ -27,14 +27,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer; @@ -231,6 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting if (privacySandboxPreference != null) { privacySandboxPreference.setSummary( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java +index 237a436423426..cd9b30a269eb6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java @@ -7,11 +7,9 @@ import android.content.Context; @@ -258,6 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/S } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java +index 301cb27c3fbed..16d74aa40b8b7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java @@ -48,11 +48,6 @@ public class UsageStatsConsentDialog { @@ -273,6 +279,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/Usa mDialogModel = builder.build(); diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc +index 09414997fc9ab..7b5d717752299 100644 --- a/chrome/app/android/chrome_main_delegate_android.cc +++ b/chrome/app/android/chrome_main_delegate_android.cc @@ -9,6 +9,7 @@ @@ -284,9 +291,10 @@ diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/and #include "base/files/file_util.h" #include "base/logging.h" diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index 6af6b725815f6..1e9f8ec45fbf9 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -336,8 +336,6 @@ static_library("browser") { +@@ -338,8 +338,6 @@ static_library("browser") { "complex_tasks/task_tab_helper.h", "component_updater/autofill_regex_remover.cc", "component_updater/autofill_regex_remover.h", @@ -295,7 +303,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "component_updater/chrome_component_updater_configurator.cc", "component_updater/chrome_component_updater_configurator.h", "component_updater/chrome_origin_trials_component_installer.cc", -@@ -350,8 +348,6 @@ static_library("browser") { +@@ -352,8 +350,6 @@ static_library("browser") { "component_updater/component_updater_utils.h", "component_updater/crl_set_component_installer.cc", "component_updater/crl_set_component_installer.h", @@ -304,7 +312,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "component_updater/first_party_sets_component_installer.cc", "component_updater/first_party_sets_component_installer.h", "component_updater/mei_preload_component_installer.cc", -@@ -1117,8 +1113,6 @@ static_library("browser") { +@@ -1125,8 +1121,6 @@ static_library("browser") { "permissions/adaptive_quiet_notification_permission_ui_enabler.h", "permissions/chrome_permissions_client.cc", "permissions/chrome_permissions_client.h", @@ -313,7 +321,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "permissions/crowd_deny_preload_data.cc", "permissions/crowd_deny_preload_data.h", "permissions/crowd_deny_safe_browsing_request.cc", -@@ -1505,15 +1499,6 @@ static_library("browser") { +@@ -1517,15 +1511,6 @@ static_library("browser") { "renderer_host/chrome_navigation_ui_data.h", "renderer_preferences_util.cc", "renderer_preferences_util.h", @@ -329,7 +337,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "resource_coordinator/resource_coordinator_parts.cc", "resource_coordinator/resource_coordinator_parts.h", "resource_coordinator/session_restore_policy.cc", -@@ -2247,11 +2232,8 @@ static_library("browser") { +@@ -2262,11 +2247,8 @@ static_library("browser") { "//components/reporting/util:status_macros", "//components/reporting/util:status_proto", "//components/reporting/util:task_runner_context", @@ -341,7 +349,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3232,12 +3214,6 @@ static_library("browser") { +@@ -3245,12 +3227,6 @@ static_library("browser") { "profiles/profile_manager_android.cc", "profiles/profile_manager_android.h", "query_tiles/android/tile_provider_factory.cc", @@ -354,7 +362,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "safe_browsing/android/password_reuse_controller_android.cc", "safe_browsing/android/password_reuse_controller_android.h", "safe_browsing/android/safe_browsing_referring_app_bridge_android.cc", -@@ -3720,8 +3696,6 @@ static_library("browser") { +@@ -3733,8 +3709,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -363,7 +371,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", -@@ -8198,8 +8172,6 @@ static_library("test_support") { +@@ -8259,8 +8233,6 @@ static_library("test_support") { "//components/reporting/util:status_macros", "//components/reporting/util:status_proto", "//components/reporting/util:task_runner_context", @@ -373,6 +381,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/search_engines:test_support", "//components/security_interstitials/content:security_interstitial_page", diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc +index dad392ba81df3..e93b47b9ff435 100644 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc @@ -35,7 +35,9 @@ @@ -421,6 +430,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom void TabWebContentsDelegateAndroid::RunFileChooser( diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h +index f365449df16a8..67ad0df712eb4 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h @@ -54,10 +54,6 @@ class NetworkQualityTracker; @@ -445,6 +455,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h // Browsing subresource filter. virtual subresource_filter::RulesetService* diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc +index a7a2bfe6738c3..dc4dfd0e2d49e 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -72,7 +72,6 @@ @@ -463,7 +474,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro #include "components/sessions/core/session_id_generator.h" #include "components/subresource_filter/content/browser/ruleset_service.h" #include "components/translate/core/browser/translate_download_manager.h" -@@ -406,8 +404,6 @@ void BrowserProcessImpl::StartTearDown() { +@@ -408,8 +406,6 @@ void BrowserProcessImpl::StartTearDown() { metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -487,7 +498,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro subresource_filter::RulesetService* BrowserProcessImpl::subresource_filter_ruleset_service() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1275,23 +1263,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { +@@ -1279,23 +1267,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() { } void BrowserProcessImpl::CreateSafeBrowsingService() { @@ -512,6 +523,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro void BrowserProcessImpl::CreateSubresourceFilterRulesetService() { diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h +index f8a1250d7ba07..b3ec6e6a9ef81 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -180,7 +180,6 @@ class BrowserProcessImpl : public BrowserProcess, @@ -533,9 +545,10 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc std::unique_ptr subresource_filter_ruleset_service_; diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +index 805ee3318144a..87d1afc5e2042 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -638,10 +638,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -641,10 +641,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -549,9 +562,10 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. // Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS. browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc +index 96b42e4e7ffe3..bb81389e0ea17 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -111,6 +111,7 @@ +@@ -113,6 +113,7 @@ #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h" #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" #include "chrome/browser/renderer_preferences_util.h" @@ -559,7 +573,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/safe_browsing/certificate_reporting_service.h" #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" -@@ -118,6 +119,7 @@ +@@ -120,6 +121,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" #include "chrome/browser/safe_browsing/url_lookup_service_factory.h" @@ -567,7 +581,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/search/search.h" #include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h" #include "chrome/browser/sharing/sms/sms_remote_fetcher.h" -@@ -1015,9 +1017,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { +@@ -1025,9 +1027,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { class CertificateReportingServiceCertReporter : public SSLCertReporter { public: explicit CertificateReportingServiceCertReporter( @@ -578,7 +592,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch CertificateReportingServiceCertReporter( const CertificateReportingServiceCertReporter&) = delete; -@@ -1029,11 +1029,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { +@@ -1039,11 +1039,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter { // SSLCertReporter implementation void ReportInvalidCertificateChain( const std::string& serialized_report) override { @@ -590,7 +604,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch }; #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -1285,14 +1283,6 @@ void MaybeAddThrottle( +@@ -1295,14 +1293,6 @@ void MaybeAddThrottle( throttles->push_back(std::move(maybe_throttle)); } @@ -605,16 +619,16 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch void MaybeAddThrottles( std::vector> additional, std::vector>* combined) { -@@ -2376,7 +2366,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2394,7 +2384,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( } #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) - bool enable_crash_reporter = true; + bool enable_crash_reporter = false; - #else + #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -4651,6 +4641,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4681,6 +4671,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -622,15 +636,15 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // g_browser_process->safe_browsing_service() may be null in unittests. safe_browsing::SafeBrowsingUIManager* ui_manager = g_browser_process->safe_browsing_service() -@@ -4666,6 +4657,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4696,6 +4687,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( std::make_unique( handle)); } +#endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. -@@ -4900,7 +4892,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState( + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: +@@ -4936,7 +4928,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState( void ChromeContentBrowserClient::InitOnUIThread() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -640,7 +654,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // Initialize `network_contexts_parent_directory_`. base::FilePath user_data_dir; -@@ -6099,6 +6093,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -6132,6 +6126,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( const std::vector& allowlist_domains) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -648,7 +662,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch // Should not bypass safe browsing check if the check is for enterprise // lookup. if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled) -@@ -6119,6 +6114,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -6152,6 +6147,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( } return safe_browsing_url_checker_delegate_; @@ -658,7 +672,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch } safe_browsing::RealTimeUrlLookupServiceBase* -@@ -6126,24 +6124,28 @@ ChromeContentBrowserClient::GetUrlLookupService( +@@ -6159,24 +6157,28 @@ ChromeContentBrowserClient::GetUrlLookupService( content::BrowserContext* browser_context, bool is_enterprise_lookup_enabled, bool is_consumer_lookup_enabled) { @@ -689,9 +703,10 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch } diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h +index 10b5cf030a944..fa2e73f83db9a 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -918,9 +918,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -922,9 +922,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { // Parts are deleted in the reverse order they are added. std::vector extra_parts_; @@ -704,9 +719,10 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chr StartupData startup_data_; diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +index aadbee3054da5..d4fa4d3b5d4c0 100644 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc -@@ -133,6 +133,7 @@ +@@ -131,6 +131,7 @@ namespace { @@ -714,7 +730,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b // Helper method for ExposeInterfacesToRenderer() that checks the latest // SafeBrowsing pref value on the UI thread before hopping over to the IO // thread. -@@ -174,6 +175,7 @@ void MaybeCreateSafeBrowsingForRenderer( +@@ -172,6 +173,7 @@ void MaybeCreateSafeBrowsingForRenderer( allowlist_domains), std::move(receiver))); } @@ -723,6 +739,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b // BadgeManager is not used for Android. #if !BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc +index a1c5effb8ae80..8937960995706 100644 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc @@ -19,7 +19,9 @@ @@ -757,6 +774,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta } // namespace diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc +index 95469abf28b7d..cae9d2eaf4eb4 100644 --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc @@ -16,7 +16,6 @@ @@ -795,6 +813,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c RegisterScreenAIComponent(cus, g_browser_process->local_state()); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc +index 77b89c1888aea..bf49dd7730247 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -42,15 +42,19 @@ @@ -981,6 +1000,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom void ChromeDownloadManagerDelegate::CheckDownloadAllowed( diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h +index b1dd062155fdc..585f233daccce 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h @@ -21,8 +21,10 @@ @@ -1031,9 +1051,10 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome // Show file picker for |download|. virtual void ShowFilePickerForDownload( diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc +index 3c4694117117e..841f7b8e0f91f 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc -@@ -34,7 +34,9 @@ +@@ -35,7 +35,9 @@ #include "chrome/browser/enterprise/connectors/connectors_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/download_protection/deep_scanning_request.h" @@ -1042,8 +1063,8 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow +#endif #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/grit/chromium_strings.h" -@@ -44,8 +46,10 @@ + #include "chrome/browser/signin/identity_manager_factory.h" +@@ -46,8 +48,10 @@ #include "components/download/public/common/download_item.h" #include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" @@ -1052,9 +1073,9 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow #include "components/safe_browsing/content/common/proto/download_file_types.pb.h" +#endif #include "components/safe_browsing/core/common/features.h" - #include "components/vector_icons/vector_icons.h" - #include "content/public/browser/browser_task_traits.h" -@@ -62,7 +66,9 @@ + #include "components/signin/public/base/consent_level.h" + #include "components/signin/public/identity_manager/account_info.h" +@@ -67,7 +71,9 @@ using download::DownloadItem; using MixedContentStatus = download::DownloadItem::MixedContentStatus; @@ -1064,7 +1085,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow using ReportThreatDetailsResult = safe_browsing::PingManager::ReportThreatDetailsResult; using TailoredVerdict = safe_browsing::ClientDownloadResponse::TailoredVerdict; -@@ -100,9 +106,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data { +@@ -105,9 +111,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data { // for the file type. absl::optional should_prefer_opening_in_browser_; @@ -1076,7 +1097,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow // Whether the download is currently being revived. bool is_being_revived_; -@@ -150,7 +158,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate( +@@ -155,7 +163,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate( DownloadItemModelData::DownloadItemModelData() : should_show_in_shelf_(true), was_ui_notified_(false), @@ -1086,7 +1107,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow is_being_revived_(false) {} #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -472,6 +482,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { +@@ -490,6 +500,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { data->should_prefer_opening_in_browser_ = preference; } @@ -1094,7 +1115,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { const DownloadItemModelData* data = DownloadItemModelData::Get(download_); return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; -@@ -482,6 +493,7 @@ void DownloadItemModel::SetDangerLevel( +@@ -500,6 +511,7 @@ void DownloadItemModel::SetDangerLevel( DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } @@ -1102,7 +1123,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow download::DownloadItem::MixedContentStatus DownloadItemModel::GetMixedContentStatus() const { -@@ -701,9 +713,6 @@ bool DownloadItemModel::IsCommandEnabled( +@@ -719,9 +731,6 @@ bool DownloadItemModel::IsCommandEnabled( // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -1113,6 +1134,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow case DownloadCommands::PAUSE: return !download_->IsSavePackageDownload() && diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h +index 8fb5ecf3c6253..8e137bf06c7e5 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h @@ -14,7 +14,9 @@ @@ -1138,6 +1160,7 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/down const override; void OpenUsingPlatformHandler() override; diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc +index 04d7b8ae25192..23b16a4642eff 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -42,7 +42,9 @@ @@ -1176,7 +1199,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download } } -@@ -458,10 +455,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(const GURL& url, +@@ -450,10 +447,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(const GURL& url, bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -1188,11 +1211,12 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download/download_stats.cc +index 330c4862174e1..051f0839943a2 100644 --- a/chrome/browser/download/download_stats.cc +++ b/chrome/browser/download/download_stats.cc -@@ -9,7 +9,9 @@ - #include "base/notreached.h" +@@ -10,7 +10,9 @@ #include "build/build_config.h" + #include "components/download/public/common/download_content.h" #include "components/profile_metrics/browser_profile_type.h" +#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/download/download_stats.h" @@ -1200,7 +1224,7 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download void RecordDownloadCount(ChromeDownloadCountTypes type) { base::UmaHistogramEnumeration("Download.CountsChrome", type, -@@ -28,8 +30,10 @@ void RecordDangerousDownloadWarningShown( +@@ -29,8 +31,10 @@ void RecordDangerousDownloadWarningShown( bool has_user_gesture) { base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, download::DOWNLOAD_DANGER_TYPE_MAX); @@ -1211,7 +1235,7 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download } void RecordOpenedDangerousConfirmDialog( -@@ -44,11 +48,13 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method, +@@ -45,6 +49,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method, base::RecordAction(base::UserMetricsAction("Download.Open")); base::UmaHistogramEnumeration("Download.OpenMethod", open_method, DOWNLOAD_OPEN_METHOD_LAST_ENTRY); @@ -1219,13 +1243,16 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download download::DownloadContent download_content = download::DownloadContentFromMimeType( mime_type_string, /*record_content_subcategory=*/false); +@@ -61,6 +66,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method, + } base::UmaHistogramEnumeration("Download.Open.ContentType", download_content, download::DownloadContent::MAX); +#endif } - void RecordDatabaseAvailability(bool is_available) { + void RecordDownloadOpenButtonPressed(bool is_download_completed) { diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc +index 6b6d4fc8354f3..3af5b1447b196 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -31,9 +31,11 @@ @@ -1291,7 +1318,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // If no mime type or explicitly specified a name, don't replace file // extension. -@@ -917,6 +927,7 @@ DownloadTargetDeterminer::Result +@@ -920,6 +930,7 @@ DownloadTargetDeterminer::Result return CONTINUE; } @@ -1299,7 +1326,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // First determine the danger level assuming that the user doesn't have any // prior visits to the referrer recoreded in history. The resulting danger // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit -@@ -953,6 +964,7 @@ DownloadTargetDeterminer::Result +@@ -956,6 +967,7 @@ DownloadTargetDeterminer::Result // invalid, then assume the referrer has not been visited before. if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -1307,7 +1334,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow return CONTINUE; } -@@ -960,6 +972,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( +@@ -963,6 +975,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -1315,7 +1342,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow safe_browsing::RecordDownloadFileTypeAttributes( safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( virtual_path_.BaseName(), download_->GetURL(), -@@ -971,6 +984,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( +@@ -974,6 +987,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( if (danger_level_ != DownloadFileType::NOT_DANGEROUS && danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -1323,7 +1350,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow DoLoop(); } -@@ -1069,7 +1083,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -1072,7 +1086,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( << " Intermediate:" << intermediate_path_.AsUTF8Unsafe() << " Confirmation reason:" << static_cast(confirmation_reason_) << " Danger type:" << danger_type_ @@ -1333,7 +1360,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow << " Result:" << static_cast(result); std::unique_ptr target_info(new DownloadTargetInfo); -@@ -1081,7 +1097,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -1084,7 +1100,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( ? DownloadItem::TARGET_DISPOSITION_PROMPT : DownloadItem::TARGET_DISPOSITION_OVERWRITE); target_info->danger_type = danger_type_; @@ -1343,7 +1370,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow target_info->intermediate_path = intermediate_path_; target_info->mime_type = mime_type_; target_info->is_filetype_handled_safely = is_filetype_handled_safely_; -@@ -1175,54 +1193,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { +@@ -1177,54 +1195,11 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { DownloadItem::TARGET_DISPOSITION_PROMPT); } @@ -1399,7 +1426,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow } absl::optional -@@ -1236,6 +1211,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { +@@ -1238,6 +1213,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { EventType::DANGEROUS_DOWNLOAD_BYPASS) : absl::nullopt; } @@ -1408,6 +1435,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow void DownloadTargetDeterminer::OnDownloadDestroyed( DownloadItem* download) { diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h +index bb050f59c63fb..e5c7325fd08f1 100644 --- a/chrome/browser/download/download_target_determiner.h +++ b/chrome/browser/download/download_target_determiner.h @@ -20,7 +20,9 @@ @@ -1447,6 +1475,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows base::FilePath local_path_; base::FilePath intermediate_path_; diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/download/download_target_info.cc +index ad088f4e6730f..5e0267df3f9b4 100644 --- a/chrome/browser/download/download_target_info.cc +++ b/chrome/browser/download/download_target_info.cc @@ -4,12 +4,16 @@ @@ -1467,6 +1496,7 @@ diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/do result(download::DOWNLOAD_INTERRUPT_REASON_NONE), mixed_content_status( diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h +index 41e568f74657e..0be444b35f36d 100644 --- a/chrome/browser/download/download_target_info.h +++ b/chrome/browser/download/download_target_info.h @@ -11,7 +11,9 @@ @@ -1496,9 +1526,10 @@ diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/dow // Suggested intermediate path. The downloaded bytes should be written to this // path until all the bytes are available and the user has accepted a diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc +index ee27c17a2bbc1..ae74fd3b83873 100644 --- a/chrome/browser/download/download_ui_model.cc +++ b/chrome/browser/download/download_ui_model.cc -@@ -37,7 +37,9 @@ +@@ -39,7 +39,9 @@ using download::DownloadItem; using offline_items_collection::FailState; @@ -1508,7 +1539,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl namespace { -@@ -463,12 +465,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() { +@@ -465,12 +467,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() { void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {} @@ -1524,6 +1555,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl download::DownloadItem::MixedContentStatus DownloadUIModel::GetMixedContentStatus() const { diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h +index 3f38bcf8d911e..45a75d7c5c020 100644 --- a/chrome/browser/download/download_ui_model.h +++ b/chrome/browser/download/download_ui_model.h @@ -19,7 +19,9 @@ @@ -1553,6 +1585,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo // Return the mixed content status determined during download target // determination. diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc +index 3390cf2172538..c503f2fc04e7b 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -37,7 +37,6 @@ @@ -1618,6 +1651,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b DownloadsShowFunction::DownloadsShowFunction() {} diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h +index 9ad098d656597..9dc64d4771e78 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -13,7 +13,6 @@ @@ -1657,9 +1691,10 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br class DownloadsShowFunction : public ExtensionFunction { diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +index bfab38fa77399..c6afb607c8047 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -1263,21 +1263,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { +@@ -1277,21 +1277,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() { GetExtensionStatus::Params::Create(args())); EXTENSION_FUNCTION_VALIDATE(params); @@ -1685,6 +1720,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api ExtensionFunction::ResponseValue diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +index 927169dd05cd7..b7e382a53a700 100644 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc @@ -37,8 +37,11 @@ @@ -1731,7 +1767,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss void DoSafeBrowsingCheckOnUIThread( content::GlobalRenderFrameHostId frame_id, std::unique_ptr item, -@@ -420,6 +425,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) { +@@ -422,6 +427,7 @@ InterpretSafeBrowsingResult(safe_browsing::DownloadCheckResult result) { NOTREACHED(); return ChromeFileSystemAccessPermissionContext::AfterWriteCheckResult::kBlock; } @@ -1739,7 +1775,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss std::string GenerateLastPickedDirectoryKey(const std::string& id) { return id.empty() ? kDefaultLastPickedDirectoryKey -@@ -1202,6 +1208,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess( +@@ -1204,6 +1210,7 @@ void ChromeFileSystemAccessPermissionContext::ConfirmSensitiveEntryAccess( frame_id, std::move(callback))); } @@ -1747,7 +1783,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( std::unique_ptr item, content::GlobalRenderFrameHostId frame_id, -@@ -1223,6 +1230,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( +@@ -1225,6 +1232,7 @@ void ChromeFileSystemAccessPermissionContext::PerformAfterWriteChecks( }, base::SequencedTaskRunnerHandle::Get(), std::move(callback)))); } @@ -1755,7 +1791,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss void ChromeFileSystemAccessPermissionContext:: DidConfirmSensitiveDirectoryAccess( -@@ -1234,6 +1242,7 @@ void ChromeFileSystemAccessPermissionContext:: +@@ -1236,6 +1244,7 @@ void ChromeFileSystemAccessPermissionContext:: base::OnceCallback callback, bool should_block) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -1763,7 +1799,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss if (!should_block) { // If attempting to save a file with a dangerous extension, prompt the user // to make them confirm they actually want to save the file. -@@ -1259,6 +1268,7 @@ void ChromeFileSystemAccessPermissionContext:: +@@ -1261,6 +1270,7 @@ void ChromeFileSystemAccessPermissionContext:: std::move(callback).Run(SensitiveEntryResult::kAllowed); return; } @@ -1772,6 +1808,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss auto result_callback = BindResultCallbackToCurrentSequence(std::move(callback)); diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +index 9fa06d8701981..f5fbf0f46c29b 100644 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h @@ -19,6 +19,7 @@ @@ -1783,7 +1820,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss #include "third_party/blink/public/mojom/file_system_access/file_system_access_manager.mojom-forward.h" #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h" @@ -88,10 +89,6 @@ class ChromeFileSystemAccessPermissionContext - ui::SelectFileDialog::Type dialog_type, + UserAction user_action, content::GlobalRenderFrameHostId frame_id, base::OnceCallback callback) override; - void PerformAfterWriteChecks( @@ -1794,6 +1831,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss bool CanObtainWritePermission(const url::Origin& origin) override; diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chrome/browser/lookalikes/lookalike_url_controller_client.cc +index 4f1f07957966a..99b6bdf90cb42 100644 --- a/chrome/browser/lookalikes/lookalike_url_controller_client.cc +++ b/chrome/browser/lookalikes/lookalike_url_controller_client.cc @@ -9,7 +9,6 @@ @@ -1814,9 +1852,10 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chro Reload(); } diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc +index 160d787d79fbc..c95f7a29cadb2 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -881,9 +881,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { +@@ -895,9 +895,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -1827,9 +1866,10 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br metrics_service_->RegisterMetricsProvider( std::make_unique()); diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +index 41e4c6fce4ee4..0d8b9e938d4b8 100644 --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -@@ -137,9 +137,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( +@@ -130,9 +130,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( std::string serialized_report; if (!report.Serialize(&serialized_report)) return; @@ -1840,9 +1880,10 @@ diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/c // static diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc +index fae947b020195..79a04fd27f086 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -121,10 +121,10 @@ +@@ -127,10 +127,10 @@ #include "ui/base/data_transfer_policy/data_transfer_endpoint.h" #include "url/url_constants.h" @@ -1854,7 +1895,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b #endif #if BUILDFLAG(IS_ANDROID) -@@ -922,21 +922,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const { +@@ -963,21 +963,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const { safe_browsing::PasswordProtectionService* ChromePasswordManagerClient::GetPasswordProtectionService() const { @@ -1877,7 +1918,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b } #endif // defined(ON_FOCUS_PING_ENABLED) -@@ -948,26 +940,12 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( +@@ -989,15 +981,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( bool password_field_exists, uint64_t reused_password_hash, const std::string& domain) { @@ -1891,8 +1932,9 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b - password_type, matching_reused_credentials, password_field_exists); - #if !BUILDFLAG(IS_ANDROID) - // TODO(crbug.com/1351484): Hook this to the extension service in the next CL. - #endif // !BUILDFLAG(IS_ANDROID) + // If the webpage is not an extension page, do nothing. + if (!GURL(domain).SchemeIs(kExtensionScheme)) { +@@ -1036,11 +1019,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry( } void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() { @@ -1904,7 +1946,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b } #if !BUILDFLAG(IS_ANDROID) -@@ -1592,6 +1570,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1671,6 +1649,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( is_enabled = false; } @@ -1912,7 +1954,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b // SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing // warnings until user interaction. If the current page has a delayed warning, // it'll have a user interaction observer attached. Disable password -@@ -1602,6 +1581,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( +@@ -1681,6 +1660,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( observer->OnPasswordSaveOrAutofillDenied(); is_enabled = false; } @@ -1921,17 +1963,18 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b if (log_manager_->IsLoggingActive()) { password_manager::BrowserSavePasswordProgressLogger logger( diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc +index 6d3f766751ebf..646c9e601a49c 100644 --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -18,7 +18,6 @@ +@@ -19,7 +19,6 @@ #include "chrome/browser/engagement/important_sites_util.h" #include "chrome/browser/metrics/ukm_background_recorder_service.h" #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" -#include "chrome/browser/permissions/contextual_notification_permission_ui_selector.h" + #include "chrome/browser/permissions/origin_keyed_permission_action_service_factory.h" #include "chrome/browser/permissions/permission_actions_history_factory.h" #include "chrome/browser/permissions/permission_decision_auto_blocker_factory.h" - #include "chrome/browser/permissions/permission_revocation_request.h" -@@ -292,19 +291,6 @@ permissions::IconId ChromePermissionsClient::GetOverrideIconId( +@@ -295,19 +294,6 @@ permissions::IconId ChromePermissionsClient::GetOverrideIconId( return PermissionsClient::GetOverrideIconId(request_type); } @@ -1952,9 +1995,10 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/br content::BrowserContext* browser_context, permissions::RequestType request_type, diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h +index 09176eb28c53b..076fe199e6ef6 100644 --- a/chrome/browser/permissions/chrome_permissions_client.h +++ b/chrome/browser/permissions/chrome_permissions_client.h -@@ -48,9 +48,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { +@@ -51,9 +51,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient { GetUkmSourceIdCallback callback) override; permissions::IconId GetOverrideIconId( permissions::RequestType request_type) override; @@ -1965,6 +2009,7 @@ diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/bro content::BrowserContext* browser_context, permissions::RequestType request_type, diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrome/browser/permissions/permission_revocation_request.cc +index 89d678fb08db5..df926d016d821 100644 --- a/chrome/browser/permissions/permission_revocation_request.cc +++ b/chrome/browser/permissions/permission_revocation_request.cc @@ -145,6 +145,7 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() { @@ -1986,14 +2031,14 @@ diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrom void PermissionRevocationRequest::OnSiteReputationReady( @@ -172,6 +176,7 @@ void PermissionRevocationRequest::OnSiteReputationReady( - CrowdDenyPreloadData::SiteReputation::ABUSIVE_CONTENT || - site_reputation->notification_ux_quality() == - CrowdDenyPreloadData::SiteReputation::DISRUPTIVE_BEHAVIOR)) { + case CrowdDenyPreloadData::SiteReputation::ABUSIVE_CONTENT: + should_revoke_permission = NotificationsPermissionRevocationConfig:: + IsAbusiveOriginPermissionRevocationEnabled(); +#if BUILDFLAG(FULL_SAFE_BROWSING) - DCHECK(g_browser_process->safe_browsing_service()); - - if (g_browser_process->safe_browsing_service()) { -@@ -183,6 +188,7 @@ void PermissionRevocationRequest::OnSiteReputationReady( + break; + case CrowdDenyPreloadData::SiteReputation::DISRUPTIVE_BEHAVIOR: + should_revoke_permission = NotificationsPermissionRevocationConfig:: +@@ -191,6 +196,7 @@ void PermissionRevocationRequest::OnSiteReputationReady( weak_factory_.GetWeakPtr(), site_reputation)); return; } @@ -2002,9 +2047,10 @@ diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrom NotifyCallback(Outcome::PERMISSION_NOT_REVOKED); } diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc +index 7efe78ed612b8..aa62e1fdabc0b 100644 --- a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc +++ b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc -@@ -99,8 +99,8 @@ bool QuietNotificationPermissionUiConfig::IsCrowdDenyTriggeringEnabled() { +@@ -89,8 +89,8 @@ bool QuietNotificationPermissionUiConfig::IsCrowdDenyTriggeringEnabled() { return false; return base::GetFieldTrialParamByFeatureAsBool( @@ -2016,6 +2062,7 @@ diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_config. // static diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc +index 3eff9bc639bb1..746c4278ebc09 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -9,6 +9,7 @@ @@ -2026,7 +2073,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "build/chromecast_buildflags.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/about_flags.h" -@@ -1321,7 +1322,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1294,7 +1295,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, PushMessagingAppIdentifier::RegisterProfilePrefs(registry); QuietNotificationPermissionUiState::RegisterProfilePrefs(registry); RegisterBrowserUserPrefs(registry); @@ -2037,6 +2084,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse SearchPrefetchService::RegisterProfilePrefs(registry); blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn +index 991362715acbd..0ea925f49550b 100644 --- a/chrome/browser/privacy_guide/android/BUILD.gn +++ b/chrome/browser/privacy_guide/android/BUILD.gn @@ -13,7 +13,6 @@ android_library("java") { @@ -2056,6 +2104,7 @@ diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/priv ] deps = [ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java +index 2bba95e331ad4..410f7658761fd 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java @@ -122,9 +122,6 @@ public class PrivacyGuideFragment extends Fragment { @@ -2069,6 +2118,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b @Override diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java +index a852c5bcce6bf..01900603da718 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java @@ -56,8 +56,6 @@ public class PrivacyGuidePagerAdapter extends FragmentStateAdapter { @@ -2081,6 +2131,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b return new CookiesFragment(); } diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java +index 784a335cae5ac..9e12b760a41d8 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java @@ -19,7 +19,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler { @@ -2093,9 +2144,10 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b @Override diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +index 7105c7ad1b4dc..45bcfb7b22996 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -81,7 +81,6 @@ +@@ -82,7 +82,6 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h" #include "chrome/browser/profiles/renderer_updater_factory.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" @@ -2103,7 +2155,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/safe_browsing/tailored_security/tailored_security_service_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -@@ -357,7 +356,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -358,7 +357,6 @@ void ChromeBrowserMainExtraPartsProfiles:: CertDbInitializerFactory::GetInstance(); #endif #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) @@ -2111,7 +2163,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #endif #if !BUILDFLAG(IS_ANDROID) ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); -@@ -587,7 +585,9 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -589,7 +587,9 @@ void ChromeBrowserMainExtraPartsProfiles:: } #endif TabRestoreServiceFactory::GetInstance(); @@ -2122,9 +2174,10 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc TemplateURLServiceFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc +index 2b1fd89740659..69b189cb40d77 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -91,7 +91,6 @@ +@@ -92,7 +92,6 @@ #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" #include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h" @@ -2132,7 +2185,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -633,6 +632,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { +@@ -625,6 +624,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { mojo::PendingRemote pref_validation_delegate; @@ -2140,7 +2193,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p scoped_refptr safe_browsing_service( g_browser_process->safe_browsing_service()); if (safe_browsing_service.get()) { -@@ -644,7 +644,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { +@@ -636,7 +636,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async_prefs) { pref_validation_delegate.InitWithNewPipeAndPassReceiver()); } } @@ -2150,6 +2203,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), profile_policy_connector_->policy_service(), diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn +index 1197ad7d00986..ac63fddb265b4 100644 --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn @@ -7,6 +7,7 @@ import("//components/safe_browsing/buildflags.gni") @@ -2185,6 +2239,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin "//components/safe_browsing/core/browser:verdict_cache_manager", "//components/safe_browsing/core/browser/db:allowlist_checker_client", diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn +index b32db42643bed..4b05c31d906f0 100644 --- a/chrome/browser/safe_browsing/android/BUILD.gn +++ b/chrome/browser/safe_browsing/android/BUILD.gn @@ -36,12 +36,8 @@ source_set("android") { @@ -2201,6 +2256,7 @@ diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe deps = [ ":java_resources", diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java +index e65e03366a8bb..06494870e1e03 100644 --- a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java +++ b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java @@ -14,87 +14,4 @@ import org.chromium.base.annotations.NativeMethods; @@ -2292,6 +2348,7 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b - } } diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc +index a621de12e0328..e77bd28f9295a 100644 --- a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc +++ b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc @@ -33,63 +33,4 @@ PrefService* GetPrefService() { @@ -2359,6 +2416,7 @@ diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chro - } // namespace safe_browsing diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +index 99cc8a136bc5d..0ff06be7a0a27 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc @@ -799,11 +799,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) { @@ -2376,6 +2434,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio SafeBrowsingNavigationObserverManager* DownloadProtectionService::GetNavigationObserverManager( diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.h b/chrome/browser/safe_browsing/download_protection/download_protection_service.h +index b12737cb2630b..5514df2917ea3 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.h @@ -25,7 +25,6 @@ @@ -2401,6 +2460,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio // Get the SafeBrowsingNavigationObserverManager for the given |web_contents|. SafeBrowsingNavigationObserverManager* GetNavigationObserverManager( diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc +index 771ff743ceb39..9777dd31c442c 100644 --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc @@ -56,6 +56,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory() @@ -2422,6 +2482,7 @@ diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome } // namespace safe_browsing diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc +index 8407d6240d4f2..48b63d0cee632 100644 --- a/chrome/browser/ssl/sct_reporting_service_factory.cc +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc @@ -7,7 +7,6 @@ @@ -2450,6 +2511,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browse // Force this to be created during BrowserContext creation, since we can't diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc +index 60a2af2668cc8..1eedff8bf5c5e 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc @@ -16,7 +16,6 @@ @@ -2492,6 +2554,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss } diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc +index 78868d49af3a3..90b4a65e016a3 100644 --- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc +++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc @@ -18,10 +18,14 @@ namespace { @@ -2510,9 +2573,10 @@ diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter } // namespace diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn +index 847e3c7baf8f4..26f1ba6ca8e04 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -546,7 +546,6 @@ static_library("ui") { +@@ -553,7 +553,6 @@ static_library("ui") { "//components/renderer_context_menu", "//components/resources", "//components/safe_browsing/content/browser", @@ -2520,7 +2584,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser/db:database_manager", -@@ -4403,7 +4402,6 @@ static_library("ui") { +@@ -4437,7 +4436,6 @@ static_library("ui") { "views/download/bubble/download_dialog_view.h", "views/download/bubble/download_toolbar_button_view.cc", "views/download/bubble/download_toolbar_button_view.h", @@ -2529,6 +2593,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "views/download/download_in_progress_dialog_view.h", "views/download/download_item_view.cc", diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd +index 05a9c512148e7..c5962561f9907 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -411,12 +411,6 @@ CHAR_LIMIT guidelines: @@ -2544,7 +2609,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -4867,9 +4861,6 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

<link>Make searches and browsing better</link> must be turned on @@ -2555,9 +2620,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better. diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc +index bbaac11c22565..c993ce8c1003c 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -63,14 +63,18 @@ +@@ -61,14 +61,18 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" @@ -2574,9 +2640,9 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/safe_browsing/trigger_creator.h" +#endif #include "chrome/browser/search_engines/template_url_service_factory.h" - #include "chrome/browser/segmentation_platform/segmentation_platform_service_factory.h" #include "chrome/browser/sessions/session_tab_helper_factory.h" -@@ -135,9 +139,11 @@ + #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" +@@ -132,9 +136,11 @@ #include "components/permissions/features.h" #include "components/permissions/permission_request_manager.h" #include "components/permissions/unused_site_permissions_service.h" @@ -2586,9 +2652,9 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "components/safe_browsing/core/common/features.h" +#endif #include "components/search/ntp_features.h" - #include "components/segmentation_platform/content/segmentation_platform_tab_helper.h" #include "components/site_engagement/content/site_engagement_helper.h" -@@ -418,6 +424,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { + #include "components/site_engagement/content/site_engagement_service.h" +@@ -414,6 +420,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -2596,15 +2662,16 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( web_contents, HostContentSettingsMapFactory::GetForProfile(profile), safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: -@@ -435,6 +442,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -431,6 +438,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( profile, web_contents); ReputationWebContentsObserver::CreateForWebContents(web_contents); +#endif SearchEngineTabHelper::CreateForWebContents(web_contents); SecurityStateTabHelper::CreateForWebContents(web_contents); - segmentation_platform::SegmentationPlatformTabHelper::CreateForWebContents( + if (site_engagement::SiteEngagementService::IsEnabled()) { diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +index 8b4ffda57e737..e742b6241c337 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -272,6 +272,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) { @@ -2657,6 +2724,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b } else if (path_without_query == "/supervised_user") { html = GetSupervisedUserInterstitialHTML(path); diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn +index 6e56a57f56f92..8b4be8e00788b 100644 --- a/chrome/common/safe_browsing/BUILD.gn +++ b/chrome/common/safe_browsing/BUILD.gn @@ -21,7 +21,6 @@ if (safe_browsing_mode == 1) { @@ -2695,6 +2763,7 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/ sources = [ "ipc_protobuf_message_macros.h", diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn +index 9d935ebc3b4da..2f5818c9371ab 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -289,11 +289,6 @@ static_library("renderer") { @@ -2710,6 +2779,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn deps += [ "//components/feed/content/renderer:feed_renderer" ] } diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc +index 2c7ca0d57ec44..d82d3bd0887dc 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -98,7 +98,9 @@ @@ -2736,6 +2806,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer blink::WebScriptController::RegisterExtension( extensions_v8::LoadTimesExtension::Get()); diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h +index d209ade50507a..cef5cac255f90 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -19,7 +19,6 @@ @@ -2756,9 +2827,10 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/ scoped_refptr browser_interface_broker_; diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn +index 1c660e23fbfbe..af383f26eb883 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -920,7 +920,6 @@ if (is_android) { +@@ -931,7 +931,6 @@ if (is_android) { "//components/password_manager/content/browser:browser", "//components/policy:chrome_settings_proto_generated_compile", "//components/policy/core/browser:test_support", @@ -2766,7 +2838,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier", "//components/safe_browsing/core/common/fbs:client_model", -@@ -1379,7 +1378,6 @@ if (!is_android) { +@@ -1406,7 +1405,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2774,7 +2846,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/password_protection:test_support", -@@ -5891,7 +5889,6 @@ test("unit_tests") { +@@ -5951,7 +5949,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2783,9 +2855,10 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/safe_browsing/content/browser/password_protection:mock_password_protection", "//components/safe_browsing/content/browser/web_ui", diff --git a/components/BUILD.gn b/components/BUILD.gn +index db434fecec7c3..6a8e40606b02a 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn -@@ -643,7 +643,6 @@ test("components_unittests") { +@@ -641,7 +641,6 @@ test("components_unittests") { if (safe_browsing_mode == 1) { deps += [ "//components/safe_browsing/content/browser:unit_tests", @@ -2794,6 +2867,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn } else if (safe_browsing_mode == 2) { deps += [ "//components/safe_browsing/content/browser:unit_tests" ] diff --git a/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc b/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc +index 503b2dca01742..15d5088615347 100644 --- a/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc +++ b/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc @@ -65,23 +65,9 @@ void SavePasswordLeakDetectionDelegate::StartLeakCheck( @@ -2821,6 +2895,7 @@ diff --git a/components/autofill_assistant/browser/public/password_change/save_p // Url, username and password parameters from the interface are not used. diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn +index b569497de0213..c3eeaaca06b2a 100644 --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn @@ -20,8 +20,6 @@ static_library("installer_policies_no_content_deps") { @@ -2833,9 +2908,10 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen "trust_token_key_commitments_component_installer_policy.h", "url_param_classification_component_installer.cc", diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc +index 26e65ce82cfd8..b1acaf2c4d508 100644 --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -608,10 +608,7 @@ PermissionRequestManager::PermissionRequestManager( +@@ -680,10 +680,7 @@ PermissionRequestManager::PermissionRequestManager( view_(nullptr), tab_is_hidden_(web_contents->GetVisibility() == content::Visibility::HIDDEN), @@ -2845,9 +2921,10 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p - web_contents->GetBrowserContext())) {} + auto_response_for_test_(NONE) {} - void PermissionRequestManager::ScheduleShowBubble() { - base::RecordAction(base::UserMetricsAction("PermissionBubbleRequest")); + void PermissionRequestManager::DequeueRequestIfNeeded() { + // TODO(olesiamarukhno): Media requests block other media requests from diff --git a/components/safe_browsing/content/browser/BUILD.gn b/components/safe_browsing/content/browser/BUILD.gn +index fcb83633e939c..217aad578dd6b 100644 --- a/components/safe_browsing/content/browser/BUILD.gn +++ b/components/safe_browsing/content/browser/BUILD.gn @@ -141,7 +141,6 @@ source_set("unit_tests") { @@ -2859,6 +2936,7 @@ diff --git a/components/safe_browsing/content/browser/BUILD.gn b/components/safe "//base/test:test_support", "//components/safe_browsing:buildflags", diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/components/safe_browsing/content/common/file_type_policies.cc +index 7650759d91ddc..ea9a4785ee730 100644 --- a/components/safe_browsing/content/common/file_type_policies.cc +++ b/components/safe_browsing/content/common/file_type_policies.cc @@ -87,8 +87,7 @@ FileTypePolicies::~FileTypePolicies() { @@ -2872,18 +2950,22 @@ diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/com void FileTypePolicies::RecordUpdateMetrics(UpdateResult result, diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc +index 6a6223be97619..d379883aaf7e0 100644 --- a/components/safe_browsing/core/common/features.cc +++ b/components/safe_browsing/core/common/features.cc -@@ -161,7 +161,7 @@ const base::Feature kSevenZipEvaluationEnabled{ - "SafeBrowsingSevenZipEvaluationEnabled", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -200,8 +200,8 @@ BASE_FEATURE(kSevenZipEvaluationEnabled, + base::FEATURE_DISABLED_BY_DEFAULT); - const base::Feature kSuspiciousSiteTriggerQuotaFeature{ -- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT}; -+ "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kSuspiciousSiteTriggerQuotaFeature, +- "SafeBrowsingSuspiciousSiteTriggerQuota", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "SafeBrowsingSuspiciousSiteTriggerQuota", // disabled by default ++ base::FEATURE_DISBLED_BY_DEFAULT); // in Bromite - const base::Feature kThreatDomDetailsTagAndAttributeFeature{ - "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kThreatDomDetailsTagAndAttributeFeature, + "ThreatDomDetailsTagAttributes", diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc +index 50520bc663d1e..0871d4d86fbcd 100644 --- a/components/security_interstitials/content/captive_portal_blocking_page.cc +++ b/components/security_interstitials/content/captive_portal_blocking_page.cc @@ -15,6 +15,7 @@ @@ -2924,6 +3006,7 @@ diff --git a/components/security_interstitials/content/captive_portal_blocking_p case security_interstitials::CMD_OPEN_LOGIN: captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent( diff --git a/components/security_interstitials/content/cert_report_helper.cc b/components/security_interstitials/content/cert_report_helper.cc +index 5054f694d9fee..8cdfec4289260 100644 --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -176,8 +176,6 @@ void CertReportHelper::FinishCertCollection() { @@ -2936,6 +3019,7 @@ diff --git a/components/security_interstitials/content/cert_report_helper.cc b/c bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { diff --git a/components/unified_consent/unified_consent_service.cc b/components/unified_consent/unified_consent_service.cc +index 3fa374deabe1b..3a5eb71262f99 100644 --- a/components/unified_consent/unified_consent_service.cc +++ b/components/unified_consent/unified_consent_service.cc @@ -57,7 +57,7 @@ void UnifiedConsentService::SetUrlKeyedAnonymizedDataCollectionEnabled( @@ -2948,6 +3032,7 @@ diff --git a/components/unified_consent/unified_consent_service.cc b/components/ void UnifiedConsentService::Shutdown() { diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.cc b/content/browser/file_system_access/file_system_access_file_writer_impl.cc +index 8dfdd33af753f..8cdaf1c23363e 100644 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc @@ -44,7 +44,6 @@ FileSystemAccessFileWriterImpl::FileSystemAccessFileWriterImpl( @@ -2968,6 +3053,7 @@ diff --git a/content/browser/file_system_access/file_system_access_file_writer_i // alive until the operation completes. FileSystemAccessSafeMoveHelper* raw_helper = diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.h b/content/browser/file_system_access/file_system_access_file_writer_impl.h +index 2417dfd02e1d4..9684f0123dc25 100644 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.h +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h @@ -123,11 +123,6 @@ class CONTENT_EXPORT FileSystemAccessFileWriterImpl @@ -2983,6 +3069,7 @@ diff --git a/content/browser/file_system_access/file_system_access_file_writer_i // explicitly closed. bool auto_close_ GUARDED_BY_CONTEXT(sequence_checker_) = false; diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.cc b/content/browser/file_system_access/file_system_access_safe_move_helper.cc +index 3b81e728d63df..8d8fbe3701cb1 100644 --- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc @@ -150,8 +150,7 @@ FileSystemAccessSafeMoveHelper::FileSystemAccessSafeMoveHelper( @@ -3030,6 +3117,7 @@ diff --git a/content/browser/file_system_access/file_system_access_safe_move_hel void FileSystemAccessSafeMoveHelper::DidAfterWriteCheck( FileSystemAccessPermissionContext::AfterWriteCheckResult result) { diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.h b/content/browser/file_system_access/file_system_access_safe_move_helper.h +index c86cd5ed00e61..d522f06868df3 100644 --- a/content/browser/file_system_access/file_system_access_safe_move_helper.h +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h @@ -55,9 +55,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper { @@ -3062,9 +3150,10 @@ diff --git a/content/browser/file_system_access/file_system_access_safe_move_hel GUARDED_BY_CONTEXT(sequence_checker_); diff --git a/content/public/browser/file_system_access_permission_context.h b/content/public/browser/file_system_access_permission_context.h +index 1fceadd63069a..3a72603f5b837 100644 --- a/content/public/browser/file_system_access_permission_context.h +++ b/content/public/browser/file_system_access_permission_context.h -@@ -113,12 +113,6 @@ class FileSystemAccessPermissionContext { +@@ -112,12 +112,6 @@ class FileSystemAccessPermissionContext { base::OnceCallback callback) = 0; enum class AfterWriteCheckResult { kAllow, kBlock }; @@ -3078,9 +3167,10 @@ diff --git a/content/public/browser/file_system_access_permission_context.h b/co // Returns whether the give |origin| already allows read permission, or it is // possible to request one. This is used to block file dialogs from being diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn +index d4929edb80cba..586ad695e4faa 100644 --- a/weblayer/BUILD.gn +++ b/weblayer/BUILD.gn -@@ -473,11 +473,9 @@ source_set("weblayer_lib_base") { +@@ -477,11 +477,9 @@ source_set("weblayer_lib_base") { "//components/profile_metrics", "//components/reduce_accept_language/browser", "//components/safe_browsing/content/browser", @@ -3092,7 +3182,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn "//components/safe_browsing/core/browser:safe_browsing_metrics_collector", "//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/common", -@@ -621,8 +619,6 @@ source_set("weblayer_lib_base") { +@@ -625,8 +623,6 @@ source_set("weblayer_lib_base") { "browser/browser_controls_navigation_state_handler_delegate.h", "browser/browser_list_proxy.cc", "browser/browser_list_proxy.h", @@ -3102,9 +3192,10 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn "browser/component_updater/registration.h", "browser/content_view_render_view.cc", diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn +index b95fa0a0c99b2..7e4f3cea831ce 100644 --- a/weblayer/test/BUILD.gn +++ b/weblayer/test/BUILD.gn -@@ -247,7 +247,6 @@ test("weblayer_browsertests") { +@@ -251,7 +251,6 @@ test("weblayer_browsertests") { "//components/page_info/android", "//components/safe_browsing/android:safe_browsing_api_handler", "//components/safe_browsing/content/browser", @@ -3112,5 +3203,6 @@ diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common:interfaces", "//components/safe_browsing/core/browser:token_fetcher", --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index fa84031f..9d972ea0 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1559,7 +1559,7 @@ mixed_component("base") { +@@ -1561,7 +1561,7 @@ mixed_component("base") { # more robust check for this. if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && host_toolchain != "//build/toolchain/cros:host") { diff --git a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch index f0f08a34..48078be5 100644 --- a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch +++ b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -333,6 +333,10 @@ config("compiler") { +@@ -330,6 +330,10 @@ config("compiler") { } } diff --git a/build/patches/Reintroduce-override_build_timestamp.patch b/build/patches/Reintroduce-override_build_timestamp.patch index c02bbc33..0ae82738 100644 --- a/build/patches/Reintroduce-override_build_timestamp.patch +++ b/build/patches/Reintroduce-override_build_timestamp.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4000,8 +4000,13 @@ action("build_date") { +@@ -4020,8 +4020,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/patches/Remove-EV-certificates.patch b/build/patches/Remove-EV-certificates.patch index 2fa4bd8f..c0d9dd30 100644 --- a/build/patches/Remove-EV-certificates.patch +++ b/build/patches/Remove-EV-certificates.patch @@ -9,19 +9,19 @@ Instead, let them appear just like regular ones. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/cert/ev_root_ca_metadata.cc | 20 +++++++++++++++++++- + net/cert/ev_root_ca_metadata.cc | 19 ++++++++++++++++++- net/cert/ev_root_ca_metadata.h | 4 +--- - 2 files changed, 20 insertions(+), 4 deletions(-) + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc +index 343c648374cf1..bbfbdbf30a1dc 100644 --- a/net/cert/ev_root_ca_metadata.cc +++ b/net/cert/ev_root_ca_metadata.cc -@@ -41,7 +41,20 @@ struct EVMetadata { +@@ -40,7 +40,19 @@ struct EVMetadata { const base::StringPiece policy_oids[kMaxOIDsPerCA]; }; --#include "net/data/ssl/ev_roots/chrome-ev-root-store-inc.cc" -+ +-#include "net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc" +static const EVMetadata kEvRootCaMetadata[] = { + // need some dummy data to make compiler happy, because + // arraysize() is implemented as a convoluted template rather than @@ -38,7 +38,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc #endif // defined(PLATFORM_USES_CHROMIUM_EV_METADATA) } // namespace -@@ -230,6 +243,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) { +@@ -225,6 +237,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) { // metadata. // @@ -51,6 +51,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc LOG(WARNING) << "Not implemented"; return false; diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h +index c568c640f4a42..e8e0c6c9335bb 100644 --- a/net/cert/ev_root_ca_metadata.h +++ b/net/cert/ev_root_ca_metadata.h @@ -20,7 +20,7 @@ @@ -75,5 +76,6 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h // AddEVCA adds an EV CA to the list of known EV CAs with the given policy. // |policy| is expressed as a string of dotted numbers. It returns true on --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Remove-SMS-integration.patch b/build/patches/Remove-SMS-integration.patch index d5ab88ff..d8206659 100644 --- a/build/patches/Remove-SMS-integration.patch +++ b/build/patches/Remove-SMS-integration.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java -@@ -118,48 +118,6 @@ public class AppLocaleUtils { +@@ -117,48 +117,6 @@ public class AppLocaleUtils { return Locale.forLanguageTag("en-US"); } diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 26ac24f7..77bc2a61 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -25,7 +25,7 @@ Parts of this patch were developed by csagan5, uazo and others. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- ...em_webview_bundle.AndroidManifest.expected | 5 - - chrome/android/BUILD.gn | 46 +- + chrome/android/BUILD.gn | 45 +- chrome/android/chrome_java_sources.gni | 5 - .../features/cablev2_authenticator/BUILD.gn | 2 - chrome/android/java/AndroidManifest.xml | 68 --- @@ -54,7 +54,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../push_messaging_service_factory.cc | 8 +- chrome/browser/resources/settings/route.ts | 2 - chrome/browser/ui/BUILD.gn | 3 - - .../webauthn/authenticator_qr_sheet_view.cc | 3 +- chrome/browser/ui/webauthn/sheet_models.cc | 7 +- .../webui/chrome_web_ui_controller_factory.cc | 3 - .../authenticator_request_dialog_model.cc | 4 - @@ -96,13 +95,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/signin/public/android/BUILD.gn | 3 - .../signin/AccountRenameChecker.java | 16 - components/webauthn/android/BUILD.gn | 9 - - .../webauthn/AuthenticatorImpl.java | 73 +-- + .../webauthn/AuthenticatorImpl.java | 85 +-- .../webauthn/Fido2ApiCallHelper.java | 23 +- .../push_messaging/push_messaging_manager.cc | 2 +- content/public/android/BUILD.gn | 4 - content/test/BUILD.gn | 4 - device/BUILD.gn | 3 - - device/fido/features.cc | 4 +- + device/fido/features.cc | 10 +- remoting/android/client_java_tmpl.gni | 3 - services/BUILD.gn | 9 - services/device/geolocation/BUILD.gn | 4 - @@ -110,9 +109,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/android_deps/BUILD.gn | 539 +----------------- .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- - 86 files changed, 93 insertions(+), 2040 deletions(-) + 85 files changed, 98 insertions(+), 2049 deletions(-) diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected +index 94da9a283b55e..f9c57c5cc153a 100644 --- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected +++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected @@ -19,10 +19,6 @@ @@ -135,135 +135,135 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest. {% block extra_uses_permissions %} -@@ -738,16 +733,6 @@ by a child template that "extends" this file. +@@ -750,16 +745,6 @@ by a child template that "extends" this file. @@ -336,7 +338,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -352,7 +354,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -379,7 +381,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -995,28 +951,10 @@ by a child template that "extends" this file. +@@ -1007,28 +963,10 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> @@ -408,7 +410,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1251,12 +1189,6 @@ by a child template that "extends" this file. +@@ -1263,12 +1201,6 @@ by a child template that "extends" this file. {% endif %} @@ -422,6 +424,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro split preloader more time to work. --> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +index c32175b68fc55..cefb8dd631113 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -10,9 +10,6 @@ import android.content.pm.PackageManager; @@ -466,6 +470,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java +index d622ca1ec488f..2ed528721a35f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java @@ -7,8 +7,6 @@ package org.chromium.chrome.browser; @@ -501,6 +506,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVer } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java +index e48ec92e0074e..269132d1cf671 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java @@ -15,7 +15,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler @@ -521,6 +527,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task return new OfflineBackgroundTask(); case TaskIds.OFFLINE_PAGES_PREFETCH_JOB_ID: diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java +index 8ddc6b362a68a..757a5a73cb2e2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java @@ -176,12 +176,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat @@ -539,6 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java +index 89b0e66cf6ade..87e8acbce607f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java @@ -6,9 +6,6 @@ package org.chromium.chrome.browser.gcore; @@ -607,6 +615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoo - } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java +index ebe93a130a681..3a51fac495a72 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java @@ -7,11 +7,6 @@ package org.chromium.chrome.browser.gcore; @@ -747,6 +756,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java +index b00d1f2cba84f..10a2935dd225d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java @@ -45,24 +45,10 @@ public class InstantAppsHandler { @@ -836,6 +846,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/Ins try { appContext.startActivity(iaIntent); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java +index 2f770dc4f83b5..0d5546613e285 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java @@ -17,8 +17,6 @@ import androidx.annotation.IntDef; @@ -863,6 +874,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta private long getSize(StatFs statFs) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +index 22f27616abd9a..6d7adf9b68e9f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -120,7 +120,6 @@ public class PasswordSettings extends PreferenceFragmentCompat @@ -903,6 +915,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/modules/chrome_feature_modules.gni +index d5c7f779d11b1..ece7307e984e4 100644 --- a/chrome/android/modules/chrome_feature_modules.gni +++ b/chrome/android/modules/chrome_feature_modules.gni @@ -8,8 +8,6 @@ import( @@ -923,9 +936,10 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/ # Modules shipped in Trichrome (Android Q+). trichrome_module_descs = monochrome_module_descs diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index 1b5e3ef259f9f..9b8f1fe5abc54 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -7267,8 +7267,6 @@ static_library("browser") { +@@ -7324,8 +7324,6 @@ static_library("browser") { "offline_pages/offliner_helper.h", "offline_pages/offliner_user_data.cc", "offline_pages/offliner_user_data.h", @@ -935,6 +949,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "offline_pages/prefetch/offline_metrics_collector_impl.h", "offline_pages/prefetch/offline_prefetch_download_client.cc", diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn +index e609cfb950f89..be5677e48452a 100644 --- a/chrome/browser/language/android/BUILD.gn +++ b/chrome/browser/language/android/BUILD.gn @@ -9,14 +9,12 @@ android_library("base_module_java") { @@ -953,9 +968,10 @@ diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/ "//ui/android:ui_no_recycler_view_java", ] diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java +index 717d1edfcba85..49a0c25543cd5 100644 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java -@@ -519,12 +519,6 @@ public class AppLanguagePromoDialog { +@@ -531,12 +531,6 @@ public class AppLanguagePromoDialog { mLoadingModal.set(ModalDialogProperties.CUSTOM_VIEW, customView); @@ -968,7 +984,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse boolean isSelectedCurrentUI = AppLocaleUtils.isAppLanguagePref(selectedLanguage.getCode()); if (!isSelectedCurrentUI) { // Only record isTopLanguage if the app language has changed. -@@ -532,23 +526,6 @@ public class AppLanguagePromoDialog { +@@ -544,23 +538,6 @@ public class AppLanguagePromoDialog { } AndroidLanguageMetricsBridge.reportAppLanguagePromptLanguage( selectedLanguage.isSystemDefault() ? "" : selectedLanguage.getCode()); @@ -993,6 +1009,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse /** diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java +index c07922e9ff921..c526096bde3d7 100644 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java @@ -87,14 +87,6 @@ public class AppLanguagePreferenceDelegate { @@ -1011,6 +1028,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse /** diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +index 2c8af6ded3ed0..31912e7a6c993 100644 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java @@ -19,7 +19,6 @@ import org.chromium.base.Log; @@ -1034,6 +1052,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse setupAppLanguageSection(); diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +index d1c2d7ac72344..12d98ea251d9d 100644 --- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc @@ -18,7 +18,6 @@ @@ -1067,6 +1086,7 @@ diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b } diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn +index a7508a301d0e0..8ba6e6b1ee26d 100644 --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn @@ -85,8 +85,6 @@ android_library("java") { @@ -1088,6 +1108,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//base:base_java_test_support", "//base:base_junit_test_support", diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java +index c704593a6f02c..b0e0f067f1d79 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerAndroidBackendUtil.java @@ -9,10 +9,6 @@ import android.app.PendingIntent; @@ -1158,6 +1179,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } } diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java +index d20a77fb5ae4f..77ec52aa60856 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSettingsUpdaterBridge.java @@ -9,7 +9,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerSettin @@ -1193,6 +1215,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom mNativeSettingsUpdaterBridge, setting, error, apiErrorCode); } diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java +index 4cfea11e064ef..86629b08937f8 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java @@ -122,8 +122,7 @@ class PasswordStoreAndroidBackendBridgeImpl { @@ -1206,6 +1229,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom PasswordStoreAndroidBackendBridgeImplJni.get().onError(mNativeBackendBridge, jobId, error, apiErrorCode, connectionResultCode != null, diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +index 4466f6829ba1b..aa701eeccbbaf 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java @@ -4,8 +4,6 @@ @@ -1230,6 +1254,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom mNativeDelegateBridgeImpl, error, apiErrorCode); } diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc +index 670cd430e8ce6..9028eeae9d772 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.cc +++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc @@ -26,13 +26,7 @@ @@ -1248,9 +1273,10 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c // static diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts +index ad75a39061a03..c56781be98e57 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts -@@ -31,8 +31,6 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -33,8 +33,6 @@ function addPrivacyChildRoutes(r: Partial) { if (loadTimeData.getBoolean('enableSecurityKeysSubpage')) { r.SECURITY_KEYS = r.SECURITY.createChild('/securityKeys'); @@ -1260,9 +1286,10 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc } else { r.SECURITY_KEYS_PHONES = r.SECURITY.createChild('/securityKeys/phones'); diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn +index 26f1ba6ca8e04..cb68049d99a2b 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -256,8 +256,6 @@ static_library("ui") { +@@ -257,8 +257,6 @@ static_library("ui") { "webui/flags/flags_ui.h", "webui/flags/flags_ui_handler.cc", "webui/flags/flags_ui_handler.h", @@ -1271,7 +1298,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/internals/internals_ui.cc", "webui/internals/internals_ui.h", "webui/interstitials/interstitial_ui.cc", -@@ -484,7 +482,6 @@ static_library("ui") { +@@ -490,7 +488,6 @@ static_library("ui") { "//components/feedback/content", "//components/find_in_page", "//components/flags_ui", @@ -1279,23 +1306,11 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//components/google/core/common", "//components/heap_profiling/multi_process", "//components/history/content/browser", -diff --git a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc ---- a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc -+++ b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc -@@ -52,8 +52,7 @@ class AuthenticatorQRViewCentered : public views::View { - qrcode_generator::mojom::GenerateQRCodeRequest::New(); - request->data = qr_string; - request->should_render = true; -- request->render_dino = -- !base::FeatureList::IsEnabled(device::kWebAuthPasskeysUI); -+ request->render_dino = false; - - request->render_module_style = - qrcode_generator::mojom::ModuleStyle::CIRCLES; diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc +index a78d3bff370bd..cd60b808d5ab0 100644 --- a/chrome/browser/ui/webauthn/sheet_models.cc +++ b/chrome/browser/ui/webauthn/sheet_models.cc -@@ -159,12 +159,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible() +@@ -205,12 +205,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible() const { // If any phones are shown then also show a button that goes to the settings // page to manage them. @@ -1310,9 +1325,10 @@ diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/weba void AuthenticatorMechanismSelectorSheetModel::OnManageDevices() { diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +index 54a6556e68bfa..28cff503d087b 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -43,7 +43,6 @@ +@@ -44,7 +44,6 @@ #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" #include "chrome/browser/ui/webui/flags/flags_ui.h" @@ -1320,7 +1336,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/internals/internals_ui.h" #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" #include "chrome/browser/ui/webui/intro/intro_ui.h" -@@ -767,8 +766,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -778,8 +777,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIFlagsHost) return &NewWebUI; @@ -1330,9 +1346,10 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom return &NewWebUI; if (url.host_piece() == chrome::kChromeUIInterstitialHost) diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc +index 5d98b273c0d01..116109cc2459d 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc -@@ -1099,10 +1099,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms( +@@ -1130,10 +1130,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms( if (cable_ui_type_) { switch (*cable_ui_type_) { case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR: @@ -1344,6 +1361,7 @@ diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chr case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_SERVER_LINK: diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauthn/cablev2_devices.cc +index 2931993c41094..bc58af056b9e2 100644 --- a/chrome/browser/webauthn/cablev2_devices.cc +++ b/chrome/browser/webauthn/cablev2_devices.cc @@ -351,6 +351,9 @@ void AddPairing(Profile* profile, std::unique_ptr pairing) { @@ -1353,10 +1371,11 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth + if ((true)) { + return; + } - ListPrefUpdate update(profile->GetPrefs(), kWebAuthnCablePairingsPrefName); + ScopedListPrefUpdate update(profile->GetPrefs(), + kWebAuthnCablePairingsPrefName); - // Find any existing entries with the same public key and replace them. The diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn +index 72aded5a5121e..8bf9963a5a9ba 100644 --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn @@ -283,8 +283,6 @@ android_library("chrome_java_integration_test_support") { @@ -1369,6 +1388,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn "//base:base_java_test_support", "//build/android:build_java", diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn +index 208d5e1426570..c9b3287c2ac48 100644 --- a/components/background_task_scheduler/BUILD.gn +++ b/components/background_task_scheduler/BUILD.gn @@ -123,11 +123,6 @@ if (is_android) { @@ -1384,6 +1404,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou "internal:proto_java", "//base:base_java", diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components/background_task_scheduler/internal/BUILD.gn +index 7fe456bacc6c4..c087781bc3a8d 100644 --- a/components/background_task_scheduler/internal/BUILD.gn +++ b/components/background_task_scheduler/internal/BUILD.gn @@ -11,12 +11,10 @@ if (is_android) { @@ -1411,6 +1432,7 @@ diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components "//build/android:build_java", "//components/background_task_scheduler:background_task_scheduler_task_ids_java", diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java +index 0cb46387e1acd..a964b880be8aa 100644 --- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java +++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java @@ -21,11 +21,7 @@ public final class BackgroundTaskSchedulerFactoryInternal { @@ -1427,6 +1449,7 @@ diff --git a/components/background_task_scheduler/internal/android/java/src/org/ /** diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java +index e1f7d95791a5d..41226f6fbb77e 100644 --- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java +++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java @@ -14,7 +14,6 @@ import org.chromium.components.background_task_scheduler.BackgroundTask.TaskFini @@ -1438,9 +1461,10 @@ diff --git a/components/component_updater/android/java/src/org/chromium/componen /** Java-side implementation of the component update scheduler using the BackgroundTaskScheduler. */ @JNINamespace("component_updater") diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +index 630d1696c5322..b6a139621230b 100644 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -2632,14 +2632,6 @@ public class ExternalNavigationHandler { +@@ -2533,14 +2533,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) { @@ -1456,6 +1480,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component } } diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/android/BUILD.gn +index b4d920e60fb7f..27226b5b71653 100644 --- a/components/externalauth/android/BUILD.gn +++ b/components/externalauth/android/BUILD.gn @@ -27,8 +27,6 @@ android_library("google_delegate_public_impl_java") { @@ -1476,6 +1501,7 @@ diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/ "//base:base_java_test_support", "//base:base_junit_test_support", diff --git a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java +index 474e016aaac4c..5ec98585d6f9b 100644 --- a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java +++ b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java @@ -15,9 +15,6 @@ import android.text.TextUtils; @@ -1547,6 +1573,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex /** diff --git a/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java b/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java +index 452eb3e59f0c8..2dc9a355c5af2 100644 --- a/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java +++ b/components/externalauth/android/java/src/org/chromium/components/externalauth/UserRecoverableErrorHandler.java @@ -9,8 +9,6 @@ import android.app.Dialog; @@ -1579,6 +1606,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex // This can happen if |errorCode| is ConnectionResult.SERVICE_INVALID. if (mDialog != null && !mDialog.isShowing()) { diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java +index ee18dab64fc6a..5b4327d2b38d0 100644 --- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java +++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java @@ -129,6 +129,8 @@ public class GoogleCloudMessagingV2 implements GoogleCloudMessagingSubscriber { @@ -1591,9 +1619,10 @@ diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_ throw new IOException(ERROR_MAIN_THREAD); } diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc +index 4c8b1e7d0324b..d70c7975c2be0 100644 --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -465,6 +465,7 @@ void GCMClientImpl::StartGCM() { +@@ -463,6 +463,7 @@ void GCMClientImpl::StartGCM() { void GCMClientImpl::InitializeMCSClient() { DCHECK(network_connection_tracker_); @@ -1601,7 +1630,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -659,6 +660,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, +@@ -657,6 +658,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, int interval_ms) { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); DCHECK(mcs_client_); @@ -1609,7 +1638,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc mcs_client_->AddHeartbeatInterval(scope, interval_ms); } -@@ -670,6 +672,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { +@@ -668,6 +670,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -1617,7 +1646,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc // Make sure no checkin is in progress. if (checkin_request_) -@@ -752,6 +755,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { +@@ -750,6 +753,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { void GCMClientImpl::SchedulePeriodicCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -1626,6 +1655,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc // Make sure no checkin is in progress. if (checkin_request_.get() || !device_checkin_info_.accounts_set) diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn +index ccfaa3be97925..12fa85ad7517e 100644 --- a/components/gcm_driver/instance_id/android/BUILD.gn +++ b/components/gcm_driver/instance_id/android/BUILD.gn @@ -15,7 +15,6 @@ generate_jni("test_support_jni_headers") { @@ -1652,6 +1682,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm ] diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java +index 11a61c85c51fc..dc4d5706cd5b4 100644 --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java @@ -27,7 +27,6 @@ public class InstanceIDBridge { @@ -1752,6 +1783,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn +index 70f2eaf6c6b57..45aa9814908bf 100644 --- a/components/media_router/browser/android/BUILD.gn +++ b/components/media_router/browser/android/BUILD.gn @@ -11,10 +11,6 @@ android_library("java") { @@ -1785,6 +1817,7 @@ diff --git a/components/media_router/browser/android/BUILD.gn b/components/media "//base:base_java_test_support", "//base:base_junit_test_support", diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java +index ea82c2a2662ee..77337838d4fd4 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/BrowserMediaRouter.java @@ -10,9 +10,6 @@ import androidx.annotation.Nullable; @@ -1820,6 +1853,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo }; diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java +index 9aae57b45c2b5..10a7f4b0b3d7c 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/CastSessionUtil.java @@ -4,9 +4,6 @@ @@ -1870,6 +1904,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo - } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java +index 83a7bacfb76cd..e1d6f11349a1c 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaSink.java @@ -8,41 +8,24 @@ import androidx.annotation.Nullable; @@ -1971,6 +2006,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java +index 21a1470936fad..15f5fed54580f 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/MediaStatusBridge.java @@ -4,10 +4,6 @@ @@ -2104,6 +2140,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java +index b04cc369b2af0..268a4379fff2e 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseNotificationController.java @@ -6,10 +6,6 @@ package org.chromium.components.media_router.caf; @@ -2191,6 +2228,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo @Override diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java +index 2507c69d68645..ae513b6d72cb1 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/BaseSessionController.java @@ -6,12 +6,7 @@ package org.chromium.components.media_router.caf; @@ -2356,6 +2394,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo private void notifyCallback(NotifyCallbackAction action) { diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java +index c608b09602601..d2551718a7654 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProvider.java @@ -12,10 +12,6 @@ import androidx.mediarouter.media.MediaRouteSelector; @@ -2508,6 +2547,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo if (mPendingCreateRouteRequestInfo == null) return; diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java +index 3dbf8800fe90d..076ead61cd04b 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMediaRouteProvider.java @@ -11,8 +11,6 @@ import androidx.annotation.Nullable; @@ -2541,6 +2581,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo protected void addRoute( MediaRoute route, String origin, int tabId, int nativeRequestId, boolean wasLaunched) { diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java +index 92a28ede89603..1098c0519f400 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CafMessageHandler.java @@ -13,10 +13,6 @@ import android.util.SparseArray; @@ -2686,6 +2727,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java +index 37f882d39809f..2b73e6a8356d9 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastMediaSource.java @@ -9,8 +9,6 @@ import android.net.Uri; @@ -2713,6 +2755,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo /** diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java +index b693e0c223f74..34b861c42bcdb 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java @@ -6,28 +6,8 @@ package org.chromium.components.media_router.caf; @@ -2746,6 +2789,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo +public class CastOptionsProvider { } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java +index 537d4416af363..c4581847d57ec 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastSessionController.java @@ -7,11 +7,6 @@ package org.chromium.components.media_router.caf; @@ -2884,6 +2928,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo @NonNull diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java +index aafecde3bc685..fcab92021c1a9 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/CastUtils.java @@ -4,18 +4,10 @@ @@ -2906,6 +2951,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo * Compares two origins. Empty origin strings correspond to unique origins in * url::Origin. diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java +index 8dce30d1f7262..1b04c4853a3d2 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafExpandedControllerActivity.java @@ -45,60 +45,35 @@ public class CafExpandedControllerActivity @@ -2994,6 +3040,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo private void scheduleProgressUpdateTask() { diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java +index 66a60a46e986e..66aad412fd499 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/CafRemotingMediaRouteProvider.java @@ -49,9 +49,6 @@ public class CafRemotingMediaRouteProvider extends CafBaseMediaRouteProvider { @@ -3015,6 +3062,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java +index a74407647fba3..2c61fb2548094 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/FlingingControllerAdapter.java @@ -4,11 +4,6 @@ @@ -3135,6 +3183,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo - } } diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java +index 55145ebe12310..7c6ced3dc131d 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingMediaSource.java @@ -13,8 +13,6 @@ import android.util.Base64; @@ -3167,6 +3216,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo return sApplicationId; diff --git a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java +index a417db375f6f8..c4b554c905137 100644 --- a/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java +++ b/components/media_router/browser/android/java/src/org/chromium/components/media_router/caf/remoting/RemotingSessionController.java @@ -4,8 +4,6 @@ @@ -3217,6 +3267,7 @@ diff --git a/components/media_router/browser/android/java/src/org/chromium/compo public BaseNotificationController getNotificationController() { return mNotificationController; diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/components/media_router/test/android/cast_emulator/BUILD.gn +index 4852868c6ee58..d5200fe466ca3 100644 --- a/components/media_router/test/android/cast_emulator/BUILD.gn +++ b/components/media_router/test/android/cast_emulator/BUILD.gn @@ -20,7 +20,6 @@ android_library("cast_emulator_java") { @@ -3228,6 +3279,7 @@ diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/compo "//third_party/androidx:androidx_mediarouter_mediarouter_java", ] diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn +index 1c05e17882489..d76a7316782e5 100644 --- a/components/module_installer/android/BUILD.gn +++ b/components/module_installer/android/BUILD.gn @@ -35,7 +35,6 @@ android_library("module_installer_java") { @@ -3247,6 +3299,7 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in ] } diff --git a/components/signin/public/android/BUILD.gn b/components/signin/public/android/BUILD.gn +index 5843aa91acd9c..16c8a8415387b 100644 --- a/components/signin/public/android/BUILD.gn +++ b/components/signin/public/android/BUILD.gn @@ -2,8 +2,6 @@ import("//build/config/android/rules.gni") @@ -3258,7 +3311,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//base:jni_java", "//build/android:build_java", -@@ -161,7 +159,6 @@ robolectric_library("junit") { +@@ -162,7 +160,6 @@ robolectric_library("junit") { deps = [ ":java", ":signin_java_test_support", @@ -3267,6 +3320,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java_test_support", "//base:base_junit_test_support", diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java b/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java +index 25beba5798c61..049dc7ffb0069 100644 --- a/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java +++ b/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java @@ -11,10 +11,6 @@ import androidx.annotation.Nullable; @@ -3300,6 +3354,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } } diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/BUILD.gn +index f10eaf630bff8..6ae254ace0fad 100644 --- a/components/webauthn/android/BUILD.gn +++ b/components/webauthn/android/BUILD.gn @@ -6,7 +6,6 @@ import("//build/config/android/rules.gni") @@ -3320,9 +3375,9 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ - "java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java", - "java/src/org/chromium/components/webauthn/FidoErrorResponseCallback.java", "java/src/org/chromium/components/webauthn/GetAssertionResponseCallback.java", + "java/src/org/chromium/components/webauthn/GetMatchingCredentialIdsResponseCallback.java", "java/src/org/chromium/components/webauthn/InternalAuthenticator.java", - "java/src/org/chromium/components/webauthn/IsUvpaaResponseCallback.java", -@@ -30,9 +25,6 @@ android_library("java") { +@@ -31,9 +26,6 @@ android_library("java") { ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] deps = [ @@ -3332,7 +3387,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "//base:base_java", "//base:jni_java", "//build/android:build_java", -@@ -68,7 +60,6 @@ android_library("test_support_java") { +@@ -69,7 +61,6 @@ android_library("test_support_java") { source_set("android") { sources = [ @@ -3341,6 +3396,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "internal_authenticator_android.h", "webauthn_browser_bridge.cc", diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java +index 1f7f40c9ace40..c2ef0a55ecdcb 100644 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java @@ -14,7 +14,6 @@ import androidx.annotation.RequiresApi; @@ -3351,7 +3407,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut import org.chromium.base.metrics.RecordHistogram; import org.chromium.blink.mojom.Authenticator; import org.chromium.blink.mojom.AuthenticatorStatus; -@@ -55,9 +54,6 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -57,9 +56,6 @@ public final class AuthenticatorImpl implements Authenticator { /** The payment information to be added to the "clientDataJson". */ private PaymentOptions mPayment; @@ -3361,7 +3417,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut private MakeCredential_Response mMakeCredentialCallback; private GetAssertion_Response mGetAssertionCallback; // A queue is used to store pending IsUserVerifyingPlatformAuthenticatorAvailable request -@@ -66,9 +62,6 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -68,9 +64,6 @@ public final class AuthenticatorImpl implements Authenticator { // situation does not matter because all pending requests will return the same value. private Queue> mIsUserVerifyingPlatformAuthenticatorAvailableCallbackQueue = new LinkedList<>(); @@ -3371,7 +3427,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut /** * Builds the Authenticator service implementation. -@@ -93,21 +86,6 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -95,21 +88,6 @@ public final class AuthenticatorImpl implements Authenticator { mRenderFrameHost = renderFrameHost; mSupportLevel = supportLevel; mOrigin = mRenderFrameHost.getLastCommittedOrigin(); @@ -3393,7 +3449,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** -@@ -137,17 +115,9 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -139,17 +117,9 @@ public final class AuthenticatorImpl implements Authenticator { mMakeCredentialCallback = callback; mIsOperationPending = true; @@ -3413,7 +3469,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -161,15 +131,8 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -163,15 +133,8 @@ public final class AuthenticatorImpl implements Authenticator { mGetAssertionCallback = callback; mIsOperationPending = true; @@ -3431,7 +3487,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -182,34 +145,13 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -184,15 +147,8 @@ public final class AuthenticatorImpl implements Authenticator { callback.call(isUvpaa); }; @@ -3445,6 +3501,32 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - mRenderFrameHost, - isUvpaa -> onIsUserVerifyingPlatformAuthenticatorAvailableResponse(isUvpaa)); + decoratedCallback.call(false); ++ return; + } + + /** +@@ -201,7 +157,7 @@ public final class AuthenticatorImpl implements Authenticator { + * version. + */ + public boolean isGetMatchingCredentialIdsSupported() { +- return mGmsCorePackageVersion >= GMSCORE_MIN_VERSION_GET_MATCHING_CRED_IDS; ++ return false; + } + + /** +@@ -215,33 +171,13 @@ public final class AuthenticatorImpl implements Authenticator { + */ + public void getMatchingCredentialIds(String relyingPartyId, byte[][] credentialIds, + boolean requireThirdPartyPayment, GetMatchingCredentialIdsResponseCallback callback) { +- if (mGmsCorePackageVersion < GMSCORE_MIN_VERSION_GET_MATCHING_CRED_IDS) { +- callback.onResponse(new ArrayList()); +- return; +- } +- +- getFido2CredentialRequest().handleGetMatchingCredentialIdsRequest(mRenderFrameHost, +- relyingPartyId, credentialIds, requireThirdPartyPayment, callback, +- status -> onError(status)); ++ callback.onResponse(new ArrayList()); } @Override @@ -3468,7 +3550,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -219,8 +161,6 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -251,8 +187,6 @@ public final class AuthenticatorImpl implements Authenticator { if (!mIsOperationPending || mGetAssertionCallback == null) { return; } @@ -3477,7 +3559,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** -@@ -270,7 +210,6 @@ public final class AuthenticatorImpl implements Authenticator { +@@ -302,7 +236,6 @@ public final class AuthenticatorImpl implements Authenticator { mIsOperationPending = false; mMakeCredentialCallback = null; mGetAssertionCallback = null; @@ -3486,6 +3568,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut @Override diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java +index fe20d30a4407b..d65dba1ac49d4 100644 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java @@ -8,10 +8,6 @@ import android.os.Parcel; @@ -3524,6 +3607,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut \ No newline at end of file +} diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc +index ac54746f23c14..790a4b68f6866 100644 --- a/content/browser/push_messaging/push_messaging_manager.cc +++ b/content/browser/push_messaging/push_messaging_manager.cc @@ -801,7 +801,7 @@ void PushMessagingManager::GetSubscriptionInfo( @@ -3536,6 +3620,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/ } // namespace content diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn +index 11d95c443e103..f235f2d805581 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -137,10 +137,6 @@ android_library("content_main_dex_java") { @@ -3550,9 +3635,10 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn "//base:jni_java", "//build:chromeos_buildflags", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn +index 48c207593b27a..0a6ed4189ff3e 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -3116,10 +3116,6 @@ if (is_android) { +@@ -3134,10 +3134,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -3564,9 +3650,10 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn "//base:jni_java", "//content/public/android:content_java", diff --git a/device/BUILD.gn b/device/BUILD.gn +index fb86a3d65b828..696a3314ab2ff 100644 --- a/device/BUILD.gn +++ b/device/BUILD.gn -@@ -469,9 +469,6 @@ if (is_android) { +@@ -470,9 +470,6 @@ if (is_android) { "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java", ] deps = [ @@ -3577,20 +3664,29 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn "//base:base_junit_test_support", "//device/gamepad:java", diff --git a/device/fido/features.cc b/device/fido/features.cc +index 8337f996d0557..bc6126c533ca2 100644 --- a/device/fido/features.cc +++ b/device/fido/features.cc -@@ -36,8 +36,8 @@ extern const base::Feature kWebAuthnGoogleCorpRemoteDesktopClientPrivilege{ - "WebAuthenticationGoogleCorpRemoteDesktopClientPrivilege", - base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -39,12 +39,12 @@ BASE_FEATURE(kWebAuthnGoogleCorpRemoteDesktopClientPrivilege, + base::FEATURE_ENABLED_BY_DEFAULT); --extern const base::Feature kWebAuthPasskeysUI{ -- "WebAuthenticationPasskeysUI", base::FEATURE_DISABLED_BY_DEFAULT}; -+extern const base::Feature kWebAuthPasskeysUI{ // must be disabled -+ "WebAuthenticationPasskeysUI", base::FEATURE_DISABLED_BY_DEFAULT}; // in Bromite + BASE_FEATURE(kWebAuthPasskeysUI, +- "WebAuthenticationPasskeysUI", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "WebAuthenticationPasskeysUI", // disabled by default ++ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - // TODO(1358719): Resolve all i18n TODOs before default enabling. - extern const base::Feature kWebAuthnNewDiscoverableCredentialsUi{ +-BASE_FEATURE(kWebAuthnNewDiscoverableCredentialsUi, +- "WebAuthenticationNewDiscoverableCredentialsUi", +- base::FEATURE_ENABLED_BY_DEFAULT); ++BASE_FEATURE(kWebAuthnNewDiscoverableCredentialsUi, // disabled by default ++ "WebAuthenticationNewDiscoverableCredentialsUi", // in Bromite ++ base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kWebAuthnNoEmptyDisplayNameCBOR, + "WebAuthenticationNoEmptyDisplayNameCBOR", diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni +index 98bb7d7b2ccd6..f0126ff1bd648 100644 --- a/remoting/android/client_java_tmpl.gni +++ b/remoting/android/client_java_tmpl.gni @@ -105,9 +105,6 @@ template("remoting_android_client_java_tmpl") { @@ -3604,9 +3700,10 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav } diff --git a/services/BUILD.gn b/services/BUILD.gn +index 167a0ae682f40..d6c76e1d6bfd5 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn -@@ -116,11 +116,6 @@ if (is_android) { +@@ -118,11 +118,6 @@ if (is_android) { "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java", ] deps = [ @@ -3618,7 +3715,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -148,10 +143,6 @@ if (is_android) { +@@ -150,10 +145,6 @@ if (is_android) { "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java", ] deps = [ @@ -3630,6 +3727,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn "//base:base_java_test_support", "//mojo/public/java:base_java", diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn +index 91799550228e1..255cc275fe4fb 100644 --- a/services/device/geolocation/BUILD.gn +++ b/services/device/geolocation/BUILD.gn @@ -163,10 +163,6 @@ if (is_android) { @@ -3644,6 +3742,7 @@ diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/ "//base:jni_java", "//build/android:build_java", diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn +index 6550c4869ff99..5ada52ce83cf9 100644 --- a/services/shape_detection/BUILD.gn +++ b/services/shape_detection/BUILD.gn @@ -115,10 +115,6 @@ if (is_android) { @@ -3658,6 +3757,7 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD. "//base:jni_java", "//mojo/public/java:base_java", diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn +index dfd4ceaa2d7f2..931cef6a6d44a 100644 --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn @@ -54,7 +54,7 @@ if (!limit_android_deps) { @@ -3669,7 +3769,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. } robolectric_library("chromium_play_services_availability_shadows_java") { -@@ -968,210 +968,6 @@ if (!limit_android_deps) { +@@ -961,210 +961,6 @@ if (!limit_android_deps) { ] } @@ -3880,7 +3980,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. android_aar_prebuilt("com_google_android_material_material_java") { aar_path = -@@ -1220,60 +1016,6 @@ if (!limit_android_deps) { +@@ -1213,60 +1009,6 @@ if (!limit_android_deps) { ] } @@ -3941,7 +4041,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("com_google_flatbuffers_flatbuffers_java_java") { jar_path = "libs/com_google_flatbuffers_flatbuffers_java/flatbuffers-java-2.0.3.jar" -@@ -1473,19 +1215,6 @@ if (!limit_android_deps) { +@@ -1527,19 +1269,6 @@ if (!limit_android_deps) { is_robolectric = true } @@ -3961,7 +4061,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("org_robolectric_utils_java") { jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar" -@@ -1832,272 +1561,6 @@ if (!limit_android_deps) { +@@ -1900,272 +1629,6 @@ if (!limit_android_deps) { deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ] } @@ -4235,6 +4335,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. java_prebuilt("com_squareup_javawriter_java") { jar_path = "libs/com_squareup_javawriter/javawriter-2.1.1.jar" diff --git a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn +index 5512e5e48745b..f9b2d3d21cb56 100644 --- a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn +++ b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn @@ -8,7 +8,6 @@ android_library("javatests") { @@ -4246,6 +4347,7 @@ diff --git a/third_party/android_deps/local_modifications/preconditions/javatest "//base/test:test_support_java", "//build/android:build_java", diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java b/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java +index 0b8257230b07c..0a4b14e6de34b 100644 --- a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java +++ b/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServicesAvailability.java @@ -5,9 +5,6 @@ package org.chromium.gms; @@ -4278,5 +4380,6 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices + return 16; // API_UNAVAILABLE } } --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch index 80daafb7..0a89f081 100644 --- a/build/patches/Remove-contextual-search-manager.patch +++ b/build/patches/Remove-contextual-search-manager.patch @@ -31,17 +31,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../privacy/settings/PrivacySettings.java | 9 -- .../chrome/browser/tab/TabHelpers.java | 2 - .../tabbed_mode/TabbedRootUiCoordinator.java | 5 +- - .../chrome/browser/ui/RootUiCoordinator.java | 37 +------- + .../chrome/browser/ui/RootUiCoordinator.java | 39 +------- chrome/browser/BUILD.gn | 17 ---- chrome/browser/about_flags.cc | 49 ----------- - .../flags/android/chrome_feature_list.cc | 36 -------- + .../flags/android/chrome_feature_list.cc | 42 --------- .../flags/android/chrome_feature_list.h | 8 -- ...nfiguration_policy_handler_list_factory.cc | 6 +- .../strings/android_chrome_strings.grd | 59 ------------- content/browser/browser_interface_binders.cc | 1 - third_party/blink/public/mojom/BUILD.gn | 2 +- third_party/blink/public/public_features.gni | 2 +- - 37 files changed, 17 insertions(+), 641 deletions(-) + 37 files changed, 17 insertions(+), 649 deletions(-) delete mode 100644 chrome/android/java/res/layout/contextual_search_caption_view.xml delete mode 100644 chrome/android/java/res/layout/contextual_search_card_icon_view.xml delete mode 100644 chrome/android/java/res/layout/contextual_search_context_view.xml @@ -53,17 +53,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html delete mode 100644 chrome/android/java/res/xml/contextual_search_preferences.xml diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +index caf13898e1a57..069f92e5a06f0 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -695,7 +695,6 @@ android_library("chrome_java") { - "//chrome/browser/ui:duplicate_download_enums_java", - "//components/browsing_data/core:browsing_data_utils_java", - "//components/browsing_data/core:clear_browsing_data_tab_java", -- "//components/contextual_search/core/browser:quick_action_category_enum_javagen", - "//components/dom_distiller/core:distiller_type_java", - "//components/ntp_tiles:ntp_tiles_enums_java", - "//components/offline_pages/core:offline_page_model_enums_java", -@@ -4097,16 +4096,12 @@ generate_jni("chrome_jni_headers") { +@@ -722,7 +722,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/ui:duplicate_download_enums_java", + "//components/browsing_data/core:browsing_data_utils_java", + "//components/browsing_data/core:clear_browsing_data_tab_java", +- "//components/contextual_search/core/browser:quick_action_category_enum_javagen", + "//components/dom_distiller/core:distiller_type_java", + "//components/ntp_tiles:ntp_tiles_enums_java", + "//components/offline_pages/core:offline_page_model_enums_java", +@@ -3979,16 +3978,12 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java", "java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java", @@ -81,6 +82,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsOpenTimeRecorder.java", diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni +index 3d20247cf7fb4..9342c1ece02ff 100644 --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni @@ -487,14 +487,6 @@ chrome_java_resources = [ @@ -98,7 +100,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/custom_tabs_bottombar.xml", "java/res/layout/custom_tabs_bottombar_item.xml", "java/res/layout/custom_tabs_control_container.xml", -@@ -654,7 +646,6 @@ chrome_java_resources = [ +@@ -652,7 +644,6 @@ chrome_java_resources = [ "java/res/xml/autofill_assistant_preferences.xml", "java/res/xml/bookmark_widget_info.xml", "java/res/xml/clear_browsing_data_preferences_tab.xml", @@ -107,9 +109,10 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/xml/do_not_track_preferences.xml", "java/res/xml/google_services_preferences.xml", diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni +index 1073445881dc4..64dcc64e65d27 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -301,21 +301,6 @@ chrome_java_sources = [ +@@ -305,21 +305,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java", @@ -131,15 +134,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java", "java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java", -@@ -355,7 +340,6 @@ chrome_java_sources = [ - "java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripStacker.java", +@@ -360,7 +345,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java", "java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java", + "java/src/org/chromium/chrome/browser/compositor/resources/SystemResourcePreloads.java", - "java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java", "java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java", "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java", "java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java", -@@ -381,34 +365,6 @@ chrome_java_sources = [ +@@ -386,34 +370,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java", "java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java", "java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java", @@ -175,6 +178,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java", "java/src/org/chromium/chrome/browser/crash/ChromePureJavaExceptionReporter.java", diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java +index bb936bdbc91c5..bb5ada13aff99 100644 --- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java +++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java @@ -34,7 +34,6 @@ import org.chromium.base.supplier.Supplier; @@ -202,6 +206,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch diff --git a/chrome/android/java/res/layout/contextual_search_caption_view.xml b/chrome/android/java/res/layout/contextual_search_caption_view.xml deleted file mode 100644 +index b33c2696b396a..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_caption_view.xml +++ /dev/null @@ -1,16 +0,0 @@ @@ -224,6 +229,7 @@ deleted file mode 100644 \ No newline at end of file diff --git a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml b/chrome/android/java/res/layout/contextual_search_card_icon_view.xml deleted file mode 100644 +index 82ba6ef6b8f3f..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_card_icon_view.xml +++ /dev/null @@ -1,14 +0,0 @@ @@ -243,6 +249,7 @@ deleted file mode 100644 - android:scaleType="center"/> diff --git a/chrome/android/java/res/layout/contextual_search_context_view.xml b/chrome/android/java/res/layout/contextual_search_context_view.xml deleted file mode 100644 +index d7bb3ca56f794..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_context_view.xml +++ /dev/null @@ -1,27 +0,0 @@ @@ -275,6 +282,7 @@ deleted file mode 100644 - diff --git a/chrome/android/java/res/layout/contextual_search_promo_view.xml b/chrome/android/java/res/layout/contextual_search_promo_view.xml deleted file mode 100644 +index fd078a8431b8a..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_promo_view.xml +++ /dev/null @@ -1,88 +0,0 @@ @@ -369,6 +377,7 @@ deleted file mode 100644 \ No newline at end of file diff --git a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml b/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml deleted file mode 100644 +index 8784710ca1b09..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_quick_action_icon_view.xml +++ /dev/null @@ -1,14 +0,0 @@ @@ -389,6 +398,7 @@ deleted file mode 100644 \ No newline at end of file diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml deleted file mode 100644 +index e52e3cceda30a..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_related_searches_in_content_view.xml +++ /dev/null @@ -1,18 +0,0 @@ @@ -412,6 +422,7 @@ deleted file mode 100644 - diff --git a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml b/chrome/android/java/res/layout/contextual_search_related_searches_view.xml deleted file mode 100644 +index ff38d4f550c6c..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_related_searches_view.xml +++ /dev/null @@ -1,23 +0,0 @@ @@ -440,6 +451,7 @@ deleted file mode 100644 - diff --git a/chrome/android/java/res/layout/contextual_search_term_view.xml b/chrome/android/java/res/layout/contextual_search_term_view.xml deleted file mode 100644 +index 262cfc5780079..0000000000000 --- a/chrome/android/java/res/layout/contextual_search_term_view.xml +++ /dev/null @@ -1,21 +0,0 @@ @@ -466,6 +478,7 @@ deleted file mode 100644 - diff --git a/chrome/android/java/res/xml/contextual_search_preferences.xml b/chrome/android/java/res/xml/contextual_search_preferences.xml deleted file mode 100644 +index 0e3c569a285d9..0000000000000 --- a/chrome/android/java/res/xml/contextual_search_preferences.xml +++ /dev/null @@ -1,27 +0,0 @@ @@ -497,6 +510,7 @@ deleted file mode 100644 - - diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml +index 4f5970e4764ae..f0782bc7e0ea3 100644 --- a/chrome/android/java/res/xml/google_services_preferences.xml +++ b/chrome/android/java/res/xml/google_services_preferences.xml @@ -48,8 +48,4 @@ found in the LICENSE file. @@ -509,6 +523,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom - android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/> diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml +index 0b92306fd0bf3..1c682a61eec88 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -56,10 +56,6 @@ found in the LICENSE file. @@ -523,18 +538,19 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi extends AsyncInitializationActivity @@ -565,7 +582,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv SnackbarManageable, SceneChangeObserver, StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker, MenuOrKeyboardActionController, CompositorViewHolder.Initializer, -@@ -322,8 +319,6 @@ public abstract class ChromeActivity +@@ -323,8 +320,6 @@ public abstract class ChromeActivity new ObservableSupplierImpl<>(); protected final UnownedUserDataSupplier mInsetObserverViewSupplier = new InsetObserverViewSupplier(); @@ -574,18 +591,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private SnackbarManager mSnackbarManager; -@@ -513,7 +508,7 @@ public abstract class ChromeActivity +@@ -514,7 +509,7 @@ public abstract class ChromeActivity // clang-format off return new RootUiCoordinator(this, null, getShareDelegateSupplier(), - getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier, + getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkModelSupplier, - mTabBookmarkerSupplier, getContextualSearchManagerSupplier(), + mTabBookmarkerSupplier, null, getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(), -@@ -953,14 +948,6 @@ public abstract class ChromeActivity +@@ -949,14 +944,6 @@ public abstract class ChromeActivity mCompositorViewHolderSupplier.get().onNativeLibraryReady( - getWindowAndroid(), getTabContentManager()); + getWindowAndroid(), getTabContentManager(), getPrefService()); - // TODO(1107916): Move contextual search initialization to the RootUiCoordinator. - if (ContextualSearchFieldTrial.isEnabled()) { @@ -598,7 +615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv TraceEvent.end("ChromeActivity:CompositorInitialization"); } -@@ -1447,11 +1434,6 @@ public abstract class ChromeActivity +@@ -1443,11 +1430,6 @@ public abstract class ChromeActivity @SuppressLint("NewApi") @Override protected final void onDestroy() { @@ -610,7 +627,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv if (mSnackbarManager != null) { SnackbarManagerProvider.detach(mSnackbarManager); } -@@ -1948,13 +1930,6 @@ public abstract class ChromeActivity +@@ -1944,13 +1926,6 @@ public abstract class ChromeActivity return mCompositorViewHolderSupplier.get(); } @@ -624,7 +641,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv /** * Exits the fullscreen mode, if any. Does nothing if no fullscreen is present. * @return Whether the fullscreen mode is currently showing. -@@ -2003,15 +1978,6 @@ public abstract class ChromeActivity +@@ -1996,15 +1971,6 @@ public abstract class ChromeActivity } mActivityTabProvider.setLayoutStateProvider(layoutManager); @@ -640,7 +657,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv } /** -@@ -2271,18 +2237,6 @@ public abstract class ChromeActivity +@@ -2273,18 +2239,6 @@ public abstract class ChromeActivity return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null; } @@ -660,6 +677,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private void openChromeManagementPage() { Tab currentTab = getActivityTab(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java +index 8bf6789fdb3a6..448b9de602b81 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java @@ -19,7 +19,6 @@ import org.chromium.base.annotations.NativeMethods; @@ -671,6 +689,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bott import org.chromium.chrome.browser.incognito.IncognitoUtils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java +index 8d2314e507f37..b19a9630816bb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider @@ -692,21 +711,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo for (int i = 0; i < overlayOrder.length; i++) mOverlayOrderMap.put(overlayOrder[i], i); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +index 5b13cee42d7bc..b0a4b23e1887d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java @@ -154,7 +154,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity profileSupplier, - @NonNull ObservableSupplier bookmarkBridgeSupplier, + @NonNull ObservableSupplier bookmarkModelSupplier, @NonNull ObservableSupplier tabBookmarkerSupplier, - @NonNull Supplier contextualSearchManagerSupplier, + Object ignored, @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull BrowserControlsManager browserControlsManager, @NonNull ActivityWindowAndroid windowAndroid, -@@ -152,7 +150,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { +@@ -158,7 +156,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { // clang-format off super(activity, null, shareDelegateSupplier, tabProvider, - profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier, + profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier, - contextualSearchManagerSupplier, tabModelSelectorSupplier, + null, tabModelSelectorSupplier, new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null, browserControlsManager, windowAndroid, new DummyJankTracker(), -@@ -202,16 +200,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { +@@ -208,16 +206,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { ((PartialCustomTabHeightStrategy) mCustomTabHeightStrategy)::onShowSoftInput; mTabController.get().registerTabObserver( new PartialCustomTabTabObserver(softInputCallback)); @@ -758,9 +779,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java +index fb7c722eccddb..c19d0790d659c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java -@@ -188,12 +188,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { +@@ -189,12 +189,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { mIntentDataProvider.getSession(), webContents); } @@ -774,6 +796,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust public String getPackageName() { if (mShouldOverridePackage && mIntentDataProvider instanceof CustomTabIntentDataProvider) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java +index 05d2a4880121b..6089cb8c18292 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java @@ -20,7 +20,6 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider @@ -824,6 +847,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr WebContents webContents = mActiveTab.getWebContents(); if (webContents != null) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java +index 79e423f6b8b0a..c6cc189bcb28a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java @@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplierImpl; @@ -869,6 +893,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab tabModelSelector); assert mAppVisibilityDelegateSupplier.hasValue(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +index 7514c2ddf0546..0126e9aeab342 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java @@ -41,7 +41,6 @@ import org.chromium.ui.text.SpanApplier; @@ -903,17 +928,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java +index af220c335d595..f72eccf4dbd6b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java -@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.tab; - import org.chromium.chrome.browser.SwipeRefreshHandler; +@@ -8,7 +8,6 @@ import org.chromium.chrome.browser.SwipeRefreshHandler; + import org.chromium.chrome.browser.accessibility.AccessibilityTabHelper; import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantTabHelper; import org.chromium.chrome.browser.complex_tasks.TaskTabHelper; -import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper; import org.chromium.chrome.browser.crypto.CipherFactory; import org.chromium.chrome.browser.dom_distiller.ReaderModeManager; import org.chromium.chrome.browser.dom_distiller.TabDistillabilityProvider; -@@ -32,7 +31,6 @@ public final class TabHelpers { +@@ -33,7 +32,6 @@ public final class TabHelpers { TabUma.createForTab(tab); TabDistillabilityProvider.createForTab(tab); InterceptNavigationDelegateTabHelper.createForTab(tab); @@ -922,6 +948,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers. TaskTabHelper.createForTab(tab, parentTab); TabBrowserControlsConstraintsHelper.createForTab(tab); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +index e1007ef45ae29..7e6ed2639332d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -934,7 +961,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.feed.webfeed.WebFeedFollowIntroController; @@ -255,7 +254,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @NonNull ObservableSupplier profileSupplier, - @NonNull ObservableSupplier bookmarkBridgeSupplier, + @NonNull ObservableSupplier bookmarkModelSupplier, @NonNull ObservableSupplier tabBookmarkerSupplier, - @NonNull Supplier contextualSearchManagerSupplier, + Object ignored, @@ -944,24 +971,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab @@ -290,7 +289,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) { super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider, - profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier, + profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier, - contextualSearchManagerSupplier, tabModelSelectorSupplier, startSurfaceSupplier, + null, tabModelSelectorSupplier, startSurfaceSupplier, tabSwitcherSupplier, intentMetadataOneshotSupplier, layoutStateProviderOneshotSupplier, startSurfaceParentTabSupplier, browserControlsManager, windowAndroid, jankTracker, activityLifecycleDispatcher, diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +index 25f274e339bea..f8336b232a870 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -54,7 +54,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager; +@@ -55,7 +55,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; -import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter; import org.chromium.chrome.browser.directactions.DirectActionInitializer; - import org.chromium.chrome.browser.feature_engagement.TrackerFactory; -@@ -97,7 +96,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; + import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonController; +@@ -99,7 +98,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; @@ -969,7 +997,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.share.ShareButtonController; import org.chromium.chrome.browser.share.ShareDelegate; -@@ -244,7 +242,6 @@ public class RootUiCoordinator +@@ -246,7 +244,6 @@ public class RootUiCoordinator private List mButtonDataProviders; @Nullable private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController; @@ -977,7 +1005,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi private IdentityDiscController mIdentityDiscController; private ChromeActionModeHandler mChromeActionModeHandler; private final ToolbarActionModeCallback mActionModeControllerCallback; -@@ -257,7 +254,6 @@ public class RootUiCoordinator +@@ -259,7 +256,6 @@ public class RootUiCoordinator private final ObservableSupplier mTabBookmarkerSupplier; private final OneshotSupplierImpl mAppMenuSupplier; private BottomSheetObserver mBottomSheetObserver; @@ -985,24 +1013,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi protected final CallbackController mCallbackController; protected final BrowserControlsManager mBrowserControlsManager; private BrowserControlsStateProvider.Observer mBrowserControlsObserver; -@@ -362,7 +358,7 @@ public class RootUiCoordinator +@@ -364,7 +360,7 @@ public class RootUiCoordinator @NonNull ObservableSupplier profileSupplier, - @NonNull ObservableSupplier bookmarkBridgeSupplier, + @NonNull ObservableSupplier bookmarkModelSupplier, @NonNull ObservableSupplier tabBookmarkerSupplier, - @NonNull Supplier contextualSearchManagerSupplier, + Object ignored, @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull OneshotSupplier startSurfaceSupplier, @NonNull OneshotSupplier tabSwitcherSupplier, -@@ -455,7 +451,6 @@ public class RootUiCoordinator - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; +@@ -457,7 +453,6 @@ public class RootUiCoordinator + mBookmarkModelSupplier = bookmarkModelSupplier; mTabBookmarkerSupplier = tabBookmarkerSupplier; mAppMenuSupplier = new OneshotSupplierImpl<>(); - mContextualSearchManagerSupplier = contextualSearchManagerSupplier; mActionModeControllerCallback = new ToolbarActionModeCallback(); mTabModelSelectorSupplier = tabModelSelectorSupplier; -@@ -559,11 +554,6 @@ public class RootUiCoordinator +@@ -561,11 +556,6 @@ public class RootUiCoordinator mToolbarManager = null; } @@ -1014,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi if (mAdaptiveToolbarButtonController != null) { mAdaptiveToolbarButtonController.destroy(); mAdaptiveToolbarButtonController = null; -@@ -1004,15 +994,6 @@ public class RootUiCoordinator +@@ -1006,15 +996,6 @@ public class RootUiCoordinator @Override public boolean canShowAppMenu() { @@ -1030,17 +1058,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi // Do not show the menu if we are in find in page view. if (mFindToolbarManager != null && mFindToolbarManager.isShowing() && !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { -@@ -1157,9 +1138,6 @@ public class RootUiCoordinator - AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController); - adaptiveToolbarButtonController.addButtonVariant( +@@ -1169,11 +1150,6 @@ public class RootUiCoordinator AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController); + adaptiveToolbarButtonController.addButtonVariant( + AdaptiveToolbarButtonVariant.READER_MODE, readerModeToolbarButtonController); - mContextualPageActionController = new ContextualPageActionController(mProfileSupplier, -- mActivityTabProvider, mActivityLifecycleDispatcher, mActivity.getResources(), -- adaptiveToolbarButtonController); +- mActivityTabProvider, adaptiveToolbarButtonController, +- () +- -> ShoppingServiceFactory.getForProfile(mProfileSupplier.get()), +- mBookmarkModelSupplier); mButtonDataProviders = Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController); -@@ -1229,10 +1207,6 @@ public class RootUiCoordinator +@@ -1243,10 +1219,6 @@ public class RootUiCoordinator public void onStartedShowing(int layoutType, boolean showToolbar) { if (layoutType != LayoutType.BROWSING && layoutType != LayoutType.SIMPLE_ANIMATION) { @@ -1051,7 +1081,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi } if (layoutType == LayoutType.TAB_SWITCHER) { -@@ -1370,10 +1344,6 @@ public class RootUiCoordinator +@@ -1386,10 +1358,6 @@ public class RootUiCoordinator * cross-feature interaction, e.g. hide other features when this feature is shown. */ protected void onFindToolbarShown() { @@ -1062,7 +1092,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi } /** -@@ -1517,9 +1487,6 @@ public class RootUiCoordinator +@@ -1547,9 +1515,6 @@ public class RootUiCoordinator case SheetState.FULL: if (!mOpened) { mOpened = true; @@ -1072,7 +1102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi } // On visible bottom sheet, hide page zoom dialog -@@ -1527,8 +1494,6 @@ public class RootUiCoordinator +@@ -1557,8 +1522,6 @@ public class RootUiCoordinator break; case SheetState.HIDDEN: mOpened = false; @@ -1082,9 +1112,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi } } diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index bd5c999c857e0..1b5e3ef259f9f 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2078,7 +2078,6 @@ static_library("browser") { +@@ -2090,7 +2090,6 @@ static_library("browser") { "//components/content_settings/common:mojom", "//components/content_settings/core/browser", "//components/content_settings/core/common", @@ -1092,7 +1123,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/cookie_config", "//components/country_codes", "//components/crash/core/browser", -@@ -2549,8 +2548,6 @@ static_library("browser") { +@@ -2565,8 +2564,6 @@ static_library("browser") { "android/compositor/decoration_title.h", "android/compositor/layer/content_layer.cc", "android/compositor/layer/content_layer.h", @@ -1101,7 +1132,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/compositor/layer/layer.h", "android/compositor/layer/overlay_panel_layer.cc", "android/compositor/layer/overlay_panel_layer.h", -@@ -2571,8 +2568,6 @@ static_library("browser") { +@@ -2587,8 +2584,6 @@ static_library("browser") { "android/compositor/resources/resource_factory.cc", "android/compositor/resources/toolbar_resource.cc", "android/compositor/resources/toolbar_resource.h", @@ -1110,7 +1141,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/compositor/scene_layer/overscroll_scene_layer.cc", "android/compositor/scene_layer/overscroll_scene_layer.h", "android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc", -@@ -2595,16 +2590,6 @@ static_library("browser") { +@@ -2611,16 +2606,6 @@ static_library("browser") { "android/content/content_utils.cc", "android/context_menu/context_menu_native_delegate_impl.cc", "android/context_menu/context_menu_native_delegate_impl.h", @@ -1127,7 +1158,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/cookies/cookies_fetcher_util.cc", "android/customtabs/chrome_origin_verifier.cc", "android/customtabs/chrome_origin_verifier.h", -@@ -3217,8 +3202,6 @@ static_library("browser") { +@@ -3230,8 +3215,6 @@ static_library("browser") { "safe_browsing/android/safe_browsing_referring_app_bridge_android.h", "safe_browsing/android/safe_browsing_settings_launcher_android.cc", "safe_browsing/android/safe_browsing_settings_launcher_android.h", @@ -1137,9 +1168,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "search_engines/ui_thread_search_terms_data_android.cc", "search_engines/ui_thread_search_terms_data_android.h", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +index eec961dafc738..54fd9f0905ae8 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1893,27 +1893,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesAlternateUxVariations[] = { +@@ -1961,27 +1961,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesAlternateUxVariations[] = { std::size(kRelatedSearchesAlternateUxShowDefaultChipWith120SpEllipsis), nullptr}, }; @@ -1167,10 +1199,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #endif // BUILDFLAG(IS_ANDROID) const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = { -@@ -3585,34 +3564,6 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableOskResizesVisualViewportName, - flag_descriptions::kEnableOskResizesVisualViewportDescription, kOsAndroid, - FEATURE_VALUE_TYPE(chrome::android::kOSKResizesVisualViewport)}, +@@ -3686,34 +3665,6 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription, + kOsAndroid, + FEATURE_VALUE_TYPE(blink::features::kOSKResizesVisualViewportByDefault)}, - {"contextual-search-debug", flag_descriptions::kContextualSearchDebugName, - flag_descriptions::kContextualSearchDebugDescription, kOsAndroid, - FEATURE_VALUE_TYPE(kContextualSearchDebug)}, @@ -1203,6 +1235,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc flag_descriptions::kExploreSitesDescription, kOsAndroid, FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites, diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc +index 1f50f1a7d0224..91ae132125e7c 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -35,7 +35,6 @@ @@ -1216,7 +1249,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse @@ -223,15 +222,6 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kContextMenuSearchAndShopWithGoogleLens, &kContextMenuTranslateWithGoogleLens, - &kContextMenuPopupStyle, + &kContextMenuPopupForAllScreenSizes, - &kContextualSearchDebug, - &kContextualSearchDelayedIntelligence, - &kContextualSearchDisableOnlineDetection, @@ -1229,61 +1262,69 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kDirectActions, &kDisableCompositedProgressBar, &kDownloadFileProvider, -@@ -645,32 +635,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch", - const base::Feature kLensOnQuickActionSearchWidget{ - "LensOnQuickActionSearchWidget", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -709,38 +699,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget, + "LensOnQuickActionSearchWidget", + base::FEATURE_ENABLED_BY_DEFAULT); --const base::Feature kContextualSearchDelayedIntelligence{ -- "ContextualSearchDelayedIntelligence", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualSearchDelayedIntelligence, +- "ContextualSearchDelayedIntelligence", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualSearchDisableOnlineDetection{ -- "ContextualSearchDisableOnlineDetection", -- base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualSearchDisableOnlineDetection, +- "ContextualSearchDisableOnlineDetection", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualSearchForceCaption{ -- "ContextualSearchForceCaption", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualSearchForceCaption, +- "ContextualSearchForceCaption", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualSearchSuppressShortView{ -- "ContextualSearchSuppressShortView", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualSearchSuppressShortView, +- "ContextualSearchSuppressShortView", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualSearchThinWebViewImplementation{ -- "ContextualSearchThinWebViewImplementation", -- base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualSearchThinWebViewImplementation, +- "ContextualSearchThinWebViewImplementation", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualTriggersSelectionHandles{ -- "ContextualTriggersSelectionHandles", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualTriggersSelectionHandles, +- "ContextualTriggersSelectionHandles", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualTriggersSelectionMenu{ -- "ContextualTriggersSelectionMenu", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualTriggersSelectionMenu, +- "ContextualTriggersSelectionMenu", +- base::FEATURE_DISABLED_BY_DEFAULT); - --const base::Feature kContextualTriggersSelectionSize{ -- "ContextualTriggersSelectionSize", base::FEATURE_DISABLED_BY_DEFAULT}; +-BASE_FEATURE(kContextualTriggersSelectionSize, +- "ContextualTriggersSelectionSize", +- base::FEATURE_DISABLED_BY_DEFAULT); - - const base::Feature kDirectActions{"DirectActions", - base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kDirectActions, "DirectActions", base::FEATURE_ENABLED_BY_DEFAULT); + BASE_FEATURE(kDisableCompositedProgressBar, diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h +index 402124ba053a9..6a36d5acdab79 100644 --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -75,14 +75,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens; - extern const base::Feature kContextMenuShopWithGoogleLens; - extern const base::Feature kContextMenuSearchAndShopWithGoogleLens; - extern const base::Feature kContextMenuTranslateWithGoogleLens; --extern const base::Feature kContextualSearchDelayedIntelligence; --extern const base::Feature kContextualSearchDisableOnlineDetection; --extern const base::Feature kContextualSearchForceCaption; --extern const base::Feature kContextualSearchSuppressShortView; --extern const base::Feature kContextualSearchThinWebViewImplementation; --extern const base::Feature kContextualTriggersSelectionHandles; --extern const base::Feature kContextualTriggersSelectionMenu; --extern const base::Feature kContextualTriggersSelectionSize; - extern const base::Feature kDirectActions; - extern const base::Feature kDisableCompositedProgressBar; - extern const base::Feature kDontPrefetchLibraries; +@@ -75,14 +75,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens); + BASE_DECLARE_FEATURE(kContextMenuShopWithGoogleLens); + BASE_DECLARE_FEATURE(kContextMenuSearchAndShopWithGoogleLens); + BASE_DECLARE_FEATURE(kContextMenuTranslateWithGoogleLens); +-BASE_DECLARE_FEATURE(kContextualSearchDelayedIntelligence); +-BASE_DECLARE_FEATURE(kContextualSearchDisableOnlineDetection); +-BASE_DECLARE_FEATURE(kContextualSearchForceCaption); +-BASE_DECLARE_FEATURE(kContextualSearchSuppressShortView); +-BASE_DECLARE_FEATURE(kContextualSearchThinWebViewImplementation); +-BASE_DECLARE_FEATURE(kContextualTriggersSelectionHandles); +-BASE_DECLARE_FEATURE(kContextualTriggersSelectionMenu); +-BASE_DECLARE_FEATURE(kContextualTriggersSelectionSize); + BASE_DECLARE_FEATURE(kDirectActions); + BASE_DECLARE_FEATURE(kDisableCompositedProgressBar); + BASE_DECLARE_FEATURE(kDontPrefetchLibraries); diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc +index b1a2fff3d996d..0368962f8b6a7 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -120,7 +120,6 @@ +@@ -121,7 +121,6 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/first_run/android/first_run_prefs.h" #include "chrome/browser/lens/android/lens_prefs.h" @@ -1291,7 +1332,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/download/default_download_dir_policy_handler.h" #include "chrome/browser/download/download_auto_open_policy_handler.h" -@@ -1828,10 +1827,7 @@ std::unique_ptr BuildHandlerList( +@@ -1854,10 +1853,7 @@ std::unique_ptr BuildHandlerList( std::make_unique(key::kURLBlocklist)); // Policies for all platforms - End @@ -1304,6 +1345,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc handlers->AddHandler(std::make_unique( key::kClearBrowsingDataOnExitList, diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd +index e81a2b635ec11..2096674e7e40d 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -791,33 +791,6 @@ CHAR_LIMIT guidelines: @@ -1340,7 +1382,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro “Do Not Track” -@@ -3995,38 +3968,6 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -1380,6 +1422,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Web App diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc +index ba1ffe30a7ca9..0ecf1294f0237 100644 --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc @@ -171,7 +171,6 @@ @@ -1391,9 +1434,10 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow #include "content/browser/direct_sockets/direct_sockets_service_impl.h" #include "media/mojo/mojom/renderer_extensions.mojom.h" diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn +index 16cded2e00de5..0f3a80ddf8cb0 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -891,8 +891,8 @@ mojom("android_mojo_bindings") { +@@ -898,8 +898,8 @@ mojom("android_mojo_bindings") { # This Android unhandled-tap feature uses another mojo source, add it in. if (enable_unhandled_tap) { sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ] @@ -1404,6 +1448,7 @@ diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/ cpp_typemaps = [ { diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/public/public_features.gni +index ef7537d70e9bf..e1d36eae54909 100644 --- a/third_party/blink/public/public_features.gni +++ b/third_party/blink/public/public_features.gni @@ -12,7 +12,7 @@ declare_args() { @@ -1415,5 +1460,6 @@ diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/pu # Use Minikin hyphenation engine. use_minikin_hyphenation = !is_mac --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 05f03f4d..b8316563 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -19,15 +19,15 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/BUILD.gn | 20 -- - chrome/android/chrome_java_sources.gni | 30 --- + chrome/android/BUILD.gn | 21 -- + chrome/android/chrome_java_sources.gni | 29 --- .../features/autofill_assistant/BUILD.gn | 1 - .../AssistantAccessTokenUtilChrome.java | 8 - .../AssistantProfileImageUtilChrome.java | 21 +- .../AssistantStaticDependenciesChrome.java | 6 +- chrome/android/features/tab_ui/BUILD.gn | 1 - .../TabSuggestionsServerFetcher.java | 9 +- - .../browser/feed/FeedSurfaceCoordinator.java | 10 +- + .../browser/feed/FeedSurfaceCoordinator.java | 9 +- .../browser/feed/FeedSurfaceMediator.java | 77 +----- chrome/android/java/AndroidManifest.xml | 19 -- .../res/xml/google_services_preferences.xml | 5 - @@ -37,24 +37,24 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../org/chromium/chrome/browser/AppHooks.java | 34 --- .../chrome/browser/ChromeBackupAgentImpl.java | 9 +- .../chrome/browser/ChromeBackupWatcher.java | 10 - - .../chrome/browser/ChromeTabbedActivity.java | 15 -- + .../chrome/browser/ChromeTabbedActivity.java | 9 - .../chrome/browser/app/ChromeActivity.java | 76 ------ .../AutofillAssistantPreferenceFragment.java | 17 +- - .../bookmarks/BookmarkItemsAdapter.java | 56 +---- - .../bookmarks/BookmarkPromoHeader.java | 227 +----------------- - .../ClearBrowsingDataFragment.java | 77 +----- - .../ClearBrowsingDataFragmentBasic.java | 27 +-- - .../contacts_picker/ChromePickerAdapter.java | 67 +----- - .../browser/customtabs/CustomTabActivity.java | 3 - + .../bookmarks/BookmarkItemsAdapter.java | 56 +--- + .../bookmarks/BookmarkPromoHeader.java | 241 +----------------- + .../ClearBrowsingDataFragment.java | 80 +----- + .../ClearBrowsingDataFragmentBasic.java | 27 +- + .../contacts_picker/ChromePickerAdapter.java | 67 +---- + .../browser/customtabs/CustomTabActivity.java | 6 - .../firstrun/FirstRunActivityBase.java | 1 - .../firstrun/LightweightFirstRunActivity.java | 4 +- ...FirstRunFragmentWithEnterpriseSupport.java | 6 - - .../history/HistoryContentManager.java | 27 +-- + .../history/HistoryContentManager.java | 27 +- .../identity_disc/IdentityDiscController.java | 104 +------- .../init/ChromeBrowserInitializer.java | 2 - .../init/ProcessInitializationHandler.java | 9 - .../chrome/browser/ntp/RecentTabsManager.java | 129 +--------- - .../browser/ntp/RecentTabsRowAdapter.java | 33 +-- + .../browser/ntp/RecentTabsRowAdapter.java | 31 +-- .../browser/ntp/search/SearchBoxMediator.java | 1 - .../browser/omaha/RequestGenerator.java | 3 - .../AccountChooserDialog.java | 2 +- @@ -63,21 +63,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../settings/PasswordSettings.java | 71 +----- .../browser/payments/ui/PaymentRequestUI.java | 12 +- .../privacy/settings/PrivacySettings.java | 31 --- - .../chrome/browser/settings/MainSettings.java | 141 +---------- + .../chrome/browser/settings/MainSettings.java | 141 +--------- .../browser/settings/SettingsActivity.java | 9 - .../share/crow/CrowButtonDelegateImpl.java | 5 +- .../survey/ChromeSurveyController.java | 6 +- .../tabbed_mode/TabbedRootUiCoordinator.java | 19 -- - .../browser/tasks/ReturnToChromeUtil.java | 9 +- - chrome/browser/BUILD.gn | 11 - + chrome/browser/BUILD.gn | 9 - ...mobile_identity_consistency_field_trial.cc | 15 +- chrome/browser/commerce/android/BUILD.gn | 2 - .../PriceNotificationPreferenceFragment.java | 8 +- - .../browser/commerce/ShoppingFeatures.java | 27 +-- + .../browser/commerce/ShoppingFeatures.java | 27 +- .../price_tracking/PriceTrackingFeatures.java | 9 +- .../commerce/subscriptions/android/BUILD.gn | 1 - .../CommerceSubscriptionsMetrics.java | 6 +- - .../CommerceSubscriptionsService.java | 14 -- + .../CommerceSubscriptionsService.java | 14 - .../subscriptions/android/java_sources.gni | 1 - chrome/browser/feed/android/BUILD.gn | 1 - .../chrome/browser/feed/FeedFeatures.java | 2 - @@ -88,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../router/discovery/access_code/BUILD.gn | 1 - .../browser/password_manager/android/BUILD.gn | 4 - ...sswordManagerErrorMessageHelperBridge.java | 26 -- - .../PasswordManagerHelper.java | 121 +--------- + .../PasswordManagerHelper.java | 121 +-------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - chrome/browser/privacy/BUILD.gn | 1 - chrome/browser/privacy_guide/android/BUILD.gn | 2 - @@ -98,7 +97,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../SearchResumptionModuleMediator.java | 37 +-- .../SearchResumptionModuleUtils.java | 12 - .../ManageAccountDevicesLinkView.java | 26 +- - .../SendTabToSelfCoordinator.java | 151 ------------ + .../SendTabToSelfCoordinator.java | 151 ----------- .../account_consistency_mode_manager.cc | 7 +- .../signin/identity_manager_factory.cc | 5 - .../identity_services_provider_android.cc | 13 - @@ -127,112 +126,130 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ProfileOAuth2TokenServiceDelegate.java | 52 ---- .../net/HttpNegotiateAuthenticator.java | 88 +------ .../chromoting/base/OAuthTokenFetcher.java | 2 - - 108 files changed, 101 insertions(+), 2655 deletions(-) + 107 files changed, 99 insertions(+), 2657 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +index 0f031a2868e67..caf13898e1a57 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -238,14 +238,12 @@ android_resources("chrome_app_java_resources") { - "//chrome/browser/password_check/android:java_resources", - "//chrome/browser/password_manager/android:java_resources", - "//chrome/browser/search_resumption:java_resources", -- "//chrome/browser/signin/services/android:java_resources", - "//chrome/browser/tab:java_resources", - "//chrome/browser/ui/android/appmenu:java_resources", - "//chrome/browser/ui/android/favicon:java_resources", - "//chrome/browser/ui/android/management:java_resources", - "//chrome/browser/ui/android/omnibox:java_resources", - "//chrome/browser/ui/android/quickactionsearchwidget:java_resources", -- "//chrome/browser/ui/android/signin:java_resources", - "//chrome/browser/ui/android/strings:ui_strings_grd", - "//chrome/browser/ui/android/theme:java_resources", - "//chrome/browser/ui/android/toolbar:java_resources", -@@ -439,8 +437,6 @@ android_library("chrome_java") { - "//chrome/browser/settings:java", - "//chrome/browser/share:java", - "//chrome/browser/share/android:java_resources", -- "//chrome/browser/signin/services/android:java", -- "//chrome/browser/sync/android:java", - "//chrome/browser/tab:java", - "//chrome/browser/tab_group:java", - "//chrome/browser/tabmodel:factory_java", -@@ -464,7 +460,6 @@ android_library("chrome_java") { - "//chrome/browser/ui/android/page_info:java", - "//chrome/browser/ui/android/quickactionsearchwidget:java", - "//chrome/browser/ui/android/searchactivityutils:java", -- "//chrome/browser/ui/android/signin:java", - "//chrome/browser/ui/android/theme:java", - "//chrome/browser/ui/android/toolbar:java", - "//chrome/browser/ui/messages/android:java", -@@ -1081,9 +1076,6 @@ robolectric_binary("chrome_junit_tests") { - "//chrome/browser/search_resumption:junit", - "//chrome/browser/segmentation_platform:factory_java", - "//chrome/browser/share:java", -- "//chrome/browser/signin/services/android:java", -- "//chrome/browser/signin/services/android:junit", -- "//chrome/browser/sync/android:java", - "//chrome/browser/tab:java", - "//chrome/browser/tab:junit", - "//chrome/browser/tab_group:java", -@@ -1115,8 +1107,6 @@ robolectric_binary("chrome_junit_tests") { - "//chrome/browser/ui/android/omnibox:junit", - "//chrome/browser/ui/android/quickactionsearchwidget:java", - "//chrome/browser/ui/android/searchactivityutils:java", -- "//chrome/browser/ui/android/signin:java", -- "//chrome/browser/ui/android/signin:junit", - "//chrome/browser/ui/android/theme:java", - "//chrome/browser/ui/android/toolbar:java", - "//chrome/browser/ui/android/toolbar:junit", -@@ -1631,9 +1621,6 @@ android_library("chrome_test_java") { - "//chrome/browser/settings:test_support_java", - "//chrome/browser/share:java", - "//chrome/browser/share/android:java_resources", -- "//chrome/browser/signin/services/android:java", -- "//chrome/browser/sync/android:java", -- "//chrome/browser/sync/test/android:test_support_java", - "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java", - "//chrome/browser/tab:critical_persisted_tab_data_proto_java", - "//chrome/browser/tab:java", -@@ -1659,8 +1646,6 @@ android_library("chrome_test_java") { - "//chrome/browser/ui/android/quickactionsearchwidget:java", - "//chrome/browser/ui/android/quickactionsearchwidget:javatests", - "//chrome/browser/ui/android/searchactivityutils:java", -- "//chrome/browser/ui/android/signin:java", -- "//chrome/browser/ui/android/signin:javatests", - "//chrome/browser/ui/android/theme:java", - "//chrome/browser/ui/android/toolbar:java", - "//chrome/browser/ui/messages/android:java", -@@ -2609,7 +2594,6 @@ android_library("browser_java_test_support") { - "//chrome/browser/download/android:java", - "//chrome/browser/prefetch/android:java", - "//chrome/browser/profiles/android:java", -- "//chrome/browser/sync/android:java", - "//chrome/browser/tab:java", - "//components/offline_items_collection/core:core_java", - "//components/sync/protocol:protocol_java", -@@ -3296,13 +3280,11 @@ chrome_test_apk_tmpl("chrome_public_unit_test_apk") { - "//chrome/browser/optimization_guide/android:unit_device_javatests", - "//chrome/browser/partnercustomizations:unit_device_javatests", - "//chrome/browser/password_edit_dialog/android:unit_device_javatests", -- "//chrome/browser/signin/services/android:unit_device_javatests", - "//chrome/browser/thumbnail/generator:unit_device_javatests", - "//chrome/browser/ui/android/appmenu/internal:unit_device_javatests", - "//chrome/browser/ui/android/night_mode:unit_device_javatests", - "//chrome/browser/ui/android/omnibox:unit_device_javatests", - "//chrome/browser/ui/android/searchactivityutils:unit_device_javatests", -- "//chrome/browser/ui/android/signin:unit_device_javatests", - "//chrome/browser/ui/messages/android:unit_device_javatests", - "//chrome/browser/user_education:unit_device_javatests", - "//chrome/browser/video_tutorials/internal:unit_device_javatests", -@@ -4179,7 +4161,6 @@ generate_jni("chrome_jni_headers") { - "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java", -- "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java", - "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java", -@@ -4257,7 +4238,6 @@ generate_jni("chrome_jni_headers") { +@@ -265,14 +265,12 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/password_check/android:java_resources", + "//chrome/browser/password_manager/android:java_resources", + "//chrome/browser/search_resumption:java_resources", +- "//chrome/browser/signin/services/android:java_resources", + "//chrome/browser/tab:java_resources", + "//chrome/browser/ui/android/appmenu:java_resources", + "//chrome/browser/ui/android/favicon:java_resources", + "//chrome/browser/ui/android/management:java_resources", + "//chrome/browser/ui/android/omnibox:java_resources", + "//chrome/browser/ui/android/quickactionsearchwidget:java_resources", +- "//chrome/browser/ui/android/signin:java_resources", + "//chrome/browser/ui/android/strings:ui_strings_grd", + "//chrome/browser/ui/android/theme:java_resources", + "//chrome/browser/ui/android/toolbar:java_resources", +@@ -466,8 +464,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/settings:java", + "//chrome/browser/share:java", + "//chrome/browser/share/android:java_resources", +- "//chrome/browser/signin/services/android:java", +- "//chrome/browser/sync/android:java", + "//chrome/browser/tab:java", + "//chrome/browser/tab_group:java", + "//chrome/browser/tabmodel:factory_java", +@@ -491,7 +487,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/ui/android/page_info:java", + "//chrome/browser/ui/android/quickactionsearchwidget:java", + "//chrome/browser/ui/android/searchactivityutils:java", +- "//chrome/browser/ui/android/signin:java", + "//chrome/browser/ui/android/theme:java", + "//chrome/browser/ui/android/toolbar:java", + "//chrome/browser/ui/messages/android:java", +@@ -618,7 +613,6 @@ if (current_toolchain == default_toolchain) { + "//components/strictmode/android:java", + "//components/stylus_handwriting/android:java", + "//components/subresource_filter/android:java", +- "//components/sync/android:sync_java", + "//components/sync/protocol:protocol_java", + "//components/sync_device_info:sync_device_info_java", + "//components/thin_webview:factory_java", +@@ -1065,9 +1059,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/search_resumption:junit", + "//chrome/browser/segmentation_platform:factory_java", + "//chrome/browser/share:java", +- "//chrome/browser/signin/services/android:java", +- "//chrome/browser/signin/services/android:junit", +- "//chrome/browser/sync/android:java", + "//chrome/browser/tab:java", + "//chrome/browser/tab:junit", + "//chrome/browser/tab_group:java", +@@ -1099,8 +1090,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/ui/android/omnibox:junit", + "//chrome/browser/ui/android/quickactionsearchwidget:java", + "//chrome/browser/ui/android/searchactivityutils:java", +- "//chrome/browser/ui/android/signin:java", +- "//chrome/browser/ui/android/signin:junit", + "//chrome/browser/ui/android/theme:java", + "//chrome/browser/ui/android/toolbar:java", + "//chrome/browser/ui/android/toolbar:junit", +@@ -1191,7 +1180,6 @@ if (current_toolchain == default_toolchain) { + "//components/signin/core/browser:signin_enums_java", + "//components/signin/public/android:java", + "//components/signin/public/android:signin_java_test_support", +- "//components/sync/android:sync_java", + "//components/sync_device_info:sync_device_info_java", + "//components/translate/content/android:junit", + "//components/ukm/android:java", +@@ -1608,10 +1596,8 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/settings:test_support_java", + "//chrome/browser/share:java", + "//chrome/browser/share/android:java_resources", +- "//chrome/browser/signin/services/android:java", + "//chrome/browser/supervised_user:javatests", + "//chrome/browser/supervised_user:test_support_java", +- "//chrome/browser/sync/android:java", + "//chrome/browser/sync/test/android:test_support_java", + "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java", + "//chrome/browser/tab:critical_persisted_tab_data_proto_java", +@@ -1638,8 +1624,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/ui/android/quickactionsearchwidget:java", + "//chrome/browser/ui/android/quickactionsearchwidget:javatests", + "//chrome/browser/ui/android/searchactivityutils:java", +- "//chrome/browser/ui/android/signin:java", +- "//chrome/browser/ui/android/signin:javatests", + "//chrome/browser/ui/android/theme:java", + "//chrome/browser/ui/android/toolbar:java", + "//chrome/browser/ui/messages/android:java", +@@ -1756,7 +1740,6 @@ if (current_toolchain == default_toolchain) { + "//components/signin/public/android:java", + "//components/signin/public/android:signin_java_test_support", + "//components/site_engagement/content/android:java", +- "//components/sync/android:sync_java", + "//components/sync/protocol:protocol_java", + "//components/sync_device_info:sync_device_info_java", + "//components/url_formatter/android:url_formatter_java", +@@ -2451,7 +2434,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/download/android:java", + "//chrome/browser/prefetch/android:java", + "//chrome/browser/profiles/android:java", +- "//chrome/browser/sync/android:java", + "//chrome/browser/tab:java", + "//components/offline_items_collection/core:core_java", + "//components/sync/protocol:protocol_java", +@@ -3157,13 +3139,11 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/optimization_guide/android:unit_device_javatests", + "//chrome/browser/partnercustomizations:unit_device_javatests", + "//chrome/browser/password_edit_dialog/android:unit_device_javatests", +- "//chrome/browser/signin/services/android:unit_device_javatests", + "//chrome/browser/thumbnail/generator:unit_device_javatests", + "//chrome/browser/ui/android/appmenu/internal:unit_device_javatests", + "//chrome/browser/ui/android/night_mode:unit_device_javatests", + "//chrome/browser/ui/android/omnibox:unit_device_javatests", + "//chrome/browser/ui/android/searchactivityutils:unit_device_javatests", +- "//chrome/browser/ui/android/signin:unit_device_javatests", + "//chrome/browser/ui/messages/android:unit_device_javatests", + "//chrome/browser/user_education:unit_device_javatests", + "//chrome/browser/video_tutorials/internal:unit_device_javatests", +@@ -4138,7 +4118,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", "java/src/org/chromium/chrome/browser/signin/SigninBridge.java", @@ -241,9 +258,10 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java", "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java", diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni +index 6cdd0540f5df6..1073445881dc4 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -602,14 +602,11 @@ chrome_java_sources = [ +@@ -604,14 +604,11 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java", @@ -258,15 +276,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java", -@@ -700,7 +697,6 @@ chrome_java_sources = [ - "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java", - "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java", -- "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java", - "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java", - "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java", -@@ -814,7 +810,6 @@ chrome_java_sources = [ +@@ -815,7 +812,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java", "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java", "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java", @@ -274,7 +284,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java", "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java", "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java", -@@ -1018,14 +1013,6 @@ chrome_java_sources = [ +@@ -1023,14 +1019,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", @@ -289,7 +299,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java", "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java", "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java", -@@ -1066,23 +1053,6 @@ chrome_java_sources = [ +@@ -1071,23 +1059,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java", @@ -314,9 +324,10 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/tab/AutofillSessionLifetimeController.java", "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateClientImpl.java", diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn +index e86f698f1d2af..1d634c2cc1264 100644 --- a/chrome/android/features/autofill_assistant/BUILD.gn +++ b/chrome/android/features/autofill_assistant/BUILD.gn -@@ -141,7 +141,6 @@ android_library("test_java") { +@@ -146,7 +146,6 @@ android_library("test_java") { "//chrome/browser/password_manager/android:java", "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", @@ -325,6 +336,7 @@ diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/androi "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/omnibox:java", diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java +index 27faaa9541374..032d6a119e2e3 100644 --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java @@ -7,7 +7,6 @@ package org.chromium.chrome.browser.autofill_assistant; @@ -353,6 +365,7 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro } } diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java +index f69ae57a2f2fd..931328969e027 100644 --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java @@ -10,49 +10,30 @@ import android.graphics.drawable.Drawable; @@ -407,6 +420,7 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro } } diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java +index a368eb5f815aa..b2aae9564581c 100644 --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java @@ -13,7 +13,6 @@ import androidx.annotation.Nullable; @@ -430,9 +444,10 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro @Override diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn +index ecbdd3059f8c7..0f5ffcaa629b0 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -201,7 +201,6 @@ android_library("java") { +@@ -205,7 +205,6 @@ android_library("java") { "//chrome/browser/profiles/android:java", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", @@ -441,6 +456,7 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/t "//chrome/browser/tab_group:java", "//chrome/browser/tabmodel:java", diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java +index 49c54ff1561e3..76a0e2d4df5cc 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java @@ -18,9 +18,7 @@ import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher; @@ -472,24 +488,24 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser @VisibleForTesting diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java +index 89ed83da592f2..8ad28637ab304 100644 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java -@@ -733,13 +733,7 @@ public class FeedSurfaceCoordinator +@@ -734,12 +734,7 @@ public class FeedSurfaceCoordinator /** @return The {@link View} for this class. */ View getSigninPromoView() { - if (mSigninPromoView == null) { - LayoutInflater inflater = LayoutInflater.from(mRootView.getContext()); - mSigninPromoView = inflater.inflate( -- R.layout.personalized_signin_promo_view_modern_content_suggestions, mRootView, -- false); +- R.layout.sync_promo_view_content_suggestions, mRootView, false); - } - return mSigninPromoView; + return null; } /** -@@ -867,7 +861,7 @@ public class FeedSurfaceCoordinator +@@ -867,7 +862,7 @@ public class FeedSurfaceCoordinator @Override public boolean isSignedIn() { @@ -499,9 +515,10 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ @Override diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java +index bfa6d50c8d39f..7aa5bcf1516ff 100644 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java -@@ -34,17 +34,12 @@ import org.chromium.chrome.browser.feed.sort_ui.FeedOptionsCoordinator; +@@ -36,17 +36,12 @@ import org.chromium.chrome.browser.feed.v2.ContentOrder; import org.chromium.chrome.browser.feed.v2.FeedUserActionType; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin; @@ -518,8 +535,8 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ -import org.chromium.chrome.browser.ui.signin.SyncPromoController; import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger; import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType; - import org.chromium.components.browser_ui.widget.listmenu.ListMenu; -@@ -132,7 +127,6 @@ public class FeedSurfaceMediator + import org.chromium.chrome.browser.xsurface.ListLayoutHelper; +@@ -119,7 +114,6 @@ public class FeedSurfaceMediator /** * The {@link SignInPromo} for the Feed. * TODO(huayinz): Update content and visibility through a ModelChangeProcessor. @@ -527,7 +544,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private class FeedSignInPromo extends SignInPromo { FeedSignInPromo(SigninManager signinManager) { super(signinManager); -@@ -153,7 +147,7 @@ public class FeedSurfaceMediator +@@ -140,7 +134,7 @@ public class FeedSurfaceMediator maybeUpdateSignInPromo(); } @@ -536,16 +553,16 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private void maybeUpdateSignInPromo() { // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially // blocking the UI thread for several seconds if the accounts cache is not populated -@@ -171,7 +165,7 @@ public class FeedSurfaceMediator +@@ -158,7 +152,7 @@ public class FeedSurfaceMediator super.onDismissPromo(); mCoordinator.updateHeaderViews(false); } - } + } */ - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public static void setPrefForTest( -@@ -187,7 +181,6 @@ public class FeedSurfaceMediator + /** + * Internal implementation of Stream.StreamsMediator. +@@ -192,7 +186,6 @@ public class FeedSurfaceMediator private final Context mContext; private final @Nullable SnapScrollHelper mSnapScrollHelper; private final PrefChangeRegistrar mPrefChangeRegistrar; @@ -553,7 +570,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private final PropertyModel mSectionHeaderModel; private final FeedActionDelegate mActionDelegate; private final FeedOptionsCoordinator mOptionsCoordinator; -@@ -197,7 +190,6 @@ public class FeedSurfaceMediator +@@ -202,7 +195,6 @@ public class FeedSurfaceMediator private HasContentListener mHasContentListener; private ContentChangedListener mStreamContentChangedListener; private MemoryPressureCallback mMemoryPressureCallback; @@ -561,7 +578,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private RecyclerViewAnimationFinishDetector mRecyclerViewAnimationFinishDetector = new RecyclerViewAnimationFinishDetector(); -@@ -239,8 +231,6 @@ public class FeedSurfaceMediator +@@ -244,8 +236,6 @@ public class FeedSurfaceMediator mHasContentListener = coordinator; mContext = context; mSnapScrollHelper = snapScrollHelper; @@ -569,8 +586,8 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ - Profile.getLastUsedRegularProfile()); mActionDelegate = actionDelegate; mOptionsCoordinator = optionsCoordinator; - -@@ -396,7 +386,6 @@ public class FeedSurfaceMediator + mOptionsCoordinator.setOptionsListener(this); +@@ -458,7 +448,6 @@ public class FeedSurfaceMediator mFeedMenuModel = buildMenuItems(); mCoordinator.initializeBubbleTriggering(); @@ -578,7 +595,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, mFeedMenuModel); mSectionHeaderModel.set( -@@ -437,8 +426,6 @@ public class FeedSurfaceMediator +@@ -499,8 +488,6 @@ public class FeedSurfaceMediator }; mCoordinator.getRecyclerView().addOnScrollListener(mStreamScrollListener); @@ -587,7 +604,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mMemoryPressureCallback = pressure -> mCoordinator.getRecyclerView().getRecycledViewPool().clear(); MemoryPressureListener.addCallback(mMemoryPressureCallback); -@@ -627,27 +614,12 @@ public class FeedSurfaceMediator +@@ -707,27 +694,12 @@ public class FeedSurfaceMediator } } @@ -616,7 +633,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ } /** Clear any dependencies related to the {@link Stream}. */ -@@ -662,11 +634,6 @@ public class FeedSurfaceMediator +@@ -742,11 +714,6 @@ public class FeedSurfaceMediator MemoryPressureListener.removeCallback(mMemoryPressureCallback); mMemoryPressureCallback = null; @@ -628,7 +645,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ unbindStream(); for (Stream s : mTabToStreamMap.values()) { s.removeOnContentChangedListener(mStreamContentChangedListener); -@@ -677,7 +644,6 @@ public class FeedSurfaceMediator +@@ -757,7 +724,6 @@ public class FeedSurfaceMediator mPrefChangeRegistrar.removeObserver(Pref.ARTICLES_LIST_VISIBLE); TemplateUrlServiceFactory.get().removeObserver(this); @@ -636,7 +653,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY).clear(); -@@ -748,9 +714,6 @@ public class FeedSurfaceMediator +@@ -828,9 +794,6 @@ public class FeedSurfaceMediator // Update toggleswitch item, which is last item in list. mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, buildMenuItems()); @@ -646,7 +663,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ if (suggestionsVisible) mCoordinator.getSurfaceLifecycleManager().show(); mStreamContentChanged = true; -@@ -828,35 +791,6 @@ public class FeedSurfaceMediator +@@ -908,35 +871,6 @@ public class FeedSurfaceMediator private ModelList buildMenuItems() { ModelList itemList = new ModelList(); @@ -682,7 +699,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ return itemList; } -@@ -1044,11 +978,6 @@ public class FeedSurfaceMediator +@@ -1122,11 +1056,6 @@ public class FeedSurfaceMediator updateSectionHeader(); } @@ -695,6 +712,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ if (mCurrentStream != null) { mCurrentStream.triggerRefresh(callback); diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml +index c1138824f6ada..78f86e48ed582 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -68,9 +68,7 @@ by a child template that "extends" this file. @@ -724,7 +742,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -532,15 +527,6 @@ by a child template that "extends" this file. +@@ -536,15 +531,6 @@ by a child template that "extends" this file. TODO(crbug.com/1093292): investigate why @android:style/Theme.NoDisplay can't be used here. --> @@ -740,7 +758,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% endif %} @@ -753,6 +771,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro android:theme="@style/Theme.Chromium.Settings" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml +index b7dcb7bf99ee3..4f5970e4764ae 100644 --- a/chrome/android/java/res/xml/google_services_preferences.xml +++ b/chrome/android/java/res/xml/google_services_preferences.xml @@ -26,11 +26,6 @@ found in the LICENSE file. @@ -768,6 +787,7 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom android:key="autofill_assistant" android:title="@string/prefs_autofill_assistant_title" diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml +index dfc636f01840e..a3fb6a444e0aa 100644 --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml @@ -9,29 +9,11 @@ found in the LICENSE file. @@ -803,6 +823,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml +index 4afa78d4c548d..8297f9cbd09d6 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml @@ -53,8 +53,4 @@ found in the LICENSE file. @@ -835,6 +857,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi - app:allowDividerBelow="false"/> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +index e614b4ad3dbae..c32175b68fc55 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -34,8 +34,6 @@ import org.chromium.chrome.browser.password_manager.GooglePasswordManagerUIProvi @@ -907,6 +930,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b * This is deprecated, and should not be called. Use FeedHooks instead. */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java +index 9436435ccc7e0..0614579bdc4d2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java @@ -27,7 +27,6 @@ import org.chromium.chrome.browser.init.AsyncInitTaskRunner; @@ -947,6 +971,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAge BackupState newBackupState = new BackupState(backupNames, backupValues); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java +index 04221bf74c207..4a93e3ba84757 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java @@ -16,7 +16,6 @@ import org.chromium.base.annotations.JNINamespace; @@ -974,9 +999,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWat @CalledByNative diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +index 5df07363ae91b..7065cabc95040 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -89,7 +89,6 @@ import org.chromium.chrome.browser.download.DownloadUtils; +@@ -90,7 +90,6 @@ import org.chromium.chrome.browser.download.DownloadUtils; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils; import org.chromium.chrome.browser.feed.FeedSurfaceTracker; @@ -984,49 +1010,37 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; -@@ -103,7 +102,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup; - import org.chromium.chrome.browser.incognito.IncognitoTabLauncher; - import org.chromium.chrome.browser.incognito.IncognitoTabbedSnapshotController; - import org.chromium.chrome.browser.incognito.IncognitoUtils; --import org.chromium.chrome.browser.infobar.SyncErrorInfoBar; - import org.chromium.chrome.browser.layouts.LayoutStateProvider; - import org.chromium.chrome.browser.layouts.LayoutType; - import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; -@@ -141,8 +139,6 @@ import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl; +@@ -141,7 +140,6 @@ import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.suggestions.SuggestionsMetrics; import org.chromium.chrome.browser.survey.ChromeSurveyController; -import org.chromium.chrome.browser.sync.ui.SyncErrorMessage; --import org.chromium.chrome.browser.sync.ui.SyncErrorPromptUtils; import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAssociatedApp; -@@ -691,9 +687,6 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -318,9 +314,6 @@ public abstract class ChromeActivity private boolean mRemoveWindowBackgroundDone; protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler; @@ -1064,7 +1078,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // The FullscreenVideoPictureInPictureController is initialized lazily https://crbug.com/729738. private FullscreenVideoPictureInPictureController mFullscreenVideoPictureInPictureController; -@@ -1065,61 +1058,6 @@ public abstract class ChromeActivity +@@ -1061,61 +1054,6 @@ public abstract class ChromeActivity return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR; } @@ -1126,7 +1140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv @Override public void onResumeWithNative() { // TODO(b/182286787): Clean-up once fixed session resume order is verified. -@@ -1254,14 +1192,6 @@ public abstract class ChromeActivity +@@ -1250,14 +1188,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); } @@ -1141,7 +1155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv super.onStopWithNative(); } -@@ -1354,11 +1284,6 @@ public abstract class ChromeActivity +@@ -1350,11 +1280,6 @@ public abstract class ChromeActivity .recordUserFontPrefOnStartup(); }); @@ -1153,7 +1167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // GSA connection is not needed on low-end devices because Icing is disabled. if (!SysUtils.isLowEndDevice()) { if (isActivityFinishingOrDestroyed()) return; -@@ -1373,7 +1298,6 @@ public abstract class ChromeActivity +@@ -1369,7 +1294,6 @@ public abstract class ChromeActivity GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); } mGSAAccountChangeListener.connect(); @@ -1162,18 +1176,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java +index 8741e16a7f40a..908def6d64dfb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java -@@ -18,8 +18,6 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; - import org.chromium.chrome.browser.preferences.SharedPreferencesManager; +@@ -20,8 +20,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge; -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; import org.chromium.components.autofill_assistant.AssistantFeatures; - import org.chromium.components.autofill_assistant.AutofillAssistantPreferencesUtil; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; -@@ -53,7 +51,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa + import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; +@@ -64,7 +62,6 @@ public class AutofillAssistantPreferenceFragment private ChromeSwitchPreference mAutofillAssistantPreference; private ChromeSwitchPreference mProactiveHelpPreference; private ChromeSwitchPreference mAssistantVoiceSearchEnabledPref; @@ -1181,7 +1196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { -@@ -89,15 +86,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa +@@ -94,15 +91,6 @@ public class AutofillAssistantPreferenceFragment mProactiveHelpPreference.setVisible(false); } @@ -1197,7 +1212,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist PreferenceCategory assistantVoiceSearchCategory = findPreference(PREF_ASSISTANT_VOICE_SEARCH_CATEGORY); mAssistantVoiceSearchEnabledPref = -@@ -146,9 +134,7 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa +@@ -178,9 +166,7 @@ public class AutofillAssistantPreferenceFragment boolean assistant_switch_on_or_missing = !mAutofillAssistantPreference.isVisible() || autofill_assistant_enabled; @@ -1207,8 +1222,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist + boolean url_keyed_anonymized_data_collection_enabled = false; boolean proactive_help_on = - AutofillAssistantPreferencesUtil.getProactiveHelpPreference(true); -@@ -164,7 +150,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa + mPrefService.getBoolean(Pref.AUTOFILL_ASSISTANT_TRIGGER_SCRIPTS_ENABLED); +@@ -196,7 +182,6 @@ public class AutofillAssistantPreferenceFragment } mProactiveHelpPreference.setEnabled(proactive_toggle_enabled); mProactiveHelpPreference.setChecked(proactive_toggle_enabled && proactive_help_on); @@ -1217,9 +1232,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist mAssistantVoiceSearchEnabledPref.setChecked(mSharedPreferencesManager.readBoolean( ChromePreferenceKeys.ASSISTANT_VOICE_SEARCH_ENABLED, /* default= */ false)); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +index 8ddd7a681de16..84fa2a626b085 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java -@@ -30,10 +30,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -28,10 +28,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; @@ -1228,9 +1244,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView; -import org.chromium.chrome.browser.ui.signin.SyncPromoController.SyncPromoState; import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; - import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool; -@@ -54,7 +51,7 @@ import java.util.List; +@@ -53,7 +50,7 @@ import java.util.List; * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there. */ public class BookmarkItemsAdapter extends DragReorderableListAdapter @@ -1239,7 +1255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500; private static final String EMPTY_QUERY = null; -@@ -67,10 +64,8 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter(); -@@ -377,8 +359,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter options = getDialogOptions(); + mItems = new Item[options.size()]; + for (int i = 0; i < options.size(); i++) { +@@ -589,11 +577,6 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat + assert spinnerOptionIndex != -1; + spinner.setOptions(spinnerOptions, spinnerOptionIndex); + spinner.setOnPreferenceChangeListener(this); +- +- // Text for sign-out option. +- updateSignOutOfChromeText(); +- +- mSigninManager.addSignInStateObserver(this); } @Override -@@ -667,21 +647,6 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat - return mConfirmImportantSitesDialog; +@@ -639,7 +622,6 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat + for (Item item : mItems) { + item.destroy(); + } +- mSigninManager.removeSignInStateObserver(this); } + // We either show the dialog, or modify the current one to display our messages. This avoids +@@ -665,28 +647,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat + private void updateSignOutOfChromeText() { + ClickableSpansTextMessagePreference signOutOfChromeTextPref = + findPreference(ClearBrowsingDataFragment.PREF_SIGN_OUT_OF_CHROME_TEXT); +- if (ChromeFeatureList.isEnabled(ChromeFeatureList.ENABLE_CBD_SIGN_OUT) +- && mSigninManager.isSignOutAllowed()) { +- signOutOfChromeTextPref.setSummary(buildSignOutOfChromeText()); +- signOutOfChromeTextPref.setVisible(true); +- } else { + signOutOfChromeTextPref.setVisible(false); +- } +- } +- - @VisibleForTesting - SpannableString buildSignOutOfChromeText() { - return SpanApplier.applySpans(getContext().getString(R.string.sign_out_of_chrome_link), @@ -1697,12 +1751,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C - -> SignOutDialogCoordinator.show(requireContext(), - ((ModalDialogManagerHolder) getActivity()).getModalDialogManager(), this, - ActionType.CLEAR_PRIMARY_ACCOUNT, GAIAServiceType.GAIA_SERVICE_TYPE_NONE); -- } -- - private void deleteSignOutOfChromeTextIfExists() { - Preference signOutOfChromeTextPref = - findPreference(ClearBrowsingDataFragment.PREF_SIGN_OUT_OF_CHROME_TEXT); -@@ -752,44 +717,4 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat + } + + /** +@@ -751,43 +712,4 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat ignoredDomains, ignoredDomainReasons); } } @@ -1711,23 +1763,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C - @Override - public void onSignOutClicked(boolean forceWipeUserData) { - // In case the user is not signed in, we guard the sign out so we do not hit a native crash. -- if (!IdentityServicesProvider.get() -- .getIdentityManager(Profile.getLastUsedRegularProfile()) -- .hasPrimaryAccount(ConsentLevel.SIGNIN)) { +- if (!mSigninManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)) { - return; - } -- final SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( -- Profile.getLastUsedRegularProfile()); -- signinManager.runAfterOperationInProgress(() -> { +- mSigninManager.runAfterOperationInProgress(() -> { - // In case supervised users reach this flow, remove the preference and guard against - // signing out. -- if (!signinManager.isSignOutAllowed()) { -- deleteSignOutOfChromeTextIfExists(); +- if (!mSigninManager.isSignOutAllowed()) { +- updateSignOutOfChromeText(); - return; - } - final DialogFragment clearDataProgressDialog = new ClearDataProgressDialog(); -- signinManager.signOut(org.chromium.components.signin.metrics.SignoutReason -- .USER_CLICKED_SIGNOUT_FROM_CLEAR_BROWSING_DATA_PAGE, +- mSigninManager.signOut(org.chromium.components.signin.metrics.SignoutReason +- .USER_CLICKED_SIGNOUT_FROM_CLEAR_BROWSING_DATA_PAGE, - new SigninManager.SignOutCallback() { - @Override - public void preWipeData() { @@ -1741,13 +1789,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C - } - }, - forceWipeUserData); -- // TODO(https://crbug.com/1334918): Observe SignInStateObserver and move this inside -- // onSignOutAllowedChanged(). -- deleteSignOutOfChromeTextIfExists(); - }); +- } +- +- /** {@link SigninManager.SignInStateObserver} implementation. */ +- @Override +- public void onSignOutAllowedChanged() { +- updateSignOutOfChromeText(); - } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java +index a5660c00a2c59..0ea1c062b0ac9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java @@ -23,16 +23,12 @@ import org.chromium.base.metrics.RecordUserAction; @@ -1817,6 +1869,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java +index f2f9d3627ad25..744d1132d6717 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java @@ -15,16 +15,8 @@ import androidx.recyclerview.widget.RecyclerView; @@ -1940,9 +1993,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java +index 37971313eb4be..fb7c722eccddb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java -@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid +@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid import org.chromium.chrome.browser.customtabs.dependency_injection.BaseCustomTabActivityComponent; import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController; import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule; @@ -1950,16 +2004,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.flags.AllCachedFieldTrialParameters; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.fonts.FontPreloader; -@@ -150,8 +149,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { +@@ -151,11 +150,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { @Override public void finishNativeInitialization() { -- if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this); +- if (!mIntentDataProvider.isInfoPage()) { +- FirstRunSignInProcessor.openSyncSettingsIfScheduled(this); +- BackupSigninProcessor.start(this); +- } - mConnection.showSignInToastIfNecessary(mSession, getIntent()); new CustomTabTrustedCdnPublisherUrlVisibility( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java +index 5a6ab47c4e220..c0a9a713bdc09 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java @@ -24,7 +24,6 @@ import org.chromium.chrome.browser.init.AsyncInitializationActivity; @@ -1971,6 +2029,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR import org.chromium.components.signin.AccountManagerFacade; import org.chromium.components.signin.AccountManagerFacadeProvider; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java +index 4d25043b908d0..9a00153b73f9b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java @@ -96,9 +96,7 @@ public class LightweightFirstRunActivity @@ -1985,6 +2044,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/Lightw }; mFirstRunFlowSequencer.start(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java +index 5a5859268eddc..d51ee2ab09dfe 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java @@ -126,12 +126,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupport @@ -2001,6 +2061,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAnd public void onShowLoadingUIComplete() { mLoadingSpinnerContainer.setVisibility(View.VISIBLE); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java +index 59df52b3c22bb..27eb327d4317e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java @@ -36,8 +36,6 @@ import org.chromium.chrome.browser.preferences.Pref; @@ -2074,6 +2135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History \ No newline at end of file +} diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +index dad2f4b85ac07..7fa7ba18b359c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java @@ -23,8 +23,6 @@ import org.chromium.chrome.browser.ntp.NewTabPage; @@ -2257,6 +2319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java +index d7d380baff083..2a483d309c41c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -2276,6 +2339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow TraceEvent.end("ChromeBrowserInitializer.startChromeBrowserProcessesSync"); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +index f38b9c54c1dea..1a0d1623b6c6d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java @@ -81,7 +81,6 @@ import org.chromium.chrome.browser.query_tiles.QueryTileUtils; @@ -2316,9 +2380,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni } }); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +index c7be9c57cc71f..79b6ebf4e0f12 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -15,24 +15,11 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager; +@@ -14,24 +14,11 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab; import org.chromium.chrome.browser.profiles.Profile; @@ -2343,7 +2408,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM import org.chromium.url.GURL; import java.util.HashMap; -@@ -42,8 +29,7 @@ import java.util.Map; +@@ -41,8 +28,7 @@ import java.util.Map; /** * Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter. */ @@ -2353,7 +2418,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM /** * Implement this to receive updates when the page contents change. */ -@@ -64,21 +50,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -63,21 +49,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, private final Runnable mShowHistoryManager; private TabModel mTabModel; @@ -2375,7 +2440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM /** * Maps Session IDs to whether that entry was restored split by entry type. These are used to * record historgrams on {@link #destroy()} to measure restore ratio. Cached Session IDs are -@@ -109,12 +89,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -108,12 +88,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null ? sRecentlyClosedTabManagerForTests : new RecentlyClosedBridge(profile, tabModelSelector); @@ -2388,7 +2453,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries); updateRecentlyClosedEntries(); -@@ -123,12 +97,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -122,12 +96,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, updateForeignSessions(); mForeignSessionHelper.triggerSessionSync(); @@ -2401,7 +2466,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened(); } -@@ -166,14 +134,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -165,14 +133,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, recordEntries("Group", mGroupSessionIdsRestored); recordEntries("Bulk", mBulkSessionIdsRestored); @@ -2416,7 +2481,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mFaviconHelper.destroy(); mFaviconHelper = null; -@@ -399,97 +359,13 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -391,97 +351,13 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, mRecentlyClosedTabManager.clearRecentlyClosedEntries(); } @@ -2515,7 +2580,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM } private void onUpdateDone() { -@@ -499,7 +375,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -491,7 +367,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, } private void update() { @@ -2524,9 +2589,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM updateForeignSessions(); onUpdateDone(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java +index d4d86f1d7b873..acfa5fe652077 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java -@@ -31,11 +31,9 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -30,11 +30,9 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow; @@ -2538,7 +2604,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR import org.chromium.components.browser_ui.styles.SemanticColorUtils; import org.chromium.components.browser_ui.widget.RoundedIconGenerator; import org.chromium.components.embedder_support.util.UrlUtilities; -@@ -423,12 +421,11 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { +@@ -422,12 +420,11 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { @Override void setCollapsed(boolean isCollapsed) { @@ -2552,23 +2618,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR } } -@@ -453,14 +450,7 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { +@@ -452,13 +449,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { @Override View getChildView( int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - if (convertView == null) { - LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext()); -- convertView = layoutInflater.inflate( -- R.layout.personalized_signin_promo_view_recent_tabs, parent, false); +- convertView = +- layoutInflater.inflate(R.layout.sync_promo_view_recent_tabs, parent, false); - } - mRecentTabsManager.setUpSyncPromoView( - convertView.findViewById(R.id.signin_promo_view_container)); -- return convertView; -+ return null; + return convertView; } } - -@@ -476,9 +466,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { +@@ -475,9 +465,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { @Override View getChildView( int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { @@ -2578,7 +2642,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR return convertView; } } -@@ -916,22 +903,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { +@@ -913,22 +900,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { addGroup(new ForeignSessionGroup(session)); } @@ -2602,6 +2666,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR int recentlyClosedIndex = mGroups.indexOf(mRecentlyClosedTabsGroup); if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java +index a11b3dc4be9ff..59d85c2dbff0d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java @@ -25,7 +25,6 @@ import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService; @@ -2613,6 +2678,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear import org.chromium.components.externalauth.ExternalAuthUtils; import org.chromium.components.signin.AccountManagerFacadeProvider; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java +index db90edc0b3a42..e5ed12b4b09a7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java @@ -39,9 +39,6 @@ public abstract class RequestGenerator { @@ -2626,6 +2692,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGe /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java +index 376188a02cbe9..5a067708c0a50 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java @@ -128,7 +128,7 @@ public class AccountChooserDialog @@ -2638,6 +2705,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage avatarView.setImageDrawable(avatar); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java +index 6ca6c827c53fb..a7c20b1e00b6f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java @@ -47,7 +47,7 @@ public class AutoSigninSnackbarController implements SnackbarManager.SnackbarCon @@ -2650,6 +2718,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage .setBackgroundColor(backgroundColor) .setProfileImage(icon) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java +index 82ed6bc9903b8..4e707f02b49b0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java @@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplier; @@ -2679,6 +2748,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage @CalledByNative diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +index 2c7b85cf3f3f6..22f27616abd9a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -40,8 +40,6 @@ import org.chromium.chrome.browser.preferences.Pref; @@ -2800,6 +2870,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage return true; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java +index aebfccbd8ed48..4580c5acd0423 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java @@ -45,7 +45,6 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSecti @@ -2829,6 +2900,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/Pay private Callback createUpdateSectionCallback(@DataType final int type) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +index bbb81ffa4dd42..b80e445b054e3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java @@ -29,9 +29,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen @@ -2887,6 +2959,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +index c72bed9714299..d7584e423dc15 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -4,7 +4,6 @@ @@ -2894,10 +2967,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe package org.chromium.chrome.browser.settings; -import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.hasChosenToSyncPasswords; + import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.usesUnifiedPasswordManagerBranding; import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.usesUnifiedPasswordManagerUI; - import android.content.Context; -@@ -39,27 +38,14 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; +@@ -40,27 +39,14 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; @@ -2925,7 +2998,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.text.SpanApplier; -@@ -72,14 +58,10 @@ import java.util.Map; +@@ -73,14 +59,10 @@ import java.util.Map; * The main settings screen, shown when the user first opens Settings. */ public class MainSettings extends PreferenceFragmentCompat @@ -2941,7 +3014,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe public static final String PREF_SEARCH_ENGINE = "search_engine"; public static final String PREF_PASSWORDS = "passwords"; public static final String PREF_HOMEPAGE = "homepage"; -@@ -97,9 +79,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -98,9 +80,6 @@ public class MainSettings extends PreferenceFragmentCompat private final ManagedPreferenceDelegate mManagedPreferenceDelegate; private final Map mAllPreferences = new HashMap<>(); @@ -2951,7 +3024,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe private @Nullable PasswordCheck mPasswordCheck; private ObservableSupplier mModalDialogManagerSupplier; -@@ -137,34 +116,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -138,34 +117,6 @@ public class MainSettings extends PreferenceFragmentCompat if (getActivity().isFinishing() && mPasswordCheck != null) PasswordCheckFactory.destroy(); } @@ -2986,7 +3059,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe @Override public void onResume() { super.onResume(); -@@ -176,8 +127,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -177,8 +128,6 @@ public class MainSettings extends PreferenceFragmentCompat cachePreferences(); @@ -2995,7 +3068,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe updatePasswordsPreference(); if (usesUnifiedPasswordManagerUI()) { -@@ -232,9 +181,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -233,9 +182,6 @@ public class MainSettings extends PreferenceFragmentCompat Preference preference = getPreferenceScreen().getPreference(index); mAllPreferences.put(preference.getKey(), preference); } @@ -3005,7 +3078,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe } private void setManagedPreferenceDelegateForPreference(String key) { -@@ -243,15 +189,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -244,15 +190,6 @@ public class MainSettings extends PreferenceFragmentCompat } private void updatePreferences() { @@ -3021,7 +3094,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe updateSearchEnginePreference(); updatePasswordsPreference(); -@@ -285,41 +222,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -286,41 +223,6 @@ public class MainSettings extends PreferenceFragmentCompat if (preference != null) getPreferenceScreen().removePreference(preference); } @@ -3063,7 +3136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe private void updateSearchEnginePreference() { if (!TemplateUrlServiceFactory.get().isLoaded()) { ChromeBasePreference searchEnginePref = -@@ -356,9 +258,7 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -357,9 +259,7 @@ public class MainSettings extends PreferenceFragmentCompat } private boolean shouldShowNewLabelForPasswordsPreference() { @@ -3074,7 +3147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe } // TODO(crbug.com/1217070): remove this method once UPM feature is rolled out. -@@ -389,37 +289,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -390,37 +290,6 @@ public class MainSettings extends PreferenceFragmentCompat pref.setSummary(isOn ? R.string.text_on : R.string.text_off); } @@ -3112,7 +3185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe // TemplateUrlService.LoadListener implementation. @Override public void onTemplateUrlServiceLoaded() { -@@ -427,12 +296,6 @@ public class MainSettings extends PreferenceFragmentCompat +@@ -428,12 +297,6 @@ public class MainSettings extends PreferenceFragmentCompat updateSearchEnginePreference(); } @@ -3126,6 +3199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() { return mManagedPreferenceDelegate; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +index e7ed0dc2de19b..022dc0eafe21d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java @@ -56,11 +56,7 @@ import org.chromium.chrome.browser.privacy_sandbox.FlocSettingsFragment; @@ -3153,6 +3227,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment, HelpAndFeedbackLauncherImpl.getInstance(), mSettingsLauncher, diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java +index 22d7f6ceb64f1..29d2504bd0dfd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java @@ -19,7 +19,6 @@ import org.chromium.chrome.browser.language.AppLocaleUtils; @@ -3175,9 +3250,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/Crow @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java +index 52d2aca4696f1..1068880ccaa3c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java -@@ -283,7 +283,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { +@@ -275,7 +275,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { .with(MessageBannerProperties.TITLE, resources.getString(R.string.chrome_survey_message_title)) .with(MessageBannerProperties.ICON_RESOURCE_ID, @@ -3186,7 +3262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSu .with(MessageBannerProperties.ICON_TINT_COLOR, MessageBannerProperties.TINT_NONE) .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT, -@@ -360,7 +360,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { +@@ -350,7 +350,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { InfoBarContainer.get(tab).addAnimationListener(this); SurveyInfoBar.showSurveyInfoBar( @@ -3195,7 +3271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSu RecordUserAction.record("Android.Survey.ShowSurveyInfoBar"); } -@@ -373,7 +373,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { +@@ -363,7 +363,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { */ private void showSurvey(String siteId) { SurveyController.getInstance().showSurveyIfAvailable( @@ -3205,6 +3281,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSu /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +index 652295470f088..e1007ef45ae29 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java @@ -83,7 +83,6 @@ import org.chromium.chrome.browser.share.ShareDelegate; @@ -3223,7 +3300,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper; import org.chromium.chrome.browser.vr.VrModuleProvider; -@@ -914,23 +912,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -915,23 +913,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } } @@ -3247,44 +3324,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab @VisibleForTesting public static void setDisableStatusIndicatorAnimationsForTesting(boolean disable) { sDisableStatusIndicatorAnimations = disable; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java -@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar; - import org.chromium.chrome.browser.preferences.SharedPreferencesManager; - import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.segmentation_platform.SegmentationPlatformServiceFactory; --import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; - import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tab.TabLaunchType; - import org.chromium.chrome.browser.tabmodel.TabModelSelector; -@@ -55,7 +54,6 @@ import org.chromium.components.embedder_support.util.UrlUtilities; - import org.chromium.components.segmentation_platform.SegmentSelectionResult; - import org.chromium.components.segmentation_platform.SegmentationPlatformService; - import org.chromium.components.segmentation_platform.proto.SegmentationProto.SegmentId; --import org.chromium.components.signin.identitymanager.ConsentLevel; - import org.chromium.components.user_prefs.UserPrefs; - import org.chromium.content_public.browser.LoadUrlParams; - import org.chromium.content_public.common.ResourceRequestBody; -@@ -549,13 +547,8 @@ public final class ReturnToChromeUtil { - * Caches the status of whether the primary account is synced. - */ - public static void cachePrimaryAccountSyncStatus() { -- boolean isPrimaryAccountSync = -- IdentityServicesProvider.get() -- .getSigninManager(Profile.getLastUsedRegularProfile()) -- .getIdentityManager() -- .hasPrimaryAccount(ConsentLevel.SYNC); - SharedPreferencesManager.getInstance().writeBoolean( -- ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, isPrimaryAccountSync); -+ ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, false); - } - - /** diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn +index 1e9f8ec45fbf9..bd5c999c857e0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2006,7 +2006,6 @@ static_library("browser") { +@@ -2018,7 +2018,6 @@ static_library("browser") { "//chrome/browser/share", "//chrome/browser/sharing:buildflags", "//chrome/browser/sharing/proto", @@ -3292,7 +3336,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/storage_access_api:permissions", "//chrome/browser/thumbnail", "//chrome/browser/touch_to_fill", -@@ -2827,8 +2826,6 @@ static_library("browser") { +@@ -2840,8 +2839,6 @@ static_library("browser") { "android/signin/fre_mobile_identity_consistency_field_trial.h", "android/signin/signin_bridge.cc", "android/signin/signin_bridge.h", @@ -3301,7 +3345,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/signin/signin_metrics_utils.cc", "android/signin/unified_consent_service_bridge.cc", "android/signin/web_signin_bridge.cc", -@@ -3244,8 +3241,6 @@ static_library("browser") { +@@ -3259,8 +3256,6 @@ static_library("browser") { "sharing/sms/sms_fetch_request_handler.h", "shell_integration_android.cc", "signin/identity_services_provider_android.cc", @@ -3310,16 +3354,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ssl/chrome_security_state_client.cc", "ssl/chrome_security_state_client.h", "ssl/chrome_security_state_model_delegate.cc", -@@ -3262,8 +3257,6 @@ static_library("browser") { - "sync/glue/synced_window_delegate_android.h", - "sync/glue/synced_window_delegates_getter_android.cc", - "sync/glue/synced_window_delegates_getter_android.h", -- "sync/sync_error_infobar_delegate_android.cc", -- "sync/sync_error_infobar_delegate_android.h", - "sync/trusted_vault_client_android.cc", - "sync/trusted_vault_client_android.h", - "tab/web_contents_state.cc", -@@ -4598,10 +4591,6 @@ static_library("browser") { +@@ -4619,10 +4614,6 @@ static_library("browser") { "profiles/profile_statistics_factory.h", "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", @@ -3331,6 +3366,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "upgrade_detector/get_installed_version.h", "upgrade_detector/installed_version_monitor.h", diff --git a/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc b/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc +index 21c55be58323c..80345d7f7a4f2 100644 --- a/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc +++ b/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc @@ -5,28 +5,19 @@ @@ -3366,6 +3402,7 @@ diff --git a/chrome/browser/android/signin/fre_mobile_identity_consistency_field } // namespace fre_mobile_identity_consistency_field_trial diff --git a/chrome/browser/commerce/android/BUILD.gn b/chrome/browser/commerce/android/BUILD.gn +index 4d0b4a14f0938..3f8a0949129af 100644 --- a/chrome/browser/commerce/android/BUILD.gn +++ b/chrome/browser/commerce/android/BUILD.gn @@ -22,8 +22,6 @@ android_library("java") { @@ -3378,6 +3415,7 @@ diff --git a/chrome/browser/commerce/android/BUILD.gn b/chrome/browser/commerce/ "//components/browser_ui/settings/android:java", "//components/commerce/core/android:core_java", diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java +index 2d2f01a9c6018..56cd99c136c38 100644 --- a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java +++ b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/PriceNotificationPreferenceFragment.java @@ -20,14 +20,12 @@ import org.chromium.chrome.browser.notifications.channels.ChromeChannelDefinitio @@ -3410,6 +3448,7 @@ diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browse Pref.PRICE_EMAIL_NOTIFICATIONS_ENABLED, this::updateEmailNotificationSwitch); updateEmailNotificationSwitch(); diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java +index 4643199049c70..c2bb40406f546 100644 --- a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java +++ b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java @@ -4,39 +4,22 @@ @@ -3459,6 +3498,7 @@ diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browse \ No newline at end of file +} diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java +index 0627d03bc9828..e1b30f6419af8 100644 --- a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java +++ b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingFeatures.java @@ -81,14 +81,11 @@ public class PriceTrackingFeatures { @@ -3486,6 +3526,7 @@ diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromiu \ No newline at end of file +} diff --git a/chrome/browser/commerce/subscriptions/android/BUILD.gn b/chrome/browser/commerce/subscriptions/android/BUILD.gn +index c89c056797d1d..3c74ec1ef62b0 100644 --- a/chrome/browser/commerce/subscriptions/android/BUILD.gn +++ b/chrome/browser/commerce/subscriptions/android/BUILD.gn @@ -35,7 +35,6 @@ android_library("subscriptions_java") { @@ -3497,6 +3538,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/BUILD.gn b/chrome/bro "//chrome/browser/tabmodel:java", "//components/prefs/android:java", diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java +index 6494924c202cf..ac1a3ae2e9e3c 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsMetrics.java @@ -10,10 +10,8 @@ import androidx.annotation.VisibleForTesting; @@ -3522,6 +3564,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium private boolean isWebAndAppActivityEnabled() { diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java +index b0e750f61e79a..16bf9302a8b6b 100644 --- a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java +++ b/chrome/browser/commerce/subscriptions/android/java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsService.java @@ -14,8 +14,6 @@ import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager; @@ -3569,6 +3612,7 @@ diff --git a/chrome/browser/commerce/subscriptions/android/java/src/org/chromium mActivityLifecycleDispatcher.unregister(mPauseResumeWithNativeObserver); } diff --git a/chrome/browser/commerce/subscriptions/android/java_sources.gni b/chrome/browser/commerce/subscriptions/android/java_sources.gni +index 918429efc16ae..4f67bba616cfe 100644 --- a/chrome/browser/commerce/subscriptions/android/java_sources.gni +++ b/chrome/browser/commerce/subscriptions/android/java_sources.gni @@ -9,5 +9,4 @@ commerce_subscriptions_java_sources = [ "//chrome/browser/commerce/subscriptions @@ -3578,9 +3622,10 @@ diff --git a/chrome/browser/commerce/subscriptions/android/java_sources.gni b/ch - "//chrome/browser/signin/services/android:java", ] diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn +index 64b32b43e93ee..d72ab75941675 100644 --- a/chrome/browser/feed/android/BUILD.gn +++ b/chrome/browser/feed/android/BUILD.gn -@@ -101,7 +101,6 @@ android_library("java") { +@@ -102,7 +102,6 @@ android_library("java") { "//chrome/browser/privacy:java", "//chrome/browser/profiles/android:java", "//chrome/browser/share:java", @@ -3589,9 +3634,10 @@ diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/ "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/native_page:java", diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +index 7b10e5b24a8ba..8ce9fe7ba6a61 100644 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java -@@ -11,9 +11,7 @@ import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator.S +@@ -13,9 +13,7 @@ import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator.S import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; @@ -3599,9 +3645,10 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe import org.chromium.components.prefs.PrefService; -import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.user_prefs.UserPrefs; + import org.chromium.ui.base.DeviceFormFactor; - /** diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java +index c511455a54c2f..5368107460273 100644 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedServiceBridge.java @@ -188,7 +188,7 @@ public final class FeedServiceBridge { @@ -3614,6 +3661,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe /** Observes whether or not the Feed stream contains unread content */ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/android/BUILD.gn +index 4a1055cc3ed1c..4118bfc09fe3a 100644 --- a/chrome/browser/feedback/android/BUILD.gn +++ b/chrome/browser/feedback/android/BUILD.gn @@ -56,7 +56,6 @@ android_library("java") { @@ -3625,6 +3673,7 @@ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/ "//components/signin/public/android:java", "//components/variations/android:variations_java", diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java +index 28fe606bf2827..6cdf44866f394 100644 --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java @@ -20,10 +20,7 @@ import org.chromium.base.ThreadUtils; @@ -3652,6 +3701,7 @@ diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browse // Sanity check in case a source is added to the wrong list. for (FeedbackSource source : mSynchronousSources) { diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java +index 25feeb1c0812a..a32987f39e19f 100644 --- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java +++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java @@ -17,7 +17,7 @@ import java.lang.annotation.RetentionPolicy; @@ -3673,6 +3723,7 @@ diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/brows /** The user clicked on the continue button to continue with sync consent. */ int SYNC_CONSENT_ACCEPTED = 4; diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome/browser/media/router/discovery/access_code/BUILD.gn +index 79bf41d750d3c..d57e44844fc71 100644 --- a/chrome/browser/media/router/discovery/access_code/BUILD.gn +++ b/chrome/browser/media/router/discovery/access_code/BUILD.gn @@ -57,7 +57,6 @@ if (!is_android) { @@ -3682,8 +3733,9 @@ diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome - "//chrome/browser/signin:identity_manager_provider", "//chrome/browser/ui/webui/access_code_cast:mojo_bindings", "//components/access_code_cast/common", - "//components/cast_channel:cast_channel", + "//components/endpoint_fetcher:endpoint_fetcher", diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn +index 7f048afdc8a97..a7508a301d0e0 100644 --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn @@ -97,8 +97,6 @@ android_library("java") { @@ -3705,6 +3757,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//components/browser_ui/settings/android:java", "//components/password_manager/core/browser:password_manager_java_enums", diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java +index d23d61f5a4a68..e8d82ce6ee4b7 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerErrorMessageHelperBridge.java @@ -16,11 +16,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; @@ -3755,9 +3808,10 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } } diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java +index f1c3b48808133..7aced24f9b1c2 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java -@@ -19,7 +19,6 @@ import android.os.SystemClock; +@@ -20,7 +20,6 @@ import android.os.SystemClock; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; @@ -3765,7 +3819,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import com.google.common.base.Optional; import org.chromium.base.Callback; -@@ -32,7 +31,6 @@ import org.chromium.chrome.browser.password_manager.CredentialManagerLauncher.Cr +@@ -33,7 +32,6 @@ import org.chromium.chrome.browser.password_manager.CredentialManagerLauncher.Cr import org.chromium.chrome.browser.password_manager.PasswordCheckupClientHelper.PasswordCheckBackendException; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.Profile; @@ -3773,7 +3827,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.prefs.PrefService; import org.chromium.components.signin.base.CoreAccountInfo; -@@ -138,19 +136,8 @@ public class PasswordManagerHelper { +@@ -139,19 +137,8 @@ public class PasswordManagerHelper { * @param context used to show the UI to manage passwords. */ public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer, @@ -3794,7 +3848,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom Bundle fragmentArgs = new Bundle(); fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer); context.startActivity(settingsLauncher.createSettingsActivityIntent( -@@ -171,13 +158,7 @@ public class PasswordManagerHelper { +@@ -172,13 +159,7 @@ public class PasswordManagerHelper { * @return True if Unified Password Manager can be used, false otherwise. */ public static boolean canUseUpm() { @@ -3809,7 +3863,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } /** -@@ -190,19 +171,7 @@ public class PasswordManagerHelper { +@@ -191,19 +172,7 @@ public class PasswordManagerHelper { * loading dialog. */ public static void showPasswordCheckup(Context context, @PasswordCheckReferrer int referrer, @@ -3829,7 +3883,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } /** -@@ -282,49 +251,6 @@ public class PasswordManagerHelper { +@@ -283,49 +252,6 @@ public class PasswordManagerHelper { }); } @@ -3879,7 +3933,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom public static boolean usesUnifiedPasswordManagerUI() { if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false; @UpmExperimentVariation -@@ -359,53 +285,12 @@ public class PasswordManagerHelper { +@@ -365,53 +291,12 @@ public class PasswordManagerHelper { } public static void launchGmsUpdate(Context context) { @@ -3935,6 +3989,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom @VisibleForTesting diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +index 4b207fe86ed3e..4466f6829ba1b 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java @@ -8,7 +8,6 @@ import com.google.android.gms.common.api.ApiException; @@ -3959,6 +4014,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom /** diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn +index 7c1e5659fe08c..032cb1dc7ba7e 100644 --- a/chrome/browser/privacy/BUILD.gn +++ b/chrome/browser/privacy/BUILD.gn @@ -11,7 +11,6 @@ if (is_android) { @@ -3970,6 +4026,7 @@ diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn sources = [ "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java", diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn +index 0ea925f49550b..84c5af3133ae2 100644 --- a/chrome/browser/privacy_guide/android/BUILD.gn +++ b/chrome/browser/privacy_guide/android/BUILD.gn @@ -21,7 +21,6 @@ android_library("java") { @@ -3989,6 +4046,7 @@ diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/priv "//components/browser_ui/site_settings/android:java", "//components/browser_ui/widget/android:java", diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml +index 833a908edff46..22d0ce917a68c 100644 --- a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml +++ b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml @@ -28,14 +28,6 @@ found in the LICENSE file. @@ -4007,6 +4065,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_ android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java +index e1ddfa55746b9..112855cd7be79 100644 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/MSBBFragment.java @@ -13,7 +13,6 @@ import androidx.appcompat.widget.SwitchCompat; @@ -4032,6 +4091,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b } } diff --git a/chrome/browser/search_resumption/BUILD.gn b/chrome/browser/search_resumption/BUILD.gn +index d8cc04790b800..d39bf8018f2fb 100644 --- a/chrome/browser/search_resumption/BUILD.gn +++ b/chrome/browser/search_resumption/BUILD.gn @@ -27,8 +27,6 @@ android_library("java") { @@ -4053,6 +4113,7 @@ diff --git a/chrome/browser/search_resumption/BUILD.gn b/chrome/browser/search_r "//chrome/browser/ui/android/omnibox:java", "//chrome/test/android:chrome_java_unit_test_support", diff --git a/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleMediator.java b/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleMediator.java +index 419156464725d..977d8ea5080a2 100644 --- a/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleMediator.java +++ b/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleMediator.java @@ -19,10 +19,6 @@ import org.chromium.chrome.browser.profiles.Profile; @@ -4132,6 +4193,7 @@ diff --git a/chrome/browser/search_resumption/java/src/org/chromium/chrome/brows /** diff --git a/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleUtils.java b/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleUtils.java +index a091589f66e6e..32f5c6e1a9acf 100644 --- a/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleUtils.java +++ b/chrome/browser/search_resumption/java/src/org/chromium/chrome/browser/search_resumption/SearchResumptionModuleUtils.java @@ -17,8 +17,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; @@ -4161,6 +4223,7 @@ diff --git a/chrome/browser/search_resumption/java/src/org/chromium/chrome/brows } diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView.java +index 13c82b6cb8189..94d859e2d95db 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView.java @@ -23,7 +23,6 @@ import org.chromium.chrome.R; @@ -4219,6 +4282,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s - } } diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java +index 204b52b649437..7e719b6ec718f 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java @@ -12,16 +12,8 @@ import com.google.common.base.Optional; @@ -4398,6 +4462,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s } } diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc +index b1c0447353c0d..7212a21b65b6f 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -31,9 +31,9 @@ @@ -4421,6 +4486,7 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/ return AccountConsistencyMethod::kDisabled; } diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc +index ed105548ad01b..d514566ff00ef 100644 --- a/chrome/browser/signin/identity_manager_factory.cc +++ b/chrome/browser/signin/identity_manager_factory.cc @@ -67,14 +67,9 @@ IdentityManagerFactory::IdentityManagerFactory() @@ -4439,6 +4505,7 @@ diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/ // static diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrome/browser/signin/identity_services_provider_android.cc +index 3fc963174c75b..e294f2971becf 100644 --- a/chrome/browser/signin/identity_services_provider_android.cc +++ b/chrome/browser/signin/identity_services_provider_android.cc @@ -7,7 +7,6 @@ @@ -4466,6 +4533,7 @@ diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrom - return signin_manager ? signin_manager->GetJavaObject() : nullptr; -} diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java +index a7d32c7a160fe..79aa98f05daf9 100644 --- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java +++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java @@ -61,22 +61,9 @@ public class IdentityServicesProvider { @@ -4492,9 +4560,10 @@ diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome } } diff --git a/chrome/browser/supervised_user/BUILD.gn b/chrome/browser/supervised_user/BUILD.gn +index 1de07e86fea85..489f9eb430272 100644 --- a/chrome/browser/supervised_user/BUILD.gn +++ b/chrome/browser/supervised_user/BUILD.gn -@@ -71,7 +71,6 @@ if (is_android) { +@@ -88,7 +88,6 @@ if (is_android) { "//base:jni_java", "//build/android:build_java", "//chrome/browser/profiles/android:java", @@ -4503,24 +4572,13 @@ diff --git a/chrome/browser/supervised_user/BUILD.gn b/chrome/browser/supervised "//components/browser_ui/bottomsheet/android:java", "//components/browser_ui/widget/android:java", diff --git a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java +index 50880872d6a4d..63ea0bf0e34e4 100644 --- a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java +++ b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java -@@ -5,11 +5,8 @@ - package org.chromium.chrome.browser.supervised_user.website_approval; - - import org.chromium.chrome.browser.profiles.Profile; --import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; - import org.chromium.components.signin.base.AccountInfo; - import org.chromium.components.signin.base.CoreAccountInfo; --import org.chromium.components.signin.identitymanager.ConsentLevel; --import org.chromium.components.signin.identitymanager.IdentityManager; - import org.chromium.ui.modelutil.PropertyModel; - - /** -@@ -31,25 +28,5 @@ class WebsiteApprovalMediator { - v -> mCompletionCallback.onWebsiteApproved()); - mModel.set(WebsiteApprovalProperties.ON_CLICK_DENY, - v -> mCompletionCallback.onWebsiteDenied()); +@@ -43,28 +43,5 @@ class WebsiteApprovalMediator { + BottomSheetController.StateChangeReason.INTERACTION_COMPLETE); + mCompletionCallback.onWebsiteDenied(); + }); - - // Set the child name. We use the given name if there is one for this account, otherwise we - // use the full account email address. @@ -4541,12 +4599,16 @@ diff --git a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome - childNameProperty = childAccountInfo.getGivenName(); - } - mModel.set(WebsiteApprovalProperties.CHILD_NAME, childNameProperty); +- +- // Now show the actual content. +- mBottomSheetController.requestShowContent(mSheetContent, true); } } diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc +index 364548e74ab8a..96d42d4c54b26 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -78,7 +78,7 @@ +@@ -73,7 +73,7 @@ #include "chrome/browser/sync/wifi_configuration_sync_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -4555,7 +4617,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s std::unique_ptr BuildSyncService( content::BrowserContext* context) { -@@ -174,7 +174,7 @@ std::unique_ptr BuildSyncService( +@@ -186,7 +186,7 @@ std::unique_ptr BuildSyncService( return sync_service; } @@ -4564,7 +4626,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s // static SyncServiceFactory* SyncServiceFactory::GetInstance() { -@@ -252,7 +252,7 @@ SyncServiceFactory::~SyncServiceFactory() = default; +@@ -264,7 +264,7 @@ SyncServiceFactory::~SyncServiceFactory() = default; KeyedService* SyncServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { @@ -4573,7 +4635,7 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s } bool SyncServiceFactory::ServiceIsNULLWhileTesting() const { -@@ -294,9 +294,3 @@ SyncServiceFactory::GetAllSyncServices() { +@@ -306,9 +306,3 @@ SyncServiceFactory::GetAllSyncServices() { } return sync_services; } @@ -4584,9 +4646,10 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/s - return base::BindRepeating(&BuildSyncService); -} diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn +index d0fde55a10c64..4c1dfd537f00d 100644 --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn -@@ -159,7 +159,6 @@ android_library("java") { +@@ -163,7 +163,6 @@ android_library("java") { "//chrome/browser/profiles/android:java", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", @@ -4594,7 +4657,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr "//chrome/browser/tab:java", "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/favicon:java", -@@ -446,7 +445,6 @@ robolectric_library("junit") { +@@ -456,7 +455,6 @@ robolectric_library("junit") { "//chrome/browser/profiles/android:java", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", @@ -4603,6 +4666,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/favicon:java", diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +index 9a58a574b2efe..d28925e7527e2 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java @@ -58,7 +58,6 @@ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; @@ -4614,6 +4678,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.theme.ThemeUtils; import org.chromium.chrome.browser.ui.native_page.NativePage; diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java +index 78a7dca81587c..eb3219f53ea1a 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java @@ -13,7 +13,6 @@ import androidx.annotation.MainThread; @@ -4638,6 +4703,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows .with(ModalDialogProperties.CANCEL_ON_TOUCH_OUTSIDE, true) .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java +index f315219b83476..b978ab55b2645 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java @@ -176,9 +176,6 @@ public class ConfirmSyncDataStateMachine @@ -4671,6 +4737,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows private void showProgressDialog() { diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogCoordinator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogCoordinator.java +index cde57efdfe6ed..96f3733f1c851 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogCoordinator.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogCoordinator.java @@ -18,7 +18,6 @@ import androidx.annotation.VisibleForTesting; @@ -4741,9 +4808,10 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows mCheckBox = view.findViewById(R.id.remove_local_data); mCheckBox.setVisibility(getCheckBoxVisibility(managedDomain)); diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +index 4517fd9978bcd..75957c82b58a2 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java -@@ -241,35 +241,8 @@ public abstract class SyncConsentFragmentBase +@@ -266,35 +266,8 @@ public abstract class SyncConsentFragmentBase // this method replaces onSyncAccepted(), the field can be set directly. protected void signinAndEnableSync( String accountName, boolean settingsClicked, Runnable callback) { @@ -4781,7 +4849,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows } @Override -@@ -320,10 +293,6 @@ public abstract class SyncConsentFragmentBase +@@ -347,10 +320,6 @@ public abstract class SyncConsentFragmentBase : ProfileDataCache.createWithDefaultImageSizeAndNoBadge(requireContext()); mProfileDataCache.addObserver(mProfileDataCacheObserver); @@ -4792,7 +4860,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows // By default this is set to true so that when system back button is pressed user action // is recorded in onDestroy(). mRecordUndoSignin = true; -@@ -334,9 +303,6 @@ public abstract class SyncConsentFragmentBase +@@ -361,9 +330,6 @@ public abstract class SyncConsentFragmentBase @Override public void onDestroy() { super.onDestroy(); @@ -4802,7 +4870,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows mProfileDataCache.removeObserver(mProfileDataCacheObserver); if (mConfirmSyncDataStateMachine != null) { mConfirmSyncDataStateMachine.cancel(/* isBeingDestroyed = */ true); -@@ -710,21 +676,6 @@ public abstract class SyncConsentFragmentBase +@@ -737,21 +703,6 @@ public abstract class SyncConsentFragmentBase // Don't start sign-in if this fragment has been destroyed. if (getActivity().isDestroyed()) return; @@ -4825,9 +4893,10 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows @Override diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java +index a90be32b580b4..419dc2fce9b2b 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncPromoController.java -@@ -123,20 +123,7 @@ public class SyncPromoController { +@@ -114,20 +114,7 @@ public class SyncPromoController { * @param accessPoint The access point for which the impression limit is being checked. */ public static boolean canShowSyncPromo(@AccessPoint int accessPoint) { @@ -4848,8 +4917,9 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows + return false; } - /** + private static long getNTPSyncPromoResetAfterMillis() { diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java +index 8ffffbeb79f77..134e7e9044972 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java @@ -28,7 +28,6 @@ public class WebSigninAccountPickerDelegate implements AccountPickerDelegate { @@ -4898,9 +4968,10 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows @Override diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java +index 537121ca5d84b..29468f1d7cf42 100644 --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java -@@ -200,10 +200,8 @@ public class SigninFirstRunMediator +@@ -198,10 +198,8 @@ public class SigninFirstRunMediator mModel.set(SigninFirstRunProperties.FRE_POLICY, frePolicy); } @@ -4913,7 +4984,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows mModel.set(SigninFirstRunProperties.FOOTER_STRING, getFooterString(isMetricsReportingDisabledByPolicy)); -@@ -307,41 +305,6 @@ public class SigninFirstRunMediator +@@ -305,41 +303,6 @@ public class SigninFirstRunMediator TextUtils.equals(mDefaultAccountName, mSelectedAccountName) ? MobileFreProgress.WELCOME_SIGNIN_WITH_DEFAULT_ACCOUNT : MobileFreProgress.WELCOME_SIGNIN_WITH_NON_DEFAULT_ACCOUNT); @@ -4955,7 +5026,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows } /** -@@ -370,26 +333,9 @@ public class SigninFirstRunMediator +@@ -368,26 +331,9 @@ public class SigninFirstRunMediator mDelegate.recordFreProgressHistogram(MobileFreProgress.WELCOME_DISMISS); mDelegate.acceptTermsOfService(mAllowMetricsAndCrashUploading); @@ -4985,6 +5056,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows /** diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd +index c5962561f9907..d0c9963d0c926 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -284,9 +284,6 @@ CHAR_LIMIT guidelines: @@ -5020,9 +5092,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc b/components/password_manager/core/browser/leak_detection_delegate.cc +index fb5eac9291535..013dd53573172 100644 --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc -@@ -64,7 +64,7 @@ void LeakDetectionDelegate::StartLeakCheck( +@@ -63,7 +63,7 @@ void LeakDetectionDelegate::StartLeakCheck( is_likely_signup_form_ = submitted_form_was_likely_signup_form; leak_check_ = leak_factory_->TryCreateLeakCheck( @@ -5032,6 +5105,7 @@ diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc // Reset the helper to avoid notifications from the currently running check. helper_.reset(); diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc +index 39cb192483187..9f33446bfd35d 100644 --- a/components/password_manager/core/browser/password_form_manager.cc +++ b/components/password_manager/core/browser/password_form_manager.cc @@ -41,7 +41,6 @@ @@ -5042,7 +5116,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b #include "google_apis/gaia/core_account_id.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/abseil-cpp/absl/types/variant.h" -@@ -285,27 +284,7 @@ bool PasswordFormManager::WasUnblocklisted() const { +@@ -290,27 +289,7 @@ bool PasswordFormManager::WasUnblocklisted() const { } bool PasswordFormManager::IsMovableToAccountStore() const { @@ -5071,7 +5145,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b } void PasswordFormManager::Save() { -@@ -470,17 +449,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() { +@@ -477,17 +456,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() { void PasswordFormManager::BlockMovingCredentialsToAccountStore() { // Nothing to do if there is no signed in user or the credentials are already // blocked for moving. @@ -5090,6 +5164,7 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b bool PasswordFormManager::IsNewLogin() const { diff --git a/components/password_manager/core/browser/password_manager_client_helper.cc b/components/password_manager/core/browser/password_manager_client_helper.cc +index cdc78222d46ad..fbe1738e9762d 100644 --- a/components/password_manager/core/browser/password_manager_client_helper.cc +++ b/components/password_manager/core/browser/password_manager_client_helper.cc @@ -13,29 +13,10 @@ @@ -5154,6 +5229,7 @@ diff --git a/components/password_manager/core/browser/password_manager_client_he } // namespace password_manager diff --git a/components/password_manager/core/browser/sync_credentials_filter.cc b/components/password_manager/core/browser/sync_credentials_filter.cc +index c02e1ca52ea7c..b8d53126a5c1a 100644 --- a/components/password_manager/core/browser/sync_credentials_filter.cc +++ b/components/password_manager/core/browser/sync_credentials_filter.cc @@ -10,11 +10,7 @@ @@ -5239,6 +5315,7 @@ diff --git a/components/password_manager/core/browser/sync_credentials_filter.cc } // namespace password_manager diff --git a/components/signin/features.gni b/components/signin/features.gni +index 7c0cecc7690f5..29013799417c4 100644 --- a/components/signin/features.gni +++ b/components/signin/features.gni @@ -5,7 +5,7 @@ @@ -5252,6 +5329,7 @@ diff --git a/components/signin/features.gni b/components/signin/features.gni -enable_mirror = is_android || is_chromeos || is_ios +enable_mirror = false diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc +index 1bdb6a0ab74f8..98acadce88644 100644 --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc @@ -14,7 +14,6 @@ @@ -5423,6 +5501,7 @@ diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_se -} -} // namespace signin diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h +index 39e0eb20d02a1..56d8a5ee40e3a 100644 --- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h +++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.h @@ -57,14 +57,6 @@ class ProfileOAuth2TokenServiceDelegateAndroid @@ -5450,6 +5529,7 @@ diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_se std::vector accounts_; diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +index f95f4c5e164cf..11e79536790f7 100644 --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java @@ -130,13 +130,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @@ -5494,6 +5574,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s @Nullable diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java +index 0326ff68cac44..2455fbd49c79d 100644 --- a/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java +++ b/components/signin/public/android/java/src/org/chromium/components/signin/identitymanager/ProfileOAuth2TokenServiceDelegate.java @@ -82,31 +82,6 @@ final class ProfileOAuth2TokenServiceDelegate { @@ -5562,6 +5643,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } } diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java +index 1141bcfc51437..954996621a275 100644 --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java @@ -98,54 +98,8 @@ public class HttpNegotiateAuthenticator { @@ -5667,6 +5749,7 @@ diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.ja } diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java +index db51888cdcb56..da2fb50a0ebb3 100644 --- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java +++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java @@ -93,7 +93,6 @@ public class OAuthTokenFetcher { @@ -5685,5 +5768,6 @@ diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFe } private void fetchImpl(final String expiredToken) { --- -2.25.1 +-- +2.30.2 + diff --git a/build/patches/Switch-to-fstack-protector-strong.patch b/build/patches/Switch-to-fstack-protector-strong.patch index b26ae4ec..a26db06e 100644 --- a/build/patches/Switch-to-fstack-protector-strong.patch +++ b/build/patches/Switch-to-fstack-protector-strong.patch @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -317,18 +317,12 @@ config("compiler") { +@@ -314,18 +314,12 @@ config("compiler") { cflags += [ "-fstack-protector" ] } } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) { diff --git a/build/patches/do-not-add-suffix-to-package-name.patch b/build/patches/do-not-add-suffix-to-package-name.patch index 19985945..7e72146c 100644 --- a/build/patches/do-not-add-suffix-to-package-name.patch +++ b/build/patches/do-not-add-suffix-to-package-name.patch @@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -47,7 +47,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { - } - - _default_package = "org.chromium.chrome" --if (android_channel != "default") { -+if (android_channel != "default" && android_channel != "stable") { - # android-binary-size trybot may checks if an internal Chrome variant's - # AndroidManifest is as expected by ensuring the differences between its - # AndroidManifest and its upstream target's .AndroidManifest.expected file +@@ -54,7 +54,7 @@ if (current_toolchain == default_toolchain) { + _default_package = "org.chromium.chrome" + if (use_stable_package_name_for_trichrome) { + _default_package += ".stable" +- } else if (android_channel != "default") { ++ } else if (android_channel != "default" && android_channel != "stable") { + # android-binary-size trybot may checks if an internal Chrome variant's + # AndroidManifest is as expected by ensuring the differences between its + # AndroidManifest and its upstream target's .AndroidManifest.expected file -- 2.25.1 diff --git a/build/patches/enable-ftrivial-auto-var-init-zero.patch b/build/patches/enable-ftrivial-auto-var-init-zero.patch index b2b7089b..c0973f31 100644 --- a/build/patches/enable-ftrivial-auto-var-init-zero.patch +++ b/build/patches/enable-ftrivial-auto-var-init-zero.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -337,6 +337,10 @@ config("compiler") { +@@ -334,6 +334,10 @@ config("compiler") { cflags += [ "-fwrapv" ] } diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 718c59d4..15845147 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -16,15 +16,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -346,8 +346,6 @@ android_library("chrome_java") { - "$google_play_services_package:google_play_services_gcm_java", - "$google_play_services_package:google_play_services_iid_java", - "$google_play_services_package:google_play_services_tasks_java", -- "$google_play_services_package:google_play_services_vision_common_java", -- "$google_play_services_package:google_play_services_vision_java", - "//base:jni_java", - "//cc:cc_java", - "//chrome/android/features/keyboard_accessory:public_java", +@@ -373,8 +373,6 @@ if (current_toolchain == default_toolchain) { + "$google_play_services_package:google_play_services_gcm_java", + "$google_play_services_package:google_play_services_iid_java", + "$google_play_services_package:google_play_services_tasks_java", +- "$google_play_services_package:google_play_services_vision_common_java", +- "$google_play_services_package:google_play_services_vision_java", + "//base:jni_java", + "//cc:cc_java", + "//chrome/android/features/keyboard_accessory:public_java", diff --git a/components/autofill_assistant/guided_browsing/android/BUILD.gn b/components/autofill_assistant/guided_browsing/android/BUILD.gn --- a/components/autofill_assistant/guided_browsing/android/BUILD.gn +++ b/components/autofill_assistant/guided_browsing/android/BUILD.gn diff --git a/build/ruleset_converter.gn_args b/build/ruleset_converter.gn_args index 184b4f00..5561912a 100644 --- a/build/ruleset_converter.gn_args +++ b/build/ruleset_converter.gn_args @@ -43,5 +43,6 @@ use_gnome_keyring=false use_official_google_api_keys=false use_qt=false use_rtti=false +use_stable_package_name_for_trichrome=false use_sysroot=false webview_includes_weblayer=false