From b7d091858e3defb37f6ff2a2e884166151daa738 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Jun 2022 11:43:06 +0200 Subject: [PATCH] More fixes for linking and removed files --- build/bromite_patches_list.txt | 2 +- .../Add-a-proxy-configuration-page.patch | 4 +- .../Add-an-always-incognito-mode.patch | 20 +- .../Add-bookmark-import-export-actions.patch | 6 +- ...dd-custom-tab-intents-privacy-option.patch | 12 +- build/patches/Add-exit-menu-item.patch | 8 +- ...-to-not-persist-tabs-across-sessions.patch | 10 +- ...ow-building-without-enable_reporting.patch | 18 +- .../Automated-domain-substitution.patch | 15 +- build/patches/Disable-AGSA-by-default.patch | 135 +-- .../Disable-FLoC-and-privacy-sandbox.patch | 8 +- ...media-router-and-remoting-by-default.patch | 2 +- build/patches/Disable-safety-check.patch | 2 +- .../Enable-native-Android-autofill.patch | 29 +- .../Experimental-user-scripts-support.patch | 2 +- ...story-number-of-days-privacy-setting.patch | 18 +- ...nt-settings-back-to-privacy-settings.patch | 12 +- .../Multiple-fingerprinting-mitigations.patch | 2 +- ...uiltin-autocomplete-for-chrome-flags.patch | 2 +- .../Remove-binary-blob-integrations.patch | 443 +--------- .../Remove-contextual-search-manager.patch | 54 +- build/patches/Remove-help-menu-item.patch | 2 +- ...price-shopping-commerce-integrations.patch | 2 +- .../Remove-signin-and-sync-integrations.patch | 803 ++++++++++++++---- 24 files changed, 778 insertions(+), 833 deletions(-) diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index ea0b575f..e7f45760 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -30,7 +30,6 @@ ungoogled-chromium-Disable-Gaia.patch ungoogled-chromium-Disable-Network-Time-Tracker.patch Disable-safe-browsing.patch Disable-all-promo-dialogs.patch -Remove-signin-and-sync-integrations.patch Disable-update-scheduler.patch Add-English-only-search-engine.patch Add-DuckDuckGo-Lite-search-engine.patch @@ -69,6 +68,7 @@ autofill-miscellaneous.patch Enable-native-Android-autofill.patch first_run-deactivate-autoupdate-globally.patch translate-disable-fetching-of-languages-from-server.patch +Remove-signin-and-sync-integrations.patch kill-Vision.patch kill-Location-fall-back-to-system.patch kill-Auth.patch diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index d10e47a6..3964dfe9 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -72,8 +72,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 --- 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 -@@ -57,6 +57,7 @@ public class PrivacySettings - private static final String PREF_DO_NOT_TRACK = "do_not_track"; +@@ -61,6 +61,7 @@ public class PrivacySettings + private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; + private static final String PREF_PROXY_OPTIONS = "proxy"; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 76893845..89de3e76 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -111,7 +111,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -952,6 +953,7 @@ chrome_java_sources = [ +@@ -960,6 +961,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -245,7 +245,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate; import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout; -@@ -1810,8 +1811,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1979,6 +1980,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -643,7 +643,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -82,7 +82,8 @@ public class RecentTabsManager { +@@ -99,7 +99,8 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, */ public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile, Context context, Runnable showHistoryManager) { @@ -821,15 +821,15 @@ new file mode 100644 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; - import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl; +@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl; import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; + import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; +import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -258,6 +259,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -259,6 +260,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -952,7 +952,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore 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 --- 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 -@@ -123,6 +123,8 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -125,6 +125,8 @@ import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.util.TokenHolder; @@ -961,7 +961,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab /** * A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI. -@@ -499,7 +501,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -501,7 +503,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), @@ -1647,7 +1647,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1143,6 +1143,37 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1161,6 +1161,37 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index cb7669fa..2d2c7d6d 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -703,7 +703,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1812,6 +1812,13 @@ static_library("browser") { +@@ -1864,6 +1864,13 @@ static_library("browser") { "webid/federated_identity_sharing_permission_context_factory.h", ] @@ -717,7 +717,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -2957,6 +2964,8 @@ static_library("browser") { +@@ -3024,6 +3031,8 @@ static_library("browser") { "autofill/manual_filling_controller.h", "autofill/manual_filling_controller_impl.cc", "autofill/manual_filling_controller_impl.h", @@ -726,7 +726,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "autofill/manual_filling_utils.cc", "autofill/manual_filling_utils.h", "autofill/manual_filling_view_interface.h", -@@ -3584,8 +3593,6 @@ static_library("browser") { +@@ -3666,8 +3675,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 2543fac7..a7a5c090 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -125,7 +125,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco 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 --- 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 -@@ -81,6 +81,9 @@ public class PrivacySettings +@@ -85,6 +85,9 @@ public class PrivacySettings private ViewGroup mDialogContainer; private BottomSheetController mBottomSheetController; @@ -135,8 +135,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -148,6 +151,9 @@ public class PrivacySettings - updatePreferences(); +@@ -179,6 +182,9 @@ public class PrivacySettings + new SpanApplier.SpanInfo("", "", servicesLink)); } + public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; @@ -145,7 +145,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -164,6 +170,14 @@ public class PrivacySettings +@@ -195,6 +201,14 @@ public class PrivacySettings } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -186,6 +200,16 @@ public class PrivacySettings +@@ -217,6 +231,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -196,7 +196,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4669,6 +4669,21 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 4d00355d..7463499c 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -211,6 +211,8 @@ import java.util.HashSet; +@@ -216,6 +216,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. -@@ -2091,6 +2093,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2471,6 +2472,11 @@ public abstract class ChromeActivity return true; } @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -3407,6 +3407,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Dark theme diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 6e76a555..8653d475 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.MemoryPressureListener; -@@ -1233,8 +1234,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index b0697393..54f15008 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -8,7 +8,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../net/cross_origin_embedder_policy_reporter.cc | 4 +++- .../net/cross_origin_opener_policy_reporter.cc | 16 +++++++--------- content/browser/net/reporting_service_proxy.cc | 3 +++ - .../renderer_host/render_frame_host_impl.cc | 2 ++ + .../renderer_host/render_frame_host_impl.cc | 4 +++- .../web_package/signed_exchange_reporter.cc | 2 ++ ...content_switch_dependent_feature_overrides.cc | 1 + net/reporting/reporting_service.cc | 6 ++++++ @@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../blink/renderer/core/frame/local_frame.h | 6 +++--- .../renderer/core/frame/reporting_context.cc | 9 +++++++++ .../renderer/core/frame/reporting_context.h | 7 +++++-- - 15 files changed, 50 insertions(+), 18 deletions(-) + 15 files changed, 51 insertions(+), 19 deletions(-) diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc @@ -175,14 +175,16 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::TakeNewDocumentPropertiesFromNavigation( - early_hints_manager_ = navigation_request->TakeEarlyHintsManager(); +@@ -11500,7 +11500,8 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( - // Only take some properties if this is not the synchronous initial + void RenderFrameHostImpl::MaybeGenerateCrashReport( + base::TerminationStatus status, +- int exit_code) { ++ int exit_code) { // disabled in Bromite +#if BUILDFLAG(ENABLE_REPORTING) - // `about:blank` navigation, because the values set at construction time - // should remain unmodified. - if (!navigation_request->IsWaitingToCommit()) { + // TODO(1301987): Remove this once the investigation is done. + VLOG(0) << "RenderFrameHostImpl::MaybeGenerateCrashReport url = " + << last_committed_url_ << ", status = " << status @@ -11555,6 +11556,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( /*type=*/"crash", /*group=*/"default", last_committed_url_, GetReportingSource(), isolation_info_.network_isolation_key(), diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 24407ef0..e53ccf81 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -539,7 +539,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/payments/payments_service_url.cc | 10 +- ...roid_chrome_autofill_assistant_strings.grd | 2 +- .../autofill_assistant_onboarding_fetcher.cc | 2 +- - .../browser/headless/client_headless.cc | 2 +- .../browser/service/server_url_fetcher.cc | 2 +- .../safe_browsing_triggered_popup_blocker.h | 4 +- .../core/breadcrumb_manager_tab_helper.cc | 2 +- @@ -1729,7 +1728,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1725 files changed, 5259 insertions(+), 5259 deletions(-) + 1724 files changed, 5258 insertions(+), 5258 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -12889,18 +12888,6 @@ diff --git a/components/autofill_assistant/browser/autofill_assistant_onboarding constexpr int kMaxDownloadSizeInBytes = 10 * 1024; -diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc ---- a/components/autofill_assistant/browser/headless/client_headless.cc -+++ b/components/autofill_assistant/browser/headless/client_headless.cc -@@ -37,7 +37,7 @@ - - namespace autofill_assistant { - --const char kOAuth2Scope[] = "https://www.googleapis.com/auth/userinfo.profile"; -+const char kOAuth2Scope[] = "https://www.9oo91eapis.qjz9zk/auth/userinfo.profile"; - const char kConsumerName[] = "autofill_assistant"; - - ClientHeadless::ClientHeadless( diff --git a/components/autofill_assistant/browser/service/server_url_fetcher.cc b/components/autofill_assistant/browser/service/server_url_fetcher.cc --- a/components/autofill_assistant/browser/service/server_url_fetcher.cc +++ b/components/autofill_assistant/browser/service/server_url_fetcher.cc diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index 23746de9..b8204d65 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -5,20 +5,19 @@ Subject: Disable AGSA by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/BUILD.gn | 3 -- - .../org/chromium/chrome/browser/AppHooks.java | 9 ---- - .../chrome/browser/IntentHandler.java | 5 -- - .../chrome/browser/app/ChromeActivity.java | 28 ---------- - .../ChromeContextMenuPopulator.java | 7 --- - ...stomTabActivityClientConnectionKeeper.java | 9 ---- - .../init/ProcessInitializationHandler.java | 8 --- + .../org/chromium/chrome/browser/AppHooks.java | 9 ------ + .../chrome/browser/IntentHandler.java | 5 ---- + .../chrome/browser/app/ChromeActivity.java | 28 ------------------- + .../ChromeContextMenuPopulator.java | 7 ----- + ...stomTabActivityClientConnectionKeeper.java | 9 ------ + .../init/ProcessInitializationHandler.java | 8 ------ .../browser/ntp/search/SearchBoxMediator.java | 1 - - .../chrome/browser/share/LensUtils.java | 12 +---- + .../chrome/browser/share/LensUtils.java | 12 +------- .../flags/android/chrome_feature_list.cc | 2 +- .../browser/flags/CachedFeatureFlags.java | 2 +- - chrome/browser/ui/android/omnibox/BUILD.gn | 2 - + chrome/browser/ui/android/omnibox/BUILD.gn | 2 -- .../browser/omnibox/LocationBarMediator.java | 1 - - .../voice/AssistantVoiceSearchService.java | 53 +------------------ - 14 files changed, 5 insertions(+), 137 deletions(-) + 13 files changed, 3 insertions(+), 86 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -337,121 +336,5 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.lens.LensController; import org.chromium.chrome.browser.lens.LensEntryPoint; import org.chromium.chrome.browser.lens.LensIntentParams; -diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java ---- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java -+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java -@@ -24,7 +24,6 @@ import org.chromium.base.SysUtils; - import org.chromium.base.metrics.RecordHistogram; - import org.chromium.base.task.AsyncTask; - import org.chromium.chrome.browser.flags.ChromeFeatureList; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.omnibox.R; - import org.chromium.chrome.browser.preferences.SharedPreferencesManager; - import org.chromium.chrome.browser.profiles.Profile; -@@ -109,7 +108,6 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - private final Context mContext; - private final ExternalAuthUtils mExternalAuthUtils; - private final TemplateUrlService mTemplateUrlService; -- private final GSAState mGsaState; - private final SharedPreferencesManager mSharedPrefsManager; - private final IdentityManager mIdentityManager; - private final AccountManagerFacade mAccountManagerFacade; -@@ -123,14 +121,13 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - - public AssistantVoiceSearchService(@NonNull Context context, - @NonNull ExternalAuthUtils externalAuthUtils, -- @NonNull TemplateUrlService templateUrlService, @NonNull GSAState gsaState, -+ @NonNull TemplateUrlService templateUrlService, - @Nullable Observer observer, @NonNull SharedPreferencesManager sharedPrefsManager, - @NonNull IdentityManager identityManager, - @NonNull AccountManagerFacade accountManagerFacade) { - mContext = context; - mExternalAuthUtils = externalAuthUtils; - mTemplateUrlService = templateUrlService; -- mGsaState = gsaState; - mSharedPrefsManager = sharedPrefsManager; - mObserver = observer; - mIdentityManager = identityManager; -@@ -266,31 +263,11 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - boolean returnImmediately, List outList) { - assert returnImmediately || outList != null; - -- if (!mGsaState.isGsaInstalled()) { -- if (returnImmediately) return false; -- outList.add(EligibilityFailureReason.AGSA_NOT_INSTALLED); -- } -- -- if (!mGsaState.canAgsaHandleIntent(getAssistantVoiceSearchIntent())) { -- if (returnImmediately) return false; -- outList.add(EligibilityFailureReason.AGSA_CANT_HANDLE_INTENT); -- } -- -- if (mGsaState.isAgsaVersionBelowMinimum( -- mGsaState.getAgsaVersionName(), getAgsaMinVersion())) { -- if (returnImmediately) return false; -- outList.add(EligibilityFailureReason.AGSA_VERSION_BELOW_MINIMUM); -- } -- - // AGSA will throw an exception if Chrome isn't Google signed. - if (!mExternalAuthUtils.isChromeGoogleSigned()) { - if (returnImmediately) return false; - outList.add(EligibilityFailureReason.CHROME_NOT_GOOGLE_SIGNED); - } -- if (!mExternalAuthUtils.isGoogleSigned(GSAState.PACKAGE_NAME)) { -- if (returnImmediately) return false; -- outList.add(EligibilityFailureReason.AGSA_NOT_GOOGLE_SIGNED); -- } - - if (!mIsDefaultSearchEngineGoogle) { - if (returnImmediately) return false; -@@ -317,13 +294,6 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - return returnImmediately || outList.size() == 0; - } - -- /** @return The Intent for Assistant voice search. */ -- public Intent getAssistantVoiceSearchIntent() { -- Intent intent = new Intent(Intent.ACTION_SEARCH); -- intent.setPackage(GSAState.PACKAGE_NAME); -- return intent; -- } -- - /** Return the current user email or null if no account is present. */ - public @Nullable String getUserEmail() { - CoreAccountInfo info = mIdentityManager.getPrimaryAccountInfo(ConsentLevel.SYNC); -@@ -352,7 +322,7 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - public static void reportStartupUserEligibility(Context context) { - AssistantVoiceSearchService service = - new AssistantVoiceSearchService(context, ExternalAuthUtils.getInstance(), -- TemplateUrlServiceFactory.get(), GSAState.getInstance(context), -+ TemplateUrlServiceFactory.get(), null, - /*observer=*/null, SharedPreferencesManager.getInstance(), - IdentityServicesProvider.get().getIdentityManager( - Profile.getLastUsedRegularProfile()), -@@ -372,25 +342,6 @@ public class AssistantVoiceSearchService implements TemplateUrlService.TemplateU - * eligibility on browser startup. - */ - private void reportUserEligibility(String timingSuffix) { -- List failureReasons = new ArrayList<>(); -- boolean eligible = isDeviceEligibleForAssistant( -- /* returnImmediately= */ false, /* outList */ failureReasons); -- RecordHistogram.recordBooleanHistogram(USER_ELIGIBILITY_HISTOGRAM + timingSuffix, eligible); -- -- // See notes in {@link GSAState#parseAgsaMajorMinorVersionAsInteger} for details about this -- // number. -- Integer versionNumber = -- mGsaState.parseAgsaMajorMinorVersionAsInteger(mGsaState.getAgsaVersionName()); -- if (versionNumber != null) { -- RecordHistogram.recordSparseHistogram( -- AGSA_VERSION_HISTOGRAM + timingSuffix, (int) versionNumber); -- } -- -- for (@EligibilityFailureReason int reason : failureReasons) { -- RecordHistogram.recordEnumeratedHistogram( -- USER_ELIGIBILITY_FAILURE_REASON_HISTOGRAM + timingSuffix, reason, -- EligibilityFailureReason.NUM_ENTRIES); -- } - } - - private void updateColorfulMicState() { -- 2.25.1 diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch index a5446ec5..dd9f1827 100644 --- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch +++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch @@ -38,15 +38,15 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 --- 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 -@@ -61,7 +61,6 @@ public class PrivacySettings - private static final String PREF_SECURE_DNS = "secure_dns"; +@@ -65,7 +65,6 @@ public class PrivacySettings private static final String PREF_DO_NOT_TRACK = "do_not_track"; + private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; - private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private static final String PREF_PROXY_OPTIONS = "proxy"; private static final String PREF_PRIVACY_REVIEW = "privacy_review"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; -@@ -91,21 +90,6 @@ public class PrivacySettings +@@ -95,21 +94,6 @@ public class PrivacySettings SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences); getActivity().setTitle(R.string.prefs_privacy_security); @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting Preference privacyReviewPreference = findPreference(PREF_PRIVACY_REVIEW); if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_REVIEW)) { getPreferenceScreen().removePreference(privacyReviewPreference); -@@ -233,12 +217,6 @@ public class PrivacySettings +@@ -264,12 +248,6 @@ public class PrivacySettings secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext())); } diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index 6a853638..5398d699 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -66,7 +66,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -412,7 +412,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -409,7 +409,7 @@ void ProfileImpl::RegisterProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index f891aff5..13ecbb0a 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3327,7 +3327,6 @@ static_library("browser") { +@@ -3283,7 +3283,6 @@ static_library("browser") { "//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/reading_list/android", "//chrome/browser/safe_browsing/android:safe_browsing_enums", diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index a6c0659d..dca2a90e 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -17,8 +17,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- android_webview/browser/aw_contents.cc | 2 +- chrome/android/BUILD.gn | 1 + - .../settings/PasswordSettings.java | 81 ++++++++++++++++++- - .../chromium/chrome/browser/tab/TabImpl.java | 50 ++++++++++++ + .../settings/PasswordSettings.java | 82 ++++++++++++++++++- + .../chromium/chrome/browser/tab/TabImpl.java | 50 +++++++++++ .../browser/tab/TabViewAndroidDelegate.java | 14 ++++ chrome/browser/BUILD.gn | 8 ++ chrome/browser/android/tab_android.cc | 23 ++++++ @@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/android_autofill_manager.cc | 2 +- .../browser/android_autofill_manager.h | 10 +-- .../browser/content_autofill_driver.cc | 29 +++++++ - .../content/browser/content_autofill_driver.h | 9 ++- + .../content/browser/content_autofill_driver.h | 9 +- .../content_autofill_driver_factory.cc | 7 +- .../browser/content_autofill_driver_factory.h | 1 + .../renderer/password_autofill_agent.cc | 5 +- @@ -37,7 +37,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../autofill/core/common/autofill_prefs.h | 2 + .../embedder_support/view/ContentView.java | 46 +++++++++++ .../chromium/ui/base/ViewAndroidDelegate.java | 8 ++ - 22 files changed, 310 insertions(+), 13 deletions(-) + 22 files changed, 311 insertions(+), 13 deletions(-) diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc --- a/android_webview/browser/aw_contents.cc @@ -54,7 +54,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -459,6 +459,7 @@ android_library("chrome_java") { +@@ -464,6 +464,7 @@ android_library("chrome_java") { "//components/autofill_assistant/android:public_dependencies_java", "//components/autofill_assistant/android:public_java", "//components/autofill_assistant/browser:proto_java", @@ -65,7 +65,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 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 --- 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 -@@ -55,13 +55,18 @@ import java.lang.annotation.Retention; +@@ -57,13 +57,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Locale; @@ -80,12 +80,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage */ public class PasswordSettings extends PreferenceFragmentCompat implements PasswordManagerHandler.PasswordListObserver, -- Preference.OnPreferenceClickListener { -+ Preference.OnPreferenceClickListener, INeedSnackbarManager { +- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener { ++ Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener, ++ INeedSnackbarManager { @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) @Retention(RetentionPolicy.SOURCE) -@@ -90,6 +95,12 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -92,6 +98,12 @@ public class PasswordSettings extends PreferenceFragmentCompat public static final String PASSWORD_EXPORT_EVENT_HISTOGRAM = "PasswordManager.PasswordExport.Event"; @@ -98,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private static final String PREF_KEY_CATEGORY_SAVED_PASSWORDS = "saved_passwords"; private static final String PREF_KEY_CATEGORY_EXCEPTIONS = "exceptions"; private static final String PREF_KEY_SAVED_PASSWORDS_NO_TEXT = "saved_passwords_no_text"; -@@ -119,6 +130,8 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -121,6 +133,8 @@ public class PasswordSettings extends PreferenceFragmentCompat private String mSearchQuery; private Preference mLinkPref; private ChromeSwitchPreference mSavePasswordsSwitch; @@ -107,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private ChromeSwitchPreference mAutoSignInSwitch; private ChromeBasePreference mCheckPasswords; private ChromeBasePreference mTrustedVaultBanner; -@@ -293,6 +306,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -299,6 +313,7 @@ public class PasswordSettings extends PreferenceFragmentCompat } createSavePasswordsSwitch(); @@ -115,7 +116,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage createAutoSignInCheckbox(); if (mPasswordCheck != null) { createCheckPasswords(); -@@ -530,6 +544,71 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -539,6 +554,71 @@ public class PasswordSettings extends PreferenceFragmentCompat getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE)); } @@ -313,7 +314,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2376,6 +2376,14 @@ static_library("browser") { +@@ -2433,6 +2433,14 @@ static_library("browser") { "//ui/web_dialogs", "//ui/webui", ] @@ -393,7 +394,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -602,6 +602,12 @@ CHAR_LIMIT guidelines: +@@ -620,6 +620,12 @@ CHAR_LIMIT guidelines: Save passwords diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 380cee19..3fa2239f 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -327,7 +327,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3468,6 +3468,11 @@ static_library("browser") { +@@ -3424,6 +3424,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index aa0501ba..87efd1c5 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -49,15 +49,15 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 --- 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 -@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; - import org.chromium.chrome.browser.settings.SettingsLauncherImpl; +@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; + import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SpinnerPreference; import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsUtils; -@@ -50,6 +51,9 @@ import androidx.preference.PreferenceCategory; +@@ -53,6 +54,9 @@ import androidx.preference.PreferenceCategory; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -83,6 +87,8 @@ public class PrivacySettings +@@ -87,6 +91,8 @@ public class PrivacySettings private ChromeSwitchPreference allowCustomTabIntentsPref; private ChromeSwitchPreference openExternalLinksPref; @@ -76,9 +76,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -132,6 +138,40 @@ public class PrivacySettings - Preference secureDnsPref = findPreference(PREF_SECURE_DNS); - secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); +@@ -139,6 +145,40 @@ public class PrivacySettings + Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); + syncAndServicesLink.setSummary(buildSyncAndServicesLink()); + // set up history expire days threshold preference + List options = new ArrayList<>(); @@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting updatePreferences(); } -@@ -231,6 +271,29 @@ public class PrivacySettings +@@ -262,6 +302,29 @@ public class PrivacySettings }; } @@ -184,7 +184,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1089,6 +1089,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1107,6 +1107,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index 0998a884..bb822b20 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 --- 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 -@@ -45,6 +45,12 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -48,6 +48,12 @@ import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -63,6 +69,16 @@ public class PrivacySettings +@@ -67,6 +73,16 @@ public class PrivacySettings private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private ManagedPreferenceDelegate mManagedPreferenceDelegate; private IncognitoLockSettings mIncognitoLockSettings; private ViewGroup mDialogContainer; -@@ -112,6 +128,16 @@ public class PrivacySettings +@@ -116,6 +132,16 @@ public class PrivacySettings mManagedPreferenceDelegate = createManagedPreferenceDelegate(); @@ -84,7 +84,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); -@@ -144,6 +170,9 @@ public class PrivacySettings +@@ -175,6 +201,9 @@ public class PrivacySettings } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); @@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -158,7 +187,7 @@ public class PrivacySettings +@@ -189,7 +218,7 @@ public class PrivacySettings * Updates the preferences. */ public void updatePreferences() { @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -445,6 +445,10 @@ CHAR_LIMIT guidelines: +@@ -463,6 +463,10 @@ CHAR_LIMIT guidelines: No statistics or crash reports are sent to Google diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index fcf44ce1..4721fe60 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -57,7 +57,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2303,6 +2303,7 @@ static_library("browser") { +@@ -2360,6 +2360,7 @@ static_library("browser") { "//services/device/public/cpp:device_features", "//services/device/public/cpp/serial:switches", "//services/device/public/cpp/usb", diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch index df9029eb..d78a1c73 100644 --- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch +++ b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -271,6 +271,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() { +@@ -267,6 +267,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() { std::vector ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { std::vector builtins_to_provide; diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 7e911291..b3127696 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -62,9 +62,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/test/android/BUILD.gn | 2 - components/background_task_scheduler/BUILD.gn | 5 - .../internal/BUILD.gn | 10 - - .../BackgroundTaskGcmTaskService.java | 160 ------ ...ackgroundTaskSchedulerFactoryInternal.java | 6 +- - ...kgroundTaskSchedulerGcmNetworkManager.java | 257 --------- .../component_updater/UpdateScheduler.java | 1 - components/externalauth/android/BUILD.gn | 3 - .../externalauth/ExternalAuthUtils.java | 19 +- @@ -111,9 +109,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/android_deps/BUILD.gn | 540 +----------------- .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- - 87 files changed, 83 insertions(+), 2416 deletions(-) - delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java - delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java + 85 files changed, 83 insertions(+), 1999 deletions(-) diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected --- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected @@ -886,7 +882,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta 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 --- 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 -@@ -139,7 +139,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -140,7 +140,6 @@ public class PasswordSettings extends PreferenceFragmentCompat private boolean mSearchRecorded; private Menu mMenu; @@ -894,7 +890,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private @ManagePasswordsReferrer int mManagePasswordsReferrer; /** -@@ -202,7 +201,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -203,7 +202,6 @@ public class PasswordSettings extends PreferenceFragmentCompat @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -902,7 +898,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage computeTrustedVaultBannerState(); } -@@ -308,9 +306,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -309,9 +307,6 @@ public class PasswordSettings extends PreferenceFragmentCompat createSavePasswordsSwitch(); createEnableAndroidAutofillSwitch(); createAutoSignInCheckbox(); @@ -912,7 +908,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) { createTrustedVaultBanner(R.string.android_trusted_vault_banner_sub_label_opted_in, -@@ -485,10 +480,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -486,10 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat // by the system. if (getActivity().isFinishing()) { PasswordManagerHandlerProvider.getInstance().removeObserver(this); @@ -946,7 +942,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -6830,8 +6830,6 @@ static_library("browser") { +@@ -6786,8 +6786,6 @@ static_library("browser") { "offline_pages/offliner_helper.h", "offline_pages/offliner_user_data.cc", "offline_pages/offliner_user_data.h", @@ -1435,171 +1431,6 @@ diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components "//base:base_java_test_support", "//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/BackgroundTaskGcmTaskService.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java -deleted file mode 100644 ---- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java -+++ /dev/null -@@ -1,160 +0,0 @@ --// Copyright 2017 The Chromium Authors. All rights reserved. --// Use of this source code is governed by a BSD-style license that can be --// found in the LICENSE file. -- --package org.chromium.components.background_task_scheduler.internal; -- --import android.os.Build; -- --import androidx.annotation.VisibleForTesting; -- --import com.google.android.gms.gcm.GcmNetworkManager; --import com.google.android.gms.gcm.GcmTaskService; --import com.google.android.gms.gcm.TaskParams; -- --import org.chromium.base.ContextUtils; --import org.chromium.base.Log; --import org.chromium.base.ThreadUtils; --import org.chromium.components.background_task_scheduler.BackgroundTask; --import org.chromium.components.background_task_scheduler.TaskParameters; -- --import java.util.concurrent.CountDownLatch; --import java.util.concurrent.TimeUnit; --import java.util.concurrent.atomic.AtomicBoolean; -- --/** Delegates calls out to various tasks that need to run in the background. */ --public class BackgroundTaskGcmTaskService extends GcmTaskService { -- private static final String TAG = "BkgrdTaskGcmTS"; -- -- private BackgroundTaskSchedulerGcmNetworkManager.Clock mClock = System::currentTimeMillis; -- -- @VisibleForTesting -- void setClockForTesting(BackgroundTaskSchedulerGcmNetworkManager.Clock clock) { -- mClock = clock; -- } -- -- /** Class that waits for the processing to be done. */ -- private static class Waiter { -- // Wakelock is only held for 3 minutes by default for GcmTaskService. -- private static final long MAX_TIMEOUT_SECONDS = 179; -- private final CountDownLatch mLatch; -- private long mWaiterTimeoutSeconds; -- private boolean mIsRescheduleNeeded; -- private boolean mHasTaskTimedOut; -- -- public Waiter(long waiterTimeoutSeconds) { -- mLatch = new CountDownLatch(1); -- mWaiterTimeoutSeconds = Math.min(waiterTimeoutSeconds, MAX_TIMEOUT_SECONDS); -- } -- -- /** Start waiting for the processing to finish. */ -- public void startWaiting() { -- try { -- mHasTaskTimedOut = !mLatch.await(mWaiterTimeoutSeconds, TimeUnit.SECONDS); -- } catch (InterruptedException e) { -- Log.d(TAG, "Waiter interrupted while waiting."); -- } -- } -- -- /** Called to finish waiting. */ -- public void onWaitDone(boolean needsRescheduling) { -- mIsRescheduleNeeded = needsRescheduling; -- mLatch.countDown(); -- } -- -- /** @return Whether last task timed out. */ -- public boolean hasTaskTimedOut() { -- return mHasTaskTimedOut; -- } -- -- /** @return Whether task needs to be rescheduled. */ -- public boolean isRescheduleNeeded() { -- return mIsRescheduleNeeded; -- } -- } -- -- private static class TaskFinishedCallbackGcmTaskService -- implements BackgroundTask.TaskFinishedCallback { -- private final Waiter mWaiter; -- -- public TaskFinishedCallbackGcmTaskService(Waiter waiter) { -- mWaiter = waiter; -- } -- -- @Override -- public void taskFinished(final boolean needsReschedule) { -- ThreadUtils.runOnUiThreadBlocking(new Runnable() { -- @Override -- public void run() { -- mWaiter.onWaitDone(needsReschedule); -- } -- }); -- } -- } -- -- @Override -- public int onRunTask(TaskParams params) { -- final TaskParameters taskParams = -- BackgroundTaskSchedulerGcmNetworkManager.getTaskParametersFromTaskParams(params); -- -- final BackgroundTask backgroundTask = -- BackgroundTaskSchedulerFactoryInternal.getBackgroundTaskFromTaskId( -- taskParams.getTaskId()); -- if (backgroundTask == null) { -- Log.w(TAG, "Failed to start task. Could not instantiate BackgroundTask class."); -- // Cancel task if the BackgroundTask class is not found anymore. We assume this means -- // that the task has been deprecated. -- BackgroundTaskSchedulerFactoryInternal.getScheduler().cancel( -- ContextUtils.getApplicationContext(), taskParams.getTaskId()); -- return GcmNetworkManager.RESULT_FAILURE; -- } -- -- if (BackgroundTaskSchedulerGcmNetworkManager.didTaskExpire( -- params, mClock.currentTimeMillis())) { -- BackgroundTaskSchedulerUma.getInstance().reportTaskExpired(taskParams.getTaskId()); -- return GcmNetworkManager.RESULT_FAILURE; -- } -- -- final Waiter waiter = new Waiter(Waiter.MAX_TIMEOUT_SECONDS); -- -- final AtomicBoolean taskNeedsBackgroundProcessing = new AtomicBoolean(); -- ThreadUtils.runOnUiThreadBlocking(new Runnable() { -- @Override -- public void run() { -- BackgroundTaskSchedulerUma.getInstance().reportTaskStarted(taskParams.getTaskId()); -- taskNeedsBackgroundProcessing.set( -- backgroundTask.onStartTask(ContextUtils.getApplicationContext(), taskParams, -- new TaskFinishedCallbackGcmTaskService(waiter))); -- } -- }); -- -- if (!taskNeedsBackgroundProcessing.get()) return GcmNetworkManager.RESULT_SUCCESS; -- -- waiter.startWaiting(); -- -- if (waiter.isRescheduleNeeded()) return GcmNetworkManager.RESULT_RESCHEDULE; -- if (!waiter.hasTaskTimedOut()) return GcmNetworkManager.RESULT_SUCCESS; -- -- final AtomicBoolean taskNeedsRescheduling = new AtomicBoolean(); -- ThreadUtils.runOnUiThreadBlocking(new Runnable() { -- @Override -- public void run() { -- BackgroundTaskSchedulerUma.getInstance().reportTaskStopped(taskParams.getTaskId()); -- taskNeedsRescheduling.set(backgroundTask.onStopTask( -- ContextUtils.getApplicationContext(), taskParams)); -- } -- }); -- -- if (taskNeedsRescheduling.get()) return GcmNetworkManager.RESULT_RESCHEDULE; -- -- return GcmNetworkManager.RESULT_SUCCESS; -- } -- -- @Override -- public void onInitializeTasks() { -- // Ignore the event on OSs supporting JobScheduler. -- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return; -- BackgroundTaskSchedulerFactoryInternal.getScheduler().reschedule( -- ContextUtils.getApplicationContext()); -- } --} 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 --- 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 @@ -1616,268 +1447,6 @@ diff --git a/components/background_task_scheduler/internal/android/java/src/org/ } /** -diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java -deleted file mode 100644 ---- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java -+++ /dev/null -@@ -1,257 +0,0 @@ --// Copyright 2017 The Chromium Authors. All rights reserved. --// Use of this source code is governed by a BSD-style license that can be --// found in the LICENSE file. -- --package org.chromium.components.background_task_scheduler.internal; -- --import android.content.Context; --import android.os.Bundle; -- --import androidx.annotation.NonNull; --import androidx.annotation.VisibleForTesting; -- --import com.google.android.gms.gcm.GcmNetworkManager; --import com.google.android.gms.gcm.OneoffTask; --import com.google.android.gms.gcm.PeriodicTask; --import com.google.android.gms.gcm.Task; --import com.google.android.gms.gcm.TaskParams; -- --import org.chromium.base.Log; --import org.chromium.base.ThreadUtils; --import org.chromium.components.background_task_scheduler.TaskInfo; --import org.chromium.components.background_task_scheduler.TaskParameters; --import org.chromium.gms.ChromiumPlayServicesAvailability; -- --import java.util.concurrent.TimeUnit; -- --/** -- * An implementation of {@link BackgroundTaskSchedulerDelegate} that uses the Play Services -- * {@link GcmNetworkManager} to schedule jobs. -- */ --class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedulerDelegate { -- private static final String TAG = "BkgrdTaskSchedGcmNM"; -- -- /** Delta time for expiration checks, after the end time. */ -- static final long DEADLINE_DELTA_MS = 1000; -- -- /** Clock to use so we can mock time in tests. */ -- public interface Clock { long currentTimeMillis(); } -- -- private static Clock sClock = System::currentTimeMillis; -- -- @VisibleForTesting -- static void setClockForTesting(Clock clock) { -- sClock = clock; -- } -- -- /** -- * Checks if a task expired, based on the current time of the service. -- * -- * @param taskParams parameters sent to the service, which contain the scheduling information -- * regarding expiration. -- * @param currentTimeMs the current time of the service. -- * @return true if the task expired and false otherwise. -- */ -- static boolean didTaskExpire(TaskParams taskParams, long currentTimeMs) { -- Bundle extras = taskParams.getExtras(); -- if (extras == null || !extras.containsKey(BACKGROUND_TASK_SCHEDULE_TIME_KEY)) { -- return false; -- } -- -- long scheduleTimeMs = extras.getLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY); -- if (extras.containsKey(BACKGROUND_TASK_END_TIME_KEY)) { -- long endTimeMs = -- extras.getLong(BackgroundTaskSchedulerDelegate.BACKGROUND_TASK_END_TIME_KEY); -- return TaskInfo.OneOffInfo.getExpirationStatus( -- scheduleTimeMs, endTimeMs, currentTimeMs); -- } else { -- long intervalTimeMs = extras.getLong(BACKGROUND_TASK_INTERVAL_TIME_KEY); -- -- // If flex is never set, it is given a default value of 10% of the period time, as -- // per the GcmNetworkManager behaviour. This default value is set in -- // https://developers.google.com/android/reference/com/google/android/gms/gcm/PeriodicTask. -- double defaultFlexAsFractionOfInterval = 0.1f; -- -- long flexTimeMs = extras.getLong(BACKGROUND_TASK_FLEX_TIME_KEY, -- /*defaultValue=*/(long) (defaultFlexAsFractionOfInterval * intervalTimeMs)); -- -- return TaskInfo.PeriodicInfo.getExpirationStatus( -- scheduleTimeMs, intervalTimeMs, flexTimeMs, currentTimeMs); -- } -- } -- -- /** -- * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as -- * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other -- * values are stripped at the time when the task is scheduled. -- * -- * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from. -- * @return the {@link TaskParameters} for the current job. -- */ -- static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) { -- int taskId; -- try { -- taskId = Integer.parseInt(taskParams.getTag()); -- } catch (NumberFormatException e) { -- Log.e(TAG, "Cound not parse task ID from task tag: " + taskParams.getTag()); -- return null; -- } -- -- TaskParameters.Builder builder = TaskParameters.create(taskId); -- -- Bundle extras = taskParams.getExtras(); -- Bundle taskExtras = extras.getBundle(BACKGROUND_TASK_EXTRAS_KEY); -- builder.addExtras(taskExtras); -- -- return builder.build(); -- } -- -- @VisibleForTesting -- static Task createTaskFromTaskInfo(@NonNull TaskInfo taskInfo) { -- Bundle taskExtras = new Bundle(); -- taskExtras.putBundle(BACKGROUND_TASK_EXTRAS_KEY, taskInfo.getExtras()); -- -- TaskBuilderVisitor taskBuilderVisitor = new TaskBuilderVisitor(taskExtras); -- taskInfo.getTimingInfo().accept(taskBuilderVisitor); -- Task.Builder builder = taskBuilderVisitor.getBuilder(); -- -- builder.setPersisted(taskInfo.isPersisted()) -- .setRequiredNetwork(getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType( -- taskInfo.getRequiredNetworkType())) -- .setRequiresCharging(taskInfo.requiresCharging()) -- .setService(BackgroundTaskGcmTaskService.class) -- .setTag(taskIdToTaskTag(taskInfo.getTaskId())) -- .setUpdateCurrent(taskInfo.shouldUpdateCurrent()); -- -- return builder.build(); -- } -- -- private static class TaskBuilderVisitor implements TaskInfo.TimingInfoVisitor { -- private Task.Builder mBuilder; -- private final Bundle mTaskExtras; -- -- TaskBuilderVisitor(Bundle taskExtras) { -- mTaskExtras = taskExtras; -- } -- -- // Only valid after a TimingInfo object was visited. -- Task.Builder getBuilder() { -- return mBuilder; -- } -- -- @Override -- public void visit(TaskInfo.OneOffInfo oneOffInfo) { -- if (oneOffInfo.expiresAfterWindowEndTime()) { -- mTaskExtras.putLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY, sClock.currentTimeMillis()); -- mTaskExtras.putLong(BACKGROUND_TASK_END_TIME_KEY, oneOffInfo.getWindowEndTimeMs()); -- } -- -- OneoffTask.Builder builder = new OneoffTask.Builder(); -- long windowStartSeconds = oneOffInfo.hasWindowStartTimeConstraint() -- ? TimeUnit.MILLISECONDS.toSeconds(oneOffInfo.getWindowStartTimeMs()) -- : 0; -- long windowEndTimeMs = oneOffInfo.getWindowEndTimeMs(); -- if (oneOffInfo.expiresAfterWindowEndTime()) { -- windowEndTimeMs += DEADLINE_DELTA_MS; -- } -- builder.setExecutionWindow( -- windowStartSeconds, TimeUnit.MILLISECONDS.toSeconds(windowEndTimeMs)); -- builder.setExtras(mTaskExtras); -- mBuilder = builder; -- } -- -- @Override -- public void visit(TaskInfo.PeriodicInfo periodicInfo) { -- if (periodicInfo.expiresAfterWindowEndTime()) { -- mTaskExtras.putLong(BACKGROUND_TASK_SCHEDULE_TIME_KEY, sClock.currentTimeMillis()); -- mTaskExtras.putLong( -- BACKGROUND_TASK_INTERVAL_TIME_KEY, periodicInfo.getIntervalMs()); -- if (periodicInfo.hasFlex()) { -- mTaskExtras.putLong(BACKGROUND_TASK_FLEX_TIME_KEY, periodicInfo.getFlexMs()); -- } -- } -- -- PeriodicTask.Builder builder = new PeriodicTask.Builder(); -- builder.setPeriod(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getIntervalMs())); -- if (periodicInfo.hasFlex()) { -- builder.setFlex(TimeUnit.MILLISECONDS.toSeconds(periodicInfo.getFlexMs())); -- } -- builder.setExtras(mTaskExtras); -- mBuilder = builder; -- } -- -- @Override -- public void visit(TaskInfo.ExactInfo exactInfo) { -- throw new RuntimeException("Exact tasks should not be scheduled with " -- + "GcmNetworkManager."); -- } -- } -- -- private static int getGcmNetworkManagerNetworkTypeFromTypeFromTaskNetworkType( -- @TaskInfo.NetworkType int networkType) { -- switch (networkType) { -- // This is correct: GcmNM ANY means no network is guaranteed. -- case TaskInfo.NetworkType.NONE: -- return Task.NETWORK_STATE_ANY; -- case TaskInfo.NetworkType.ANY: -- return Task.NETWORK_STATE_CONNECTED; -- case TaskInfo.NetworkType.UNMETERED: -- return Task.NETWORK_STATE_UNMETERED; -- default: -- assert false; -- } -- return Task.NETWORK_STATE_ANY; -- } -- -- @Override -- public boolean schedule(Context context, @NonNull TaskInfo taskInfo) { -- ThreadUtils.assertOnUiThread(); -- -- GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context); -- if (gcmNetworkManager == null) { -- Log.e(TAG, "GcmNetworkManager is not available."); -- return false; -- } -- -- try { -- Task task = createTaskFromTaskInfo(taskInfo); -- gcmNetworkManager.schedule(task); -- } catch (IllegalArgumentException e) { -- String gcmErrorMessage = e.getMessage() == null ? "null." : e.getMessage(); -- Log.e(TAG, -- "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage); -- return false; -- } -- -- return true; -- } -- -- @Override -- public void cancel(Context context, int taskId) { -- ThreadUtils.assertOnUiThread(); -- -- GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context); -- if (gcmNetworkManager == null) { -- Log.e(TAG, "GcmNetworkManager is not available."); -- return; -- } -- -- try { -- gcmNetworkManager.cancelTask( -- taskIdToTaskTag(taskId), BackgroundTaskGcmTaskService.class); -- } catch (IllegalArgumentException e) { -- Log.e(TAG, "GcmNetworkManager failed to cancel task."); -- } -- } -- -- private GcmNetworkManager getGcmNetworkManager(Context context) { -- if (ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(context)) { -- return GcmNetworkManager.getInstance(context); -- } -- return null; -- } -- -- private static String taskIdToTaskTag(int taskId) { -- return Integer.toString(taskId); -- } --} 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 --- 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 diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch index 04d24fe9..f70a8e39 100644 --- a/build/patches/Remove-contextual-search-manager.patch +++ b/build/patches/Remove-contextual-search-manager.patch @@ -94,7 +94,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -488,7 +488,6 @@ android_library("chrome_java") { +@@ -493,7 +493,6 @@ android_library("chrome_java") { "//components/content_capture/android:java", "//components/content_settings/android:content_settings_enums_java", "//components/content_settings/android:java", @@ -102,7 +102,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/crash/android:java", "//components/dom_distiller/content/browser/android:dom_distiller_content_java", "//components/dom_distiller/core/android:dom_distiller_core_java", -@@ -653,10 +652,8 @@ android_library("chrome_java") { +@@ -659,10 +658,8 @@ android_library("chrome_java") { ":chrome_strict_mode_switch", ":resource_id_javagen", ":vr_build_config", @@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome:supervised_user_url_filter_enum_javagen", "//chrome/browser:screenshot_mode_enum", "//chrome/browser:sharing_dialog_type_generated_enum", -@@ -3849,17 +3846,12 @@ generate_jni("chrome_jni_headers") { +@@ -3869,17 +3866,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", @@ -820,7 +820,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 --- a/chrome/android/java/res/xml/google_services_preferences.xml +++ b/chrome/android/java/res/xml/google_services_preferences.xml -@@ -40,8 +40,4 @@ +@@ -45,8 +45,4 @@ android:summary="@string/prefs_autofill_assistant_summary" android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment" app:isPreferenceVisible="false"/> @@ -846,7 +846,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -1649,7 +1649,7 @@ public class ChromeTabbedActivity extends ChromeActivity extends AsyncInitializationActivity @@ -886,7 +886,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv SnackbarManageable, SceneChangeObserver, StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker, MenuOrKeyboardActionController, CompositorViewHolder.Initializer, -@@ -320,8 +317,6 @@ public abstract class ChromeActivity +@@ -327,8 +324,6 @@ public abstract class ChromeActivity new ObservableSupplierImpl<>(); protected final UnownedUserDataSupplier mInsetObserverViewSupplier = new InsetObserverViewSupplier(); @@ -895,7 +895,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private SnackbarManager mSnackbarManager; -@@ -510,7 +505,7 @@ public abstract class ChromeActivity +@@ -517,7 +512,7 @@ public abstract class ChromeActivity // clang-format off return new RootUiCoordinator(this, null, getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier, @@ -904,7 +904,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(), getWindowAndroid(), -@@ -943,14 +938,6 @@ public abstract class ChromeActivity +@@ -950,14 +945,6 @@ public abstract class ChromeActivity mCompositorViewHolderSupplier.get().onNativeLibraryReady( getWindowAndroid(), getTabContentManager()); @@ -919,7 +919,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv TraceEvent.end("ChromeActivity:CompositorInitialization"); } -@@ -1430,11 +1417,6 @@ public abstract class ChromeActivity +@@ -1506,11 +1493,6 @@ public abstract class ChromeActivity @SuppressLint("NewApi") @Override protected final void onDestroy() { @@ -931,7 +931,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv if (mSnackbarManager != null) { SnackbarManagerProvider.detach(mSnackbarManager); } -@@ -2033,13 +2015,6 @@ public abstract class ChromeActivity +@@ -2109,13 +2091,6 @@ public abstract class ChromeActivity return mCompositorViewHolderSupplier.get(); } @@ -945,7 +945,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. -@@ -2082,15 +2057,6 @@ public abstract class ChromeActivity +@@ -2158,15 +2133,6 @@ public abstract class ChromeActivity } mActivityTabProvider.setLayoutStateProvider(layoutManager); @@ -961,7 +961,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv } /** -@@ -2331,18 +2297,6 @@ public abstract class ChromeActivity +@@ -2407,18 +2373,6 @@ public abstract class ChromeActivity return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null; } @@ -1056,7 +1056,7 @@ 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 --- 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 { +@@ -191,12 +191,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { mIntentDataProvider.getSession(), webContents); } @@ -1167,7 +1167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab 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 --- 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 -@@ -47,7 +47,6 @@ import org.chromium.ui.text.SpanApplier; +@@ -50,7 +50,6 @@ import org.chromium.ui.text.SpanApplier; import androidx.annotation.Nullable; import androidx.preference.PreferenceCategory; @@ -1175,7 +1175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; -@@ -72,9 +71,7 @@ public class PrivacySettings +@@ -76,9 +75,7 @@ public class PrivacySettings // moved from SyncAndServicesSettings.java private static final String PREF_SERVICES_CATEGORY = "services_category"; private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions"; @@ -1185,7 +1185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private final SharedPreferencesManager mSharedPreferencesManager = SharedPreferencesManager.getInstance(); private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile()); -@@ -132,12 +129,6 @@ public class PrivacySettings +@@ -136,12 +133,6 @@ public class PrivacySettings mSearchSuggestions.setOnPreferenceChangeListener(this); mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -1228,7 +1228,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator; import org.chromium.chrome.browser.continuous_search.ContinuousSearchContainerCoordinator.HeightObserver; import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils; -@@ -253,7 +252,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -255,7 +254,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier profileSupplier, @NonNull ObservableSupplier bookmarkBridgeSupplier, @@ -1237,7 +1237,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull OneshotSupplier startSurfaceSupplier, @NonNull OneshotSupplier intentMetadataOneshotSupplier, -@@ -286,7 +285,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -288,7 +287,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { OneshotSupplier tabReparentingControllerSupplier, boolean initializeUiWithIncognitoColors) { super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider, @@ -1382,7 +1382,7 @@ 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 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2015,9 +2015,6 @@ static_library("browser") { +@@ -2068,9 +2068,6 @@ static_library("browser") { "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/contextual_search:buildflags", @@ -1392,7 +1392,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/continuous_search/browser", "//components/continuous_search/common/public/mojom", "//components/cookie_config", -@@ -2609,8 +2606,6 @@ static_library("browser") { +@@ -2666,8 +2663,6 @@ static_library("browser") { "android/compositor/decoration_title.h", "android/compositor/layer/content_layer.cc", "android/compositor/layer/content_layer.h", @@ -1401,7 +1401,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", -@@ -2631,8 +2626,6 @@ static_library("browser") { +@@ -2688,8 +2683,6 @@ static_library("browser") { "android/compositor/resources/resource_factory.cc", "android/compositor/resources/toolbar_resource.cc", "android/compositor/resources/toolbar_resource.h", @@ -1410,7 +1410,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/compositor/scene_layer/continuous_search_scene_layer.cc", "android/compositor/scene_layer/continuous_search_scene_layer.h", "android/compositor/scene_layer/overscroll_scene_layer.cc", -@@ -2657,26 +2650,6 @@ static_library("browser") { +@@ -2714,26 +2707,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", @@ -1437,7 +1437,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/cookies/cookies_fetcher_util.cc", "android/customtabs/client_data_header_web_contents_observer.cc", "android/customtabs/client_data_header_web_contents_observer.h", -@@ -3242,8 +3215,6 @@ static_library("browser") { +@@ -3315,8 +3288,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", @@ -1545,7 +1545,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -801,49 +801,6 @@ CHAR_LIMIT guidelines: +@@ -819,49 +819,6 @@ CHAR_LIMIT guidelines: Privacy and security @@ -1595,7 +1595,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro “Do Not Track” -@@ -3914,41 +3871,6 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index fb12d6a3..0ca588f7 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2408,16 +2408,6 @@ public abstract class ChromeActivity +@@ -2484,16 +2484,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch index 4ef9e4ae..291137be 100644 --- a/build/patches/Remove-price-shopping-commerce-integrations.patch +++ b/build/patches/Remove-price-shopping-commerce-integrations.patch @@ -1749,7 +1749,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3292,9 +3292,6 @@ static_library("browser") { +@@ -3248,9 +3248,6 @@ static_library("browser") { "//chrome/browser/commerce/merchant_viewer:merchant_signal_db_content_proto", "//chrome/browser/commerce/merchant_viewer:merchant_viewer_data_manager", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index ae7afbcf..bb5eceed 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -74,29 +74,43 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../SharedClipboardShareActivity.java | 3 - .../tabbed_mode/TabbedRootUiCoordinator.java | 19 -- .../browser/tasks/ReturnToChromeUtil.java | 9 +- - chrome/browser/BUILD.gn | 106 --------- + chrome/browser/BUILD.gn | 150 ------------- + .../chrome_autocomplete_provider_client.cc | 17 +- + .../document_suggestions_service_factory.cc | 6 +- + .../autofill/personal_data_manager_factory.cc | 4 +- + .../common_dependencies_chrome.cc | 13 -- + .../common_dependencies_chrome.h | 3 - + .../chrome_browsing_data_lifetime_manager.cc | 6 +- + .../counters/browsing_data_counter_utils.cc | 6 - + chrome/browser/chrome_browser_field_trials.cc | 6 +- + .../endpoint_fetcher/endpoint_fetcher.cc | 2 +- + ...tory_ui_favicon_request_handler_factory.cc | 1 - chrome/browser/feed/android/BUILD.gn | 1 - .../chrome/browser/feed/FeedFeatures.java | 2 - .../browser/firstrun/MobileFreProgress.java | 4 +- .../router/discovery/access_code/BUILD.gn | 1 - + .../metrics/chrome_metrics_service_client.cc | 6 - .../browser/password_manager/android/BUILD.gn | 6 - .../PasswordManagerHelper.java | 94 +------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - - .../chrome_password_manager_client.cc | 7 - + .../chrome_password_manager_client.cc | 30 +-- .../chrome_password_manager_client.h | 1 - chrome/browser/privacy/BUILD.gn | 2 - .../res/layout/privacy_review_msbb_step.xml | 8 - + chrome/browser/profiles/profile_impl.cc | 15 +- + .../verdict_cache_manager_factory.cc | 5 +- .../DevicePickerBottomSheetContent.java | 46 ---- .../SendTabToSelfCoordinator.java | 104 +-------- - chrome/browser/sync/sync_service_factory.cc | 12 +- .../android/infobars/save_password_infobar.cc | 5 +- .../infobars/update_password_infobar.cc | 6 +- chrome/browser/ui/android/omnibox/BUILD.gn | 2 - .../browser/omnibox/LocationBarMediator.java | 1 - - .../voice/AssistantVoiceSearchService.java | 7 - .../strings/android_chrome_strings.grd | 18 -- .../AssistantStaticDependencies.java | 3 - .../browser/android/dependencies_android.cc | 7 - + .../browser/common_dependencies.h | 3 - + .../browser/headless/client_headless.cc | 17 -- + .../browser/headless/client_headless.h | 1 - .../core/browser/leak_detection_delegate.cc | 2 +- .../core/browser/password_form_manager.cc | 34 +-- .../core/browser/password_manager_client.h | 3 - @@ -106,7 +120,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../signin/SystemAccountManagerDelegate.java | 25 +-- .../net/HttpNegotiateAuthenticator.java | 88 +------- .../chromoting/base/OAuthTokenFetcher.java | 2 - - 87 files changed, 72 insertions(+), 2166 deletions(-) + 101 files changed, 84 insertions(+), 2313 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -151,7 +165,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/site_engagement/content/android:java", "//components/spellcheck/browser/android:java", "//components/strictmode/android:java", -@@ -816,7 +810,6 @@ java_group("chrome_all_java") { +@@ -814,7 +808,6 @@ java_group("chrome_all_java") { group("jni_headers") { public_deps = [ ":chrome_jni_headers", @@ -159,7 +173,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/android/features/keyboard_accessory:jni_headers", "//chrome/android/features/start_surface:jni_headers", "//chrome/browser/android/browserservices/metrics:jni_headers", -@@ -1031,9 +1024,6 @@ junit_binary("chrome_junit_tests") { +@@ -1029,9 +1022,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/safety_check/android:junit", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", @@ -169,7 +183,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/tab:java", "//chrome/browser/tab:junit", "//chrome/browser/tab_group:java", -@@ -1064,8 +1054,6 @@ junit_binary("chrome_junit_tests") { +@@ -1062,8 +1052,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/ui/android/omnibox:junit", "//chrome/browser/ui/android/quickactionsearchwidget:java", "//chrome/browser/ui/android/searchactivityutils:java", @@ -178,7 +192,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/ui/android/theme:java", "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/android/toolbar:junit", -@@ -1134,7 +1122,6 @@ junit_binary("chrome_junit_tests") { +@@ -1132,7 +1120,6 @@ junit_binary("chrome_junit_tests") { "//components/security_state/content/android:java", "//components/security_state/core:security_state_enums_java", "//components/signin/core/browser:signin_enums_java", @@ -186,7 +200,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/signin/public/android:signin_java_test_support", "//components/sync/android:sync_java", "//components/ukm/android:java", -@@ -1453,9 +1440,6 @@ android_library("chrome_test_java") { +@@ -1451,9 +1438,6 @@ android_library("chrome_test_java") { "//chrome/browser/settings:test_support_java", "//chrome/browser/share:java", "//chrome/browser/share/android:java_resources", @@ -196,7 +210,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//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", -@@ -1484,8 +1468,6 @@ android_library("chrome_test_java") { +@@ -1482,8 +1466,6 @@ android_library("chrome_test_java") { "//chrome/browser/ui/android/quickactionsearchwidget:javatests", "//chrome/browser/ui/android/searchactivityutils:java", "//chrome/browser/ui/android/searchactivityutils:javatests", @@ -205,7 +219,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/ui/android/theme:java", "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/android/toolbar:javatests", -@@ -1605,7 +1587,6 @@ android_library("chrome_test_java") { +@@ -1603,7 +1585,6 @@ android_library("chrome_test_java") { "//components/security_state/content/android:java", "//components/security_state/core:security_state_enums_java", "//components/signin/core/browser:signin_enums_java", @@ -213,7 +227,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/signin/public/android:javatests", "//components/signin/public/android:signin_java_test_support", "//components/site_engagement/content/android:java", -@@ -2434,7 +2415,6 @@ android_library("browser_java_test_support") { +@@ -2432,7 +2413,6 @@ android_library("browser_java_test_support") { "//chrome/browser/download/android:java", "//chrome/browser/prefetch/android:java", "//chrome/browser/profiles/android:java", @@ -221,7 +235,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/tab:java", "//components/offline_items_collection/core:core_java", "//components/sync/protocol:protocol_java", -@@ -3931,7 +3911,6 @@ generate_jni("chrome_jni_headers") { +@@ -3924,7 +3904,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", @@ -229,7 +243,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "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", -@@ -3972,9 +3951,6 @@ generate_jni("chrome_jni_headers") { +@@ -3965,9 +3944,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTask.java", "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskScheduler.java", "java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java", @@ -239,7 +253,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/password_manager/Credential.java", "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java", "java/src/org/chromium/chrome/browser/password_manager/PasswordChangeLauncher.java", -@@ -4005,8 +3981,6 @@ generate_jni("chrome_jni_headers") { +@@ -3998,8 +3974,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", @@ -251,7 +265,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -587,7 +587,6 @@ chrome_java_sources = [ +@@ -536,7 +536,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarPhone.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java", @@ -259,7 +273,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java", -@@ -598,14 +597,11 @@ chrome_java_sources = [ +@@ -547,14 +546,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", @@ -274,7 +288,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", -@@ -695,7 +691,6 @@ chrome_java_sources = [ +@@ -644,7 +640,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", @@ -282,7 +296,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_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", -@@ -809,7 +804,6 @@ chrome_java_sources = [ +@@ -758,7 +753,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", @@ -290,7 +304,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", -@@ -873,8 +867,6 @@ chrome_java_sources = [ +@@ -822,8 +816,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelperSupplier.java", "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java", "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java", @@ -299,7 +313,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/password_manager/Credential.java", "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java", "java/src/org/chromium/chrome/browser/password_manager/GooglePasswordManagerUIProvider.java", -@@ -1011,14 +1003,6 @@ chrome_java_sources = [ +@@ -961,14 +953,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", @@ -314,7 +328,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", -@@ -1054,26 +1038,8 @@ chrome_java_sources = [ +@@ -1004,26 +988,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/suggestions/tile/TileRenderer.java", "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java", "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountFeedbackReporter.java", @@ -867,7 +881,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -66,9 +66,7 @@ by a child template that "extends" this file. +@@ -65,9 +65,7 @@ by a child template that "extends" this file. @@ -877,7 +891,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -79,7 +77,6 @@ by a child template that "extends" this file. +@@ -78,7 +76,6 @@ by a child template that "extends" this file. @@ -885,7 +899,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -124,8 +121,6 @@ by a child template that "extends" this file. +@@ -123,8 +120,6 @@ by a child template that "extends" this file. @@ -894,7 +908,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -530,15 +525,6 @@ by a child template that "extends" this file. +@@ -529,15 +524,6 @@ by a child template that "extends" this file. TODO(crbug.com/1093292): investigate why @android:style/Theme.NoDisplay can't be used here. --> @@ -910,7 +924,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% endif %} @@ -995,7 +1009,7 @@ diff --git a/chrome/android/java/res/xml/manage_sync_preferences.xml b/chrome/an diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -50,8 +50,4 @@ +@@ -85,8 +85,4 @@ android:title="@string/cablev2_paask_title" android:summary="@string/cablev2_paask_body" android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/> @@ -1141,7 +1155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -83,7 +83,6 @@ import org.chromium.chrome.browser.download.DownloadUtils; +@@ -85,7 +85,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; @@ -1149,7 +1163,7 @@ 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.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -98,7 +97,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup; +@@ -100,7 +99,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup; import org.chromium.chrome.browser.incognito.IncognitoTabLauncher; import org.chromium.chrome.browser.incognito.IncognitoTabSnapshotController; import org.chromium.chrome.browser.incognito.IncognitoUtils; @@ -1157,7 +1171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutType; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; -@@ -133,9 +131,6 @@ import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification +@@ -135,9 +133,6 @@ import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.suggestions.SuggestionsMetrics; @@ -1167,7 +1181,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAssociatedApp; -@@ -667,9 +662,6 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -312,9 +308,6 @@ public abstract class ChromeActivity private boolean mRemoveWindowBackgroundDone; protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler; @@ -1240,7 +1254,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // The PictureInPictureController is initialized lazily https://crbug.com/729738. private PictureInPictureController mPictureInPictureController; -@@ -1052,61 +1045,6 @@ public abstract class ChromeActivity +@@ -1041,61 +1034,6 @@ public abstract class ChromeActivity return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR; } @@ -1302,7 +1316,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. -@@ -1240,14 +1178,6 @@ public abstract class ChromeActivity +@@ -1229,14 +1167,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); } @@ -1317,7 +1331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv super.onStopWithNative(); } -@@ -1338,11 +1268,6 @@ public abstract class ChromeActivity +@@ -1327,11 +1257,6 @@ public abstract class ChromeActivity .recordUserFontPrefOnStartup(); }); @@ -1329,7 +1343,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; -@@ -1357,7 +1282,6 @@ public abstract class ChromeActivity +@@ -1346,7 +1271,6 @@ public abstract class ChromeActivity GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); } mGSAAccountChangeListener.connect(); @@ -2599,7 +2613,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 +92,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -110,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null ? sRecentlyClosedTabManagerForTests : new RecentlyClosedBridge(profile, tabModelSelector); @@ -2612,7 +2626,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries); updateRecentlyClosedEntries(); -@@ -123,12 +100,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -124,12 +101,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, updateForeignSessions(); mForeignSessionHelper.triggerSessionSync(); @@ -2625,7 +2639,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened(); } -@@ -166,14 +137,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -167,14 +138,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, recordEntries("Group", mGroupSessionIdsRestored); recordEntries("Bulk", mBulkSessionIdsRestored); @@ -2640,7 +2654,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mFaviconHelper.destroy(); mFaviconHelper = null; -@@ -418,80 +381,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -419,80 +382,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, return mPrefs.getSyncPromoCollapsed(); } @@ -2721,7 +2735,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM private void onUpdateDone() { if (mUpdatedCallback != null) { mUpdatedCallback.onUpdated(); -@@ -499,7 +388,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -500,7 +389,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, } private void update() { @@ -2901,16 +2915,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SearchUtils; -@@ -63,7 +61,7 @@ import java.util.Locale; +@@ -68,7 +66,7 @@ import org.chromium.chrome.browser.ApplicationLifetime; */ public class PasswordSettings extends PreferenceFragmentCompat implements PasswordManagerHandler.PasswordListObserver, -- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener { -+ Preference.OnPreferenceClickListener { +- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener, ++ Preference.OnPreferenceClickListener, + INeedSnackbarManager { @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) - @Retention(RetentionPolicy.SOURCE) -@@ -162,10 +160,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -176,10 +174,6 @@ public class PasswordSettings extends PreferenceFragmentCompat setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext())); PasswordManagerHandlerProvider.getInstance().addObserver(this); @@ -2921,7 +2935,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage setHasOptionsMenu(true); // Password Export might be optional but Search is always present. mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState); -@@ -472,9 +466,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -487,9 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat public void onDestroy() { super.onDestroy(); @@ -2931,7 +2945,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage // The component should only be destroyed when the activity has been closed by the user // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed // by the system. -@@ -587,34 +578,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -667,34 +658,6 @@ public class PasswordSettings extends PreferenceFragmentCompat } private void displayManageAccountLink() { @@ -2966,7 +2980,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } private Context getStyledContext() { -@@ -625,43 +588,11 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -705,43 +668,11 @@ public class PasswordSettings extends PreferenceFragmentCompat return UserPrefs.get(Profile.getLastUsedRegularProfile()); } @@ -3041,7 +3055,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/Pay 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 --- 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 -@@ -31,9 +31,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen +@@ -34,9 +34,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; @@ -3050,22 +3064,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; - import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; -@@ -55,7 +52,6 @@ public class PrivacySettings + import org.chromium.components.browser_ui.settings.SpinnerPreference; +@@ -67,7 +64,6 @@ public class PrivacySettings private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; - private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; + private static final String PREF_PROXY_OPTIONS = "proxy"; private static final String PREF_PRIVACY_REVIEW = "privacy_review"; -@@ -126,36 +122,9 @@ public class PrivacySettings +@@ -142,9 +138,6 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); - syncAndServicesLink.setSummary(buildSyncAndServicesLink()); - + // set up history expire days threshold preference + List options = new ArrayList<>(); + options.add(new TimeFrequencySpinnerOption(0, +@@ -182,30 +175,6 @@ public class PrivacySettings updatePreferences(); } @@ -3093,9 +3111,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting - new SpanApplier.SpanInfo("", "", servicesLink)); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - String key = preference.getKey(); + public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; + public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito"; + 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -3326,9 +3344,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; + import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; - import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; -@@ -372,17 +371,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -376,17 +375,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity HelpAndFeedbackLauncherImpl.getInstance()); } if (fragment instanceof SafetyCheckSettingsFragment) { @@ -3375,7 +3393,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_ 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 --- 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 -@@ -79,7 +79,6 @@ import org.chromium.chrome.browser.share.ShareDelegate; +@@ -78,7 +78,6 @@ import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl; import org.chromium.chrome.browser.share.crow.CrowIphController; import org.chromium.chrome.browser.share.link_to_text.LinkToTextIPHController; @@ -3383,7 +3401,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator; import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsService; import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; -@@ -100,7 +99,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; +@@ -99,7 +98,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; import org.chromium.chrome.browser.ui.default_browser_promo.DefaultBrowserPromoUtils; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; @@ -3391,7 +3409,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; -@@ -902,21 +900,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -903,21 +901,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { return isShowingPromo; } */ return false; } @@ -3509,7 +3527,48 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "site_isolation/about_flags.h", "site_isolation/prefs_observer.cc", "site_isolation/prefs_observer.h", -@@ -1986,7 +1934,6 @@ static_library("browser") { +@@ -1734,40 +1682,6 @@ static_library("browser") { + "subresource_filter/subresource_filter_history_observer.h", + "subresource_filter/subresource_filter_profile_context_factory.cc", + "subresource_filter/subresource_filter_profile_context_factory.h", +- "sync/bookmark_sync_service_factory.cc", +- "sync/bookmark_sync_service_factory.h", +- "sync/chrome_sync_client.cc", +- "sync/chrome_sync_client.h", +- "sync/device_info_sync_client_impl.cc", +- "sync/device_info_sync_client_impl.h", +- "sync/device_info_sync_service_factory.cc", +- "sync/device_info_sync_service_factory.h", +- "sync/glue/extensions_activity_monitor.cc", +- "sync/glue/extensions_activity_monitor.h", +- "sync/glue/sync_start_util.cc", +- "sync/glue/sync_start_util.h", +- "sync/model_type_store_service_factory.cc", +- "sync/model_type_store_service_factory.h", +- "sync/send_tab_to_self_sync_service_factory.cc", +- "sync/send_tab_to_self_sync_service_factory.h", +- "sync/session_sync_service_factory.cc", +- "sync/session_sync_service_factory.h", +- "sync/sessions/sync_sessions_router_tab_helper.cc", +- "sync/sessions/sync_sessions_router_tab_helper.h", +- "sync/sessions/sync_sessions_web_contents_router.cc", +- "sync/sessions/sync_sessions_web_contents_router.h", +- "sync/sessions/sync_sessions_web_contents_router_factory.cc", +- "sync/sessions/sync_sessions_web_contents_router_factory.h", +- "sync/sync_encryption_keys_tab_helper.cc", +- "sync/sync_encryption_keys_tab_helper.h", +- "sync/sync_invalidations_service_factory.cc", +- "sync/sync_invalidations_service_factory.h", +- "sync/sync_service_factory.cc", +- "sync/sync_service_factory.h", +- "sync/sync_startup_tracker.cc", +- "sync/sync_startup_tracker.h", +- "sync/user_event_service_factory.cc", +- "sync/user_event_service_factory.h", + "tab_contents/navigation_metrics_recorder.cc", + "tab_contents/navigation_metrics_recorder.h", + "tab_contents/tab_util.cc", +@@ -1993,7 +1907,6 @@ static_library("browser") { "//chrome/browser/share", "//chrome/browser/sharing:buildflags", "//chrome/browser/sharing/proto", @@ -3517,7 +3576,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", -@@ -2261,10 +2208,6 @@ static_library("browser") { +@@ -2265,10 +2178,6 @@ static_library("browser") { "//components/services/unzip/public/mojom", "//components/sessions", "//components/shared_highlighting/core/common", @@ -3528,7 +3587,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/site_engagement/content", "//components/site_engagement/core/mojom:mojo_bindings", "//components/site_isolation", -@@ -2934,16 +2877,6 @@ static_library("browser") { +@@ -2923,16 +2832,6 @@ static_library("browser") { "android/service_tab_launcher.h", "android/shortcut_helper.cc", "android/shortcut_helper.h", @@ -3545,7 +3604,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "android/startup_bridge.cc", "android/startup_bridge.h", "android/survey/http_client_type.cc", -@@ -3210,16 +3143,10 @@ static_library("browser") { +@@ -3201,16 +3100,10 @@ static_library("browser") { "password_check/android/password_check_bridge.h", "password_check/android/password_check_manager.cc", "password_check/android/password_check_manager.h", @@ -3562,7 +3621,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "password_manager/android/credential_android.cc", "password_manager/android/credential_android.h", "password_manager/android/credential_leak_controller_android.cc", -@@ -3325,9 +3252,6 @@ static_library("browser") { +@@ -3314,27 +3207,12 @@ static_library("browser") { "sharing/sms/sms_fetch_request_handler.cc", "sharing/sms/sms_fetch_request_handler.h", "shell_integration_android.cc", @@ -3572,16 +3631,25 @@ 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", -@@ -3342,8 +3266,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", + "ssl/chrome_security_state_model_delegate.h", + "ssl/known_interception_disclosure_infobar.cc", + "ssl/known_interception_disclosure_infobar.h", +- "sync/android/sync_service_android_bridge.cc", +- "sync/android/sync_service_android_bridge.h", +- "sync/glue/synced_tab_delegate_android.cc", +- "sync/glue/synced_tab_delegate_android.h", +- "sync/glue/synced_window_delegate_android.cc", +- "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", +- "sync/trusted_vault_client_android.cc", +- "sync/trusted_vault_client_android.h", "tab/web_contents_state.cc", -@@ -3422,8 +3344,6 @@ static_library("browser") { + "tab/web_contents_state.h", + "touch_to_fill/touch_to_fill_controller.cc", +@@ -3411,8 +3289,6 @@ static_library("browser") { "//chrome/browser/safety_check/android", "//chrome/browser/share/android:jni_headers", "//chrome/browser/share/core/crow:crow_configuration", @@ -3590,7 +3658,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/tab:jni_headers", "//chrome/browser/ui/android/layouts:android", "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings", -@@ -3504,8 +3424,6 @@ static_library("browser") { +@@ -3493,8 +3369,6 @@ static_library("browser") { "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util", "//components/security_state/content/android", "//components/send_tab_to_self", @@ -3599,7 +3667,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/subresource_filter/android", "//components/thin_webview/internal", "//components/translate/content/android", -@@ -4283,12 +4201,6 @@ static_library("browser") { +@@ -4270,12 +4144,6 @@ static_library("browser") { "sharing_hub/sharing_hub_service.h", "sharing_hub/sharing_hub_service_factory.cc", "sharing_hub/sharing_hub_service_factory.h", @@ -3612,7 +3680,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "speech/chrome_speech_recognition_service.cc", "speech/chrome_speech_recognition_service.h", "speech/extension_api/tts_extension_api_constants.cc", # Should be moved -@@ -5111,8 +5023,6 @@ static_library("browser") { +@@ -5098,8 +4966,6 @@ static_library("browser") { "profiles/gaia_info_update_service.h", "profiles/gaia_info_update_service_factory.cc", "profiles/gaia_info_update_service_factory.h", @@ -3621,7 +3689,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn ] if (!is_android && !is_chromeos_lacros) { -@@ -5366,8 +5276,6 @@ static_library("browser") { +@@ -5353,8 +5219,6 @@ static_library("browser") { "notifications/notification_platform_bridge_lacros.cc", "notifications/notification_platform_bridge_lacros.h", "platform_util_lacros.cc", @@ -3630,7 +3698,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "speech/tts_client_factory_lacros.cc", "speech/tts_client_factory_lacros.h", "speech/tts_client_lacros.cc", -@@ -6256,12 +6164,6 @@ static_library("browser") { +@@ -6243,12 +6107,6 @@ static_library("browser") { "profiles/profile_statistics_common.h", "profiles/profile_statistics_factory.cc", "profiles/profile_statistics_factory.h", @@ -3643,7 +3711,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "upgrade_detector/get_installed_version.cc", "upgrade_detector/get_installed_version.h", "upgrade_detector/installed_version_monitor.h", -@@ -7796,10 +7698,6 @@ static_library("test_support") { +@@ -7783,10 +7641,6 @@ static_library("test_support") { "resource_coordinator/tab_load_tracker_test_support.h", "share/fake_share_history.cc", "share/fake_share_history.h", @@ -3654,7 +3722,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ssl/ssl_browsertest_util.cc", "ssl/ssl_browsertest_util.h", "ssl/ssl_client_auth_requestor_mock.cc", -@@ -7845,7 +7743,6 @@ static_library("test_support") { +@@ -7832,7 +7686,6 @@ static_library("test_support") { "//components/security_interstitials/content:security_interstitial_page", "//components/services/unzip/content", "//components/sessions:test_support", @@ -3662,7 +3730,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/subresource_filter/core/browser:test_support", "//components/subresource_filter/core/common:test_support", "//components/sync_preferences:test_support", -@@ -8087,8 +7984,6 @@ if (!is_android) { +@@ -8074,8 +7927,6 @@ if (!is_android) { visibility = [ "//chrome/test:test_support_ui" ] sources = [ @@ -3671,7 +3739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "ui/webui/test_data_source.cc", "ui/webui/test_data_source.h", "ui/webui/web_ui_test_handler.cc", -@@ -8104,7 +7999,6 @@ if (!is_android) { +@@ -8091,7 +7942,6 @@ if (!is_android) { "//chrome/test/data:web_ui_test_bindings", "//components/metrics:test_support", "//components/password_manager/core/browser:test_support", @@ -3679,6 +3747,256 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//components/sync/driver:test_support", "//components/translate/content/common", "//content/test:test_support", +diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc ++++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +@@ -34,7 +34,6 @@ + #include "chrome/browser/profiles/profile_key.h" + #include "chrome/browser/query_tiles/tile_service_factory.h" + #include "chrome/browser/search_engines/template_url_service_factory.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/browser/sync/sync_service_factory.h" + #include "chrome/browser/translate/chrome_translate_client.h" + #include "chrome/browser/ui/browser_command_controller.h" +@@ -55,9 +54,6 @@ + #include "components/omnibox/browser/tab_matcher.h" + #include "components/omnibox/common/omnibox_features.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" +-#include "components/signin/public/identity_manager/identity_manager.h" +-#include "components/sync/driver/sync_service.h" + #include "components/translate/core/browser/translate_manager.h" + #include "components/unified_consent/url_keyed_data_collection_consent_helper.h" + #include "content/public/browser/navigation_entry.h" +@@ -300,11 +296,6 @@ ChromeAutocompleteProviderClient::GetOmniboxTriggeredFeatureService() const { + return omnibox_triggered_feature_service_.get(); + } + +-signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +- const { +- return IdentityManagerFactory::GetForProfile(profile_); +-} +- + bool ChromeAutocompleteProviderClient::IsAlwaysIncognitoEnabled() const { + if (profile_->GetPrefs()->GetBoolean(prefs::kAlwaysIncognitoEnabled)) { + return true; +@@ -330,15 +321,11 @@ bool ChromeAutocompleteProviderClient::IsPersonalizedUrlDataCollectionActive() + } + + bool ChromeAutocompleteProviderClient::IsAuthenticated() const { +- const auto* identity_manager = +- IdentityManagerFactory::GetForProfile(profile_); +- return identity_manager && +- !identity_manager->GetAccountsInCookieJar().signed_in_accounts.empty(); ++ return false; + } + + bool ChromeAutocompleteProviderClient::IsSyncActive() const { +- syncer::SyncService* sync = SyncServiceFactory::GetForProfile(profile_); +- return sync && sync->IsSyncFeatureActive(); ++ return false; + } + + std::string ChromeAutocompleteProviderClient::ProfileUserName() const { +diff --git a/chrome/browser/autocomplete/document_suggestions_service_factory.cc b/chrome/browser/autocomplete/document_suggestions_service_factory.cc +--- a/chrome/browser/autocomplete/document_suggestions_service_factory.cc ++++ b/chrome/browser/autocomplete/document_suggestions_service_factory.cc +@@ -6,7 +6,6 @@ + + #include "base/memory/singleton.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/omnibox/browser/document_suggestions_service.h" + #include "content/public/browser/storage_partition.h" +@@ -29,10 +28,8 @@ KeyedService* DocumentSuggestionsServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* profile = Profile::FromBrowserContext(context); + +- signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile(profile); + return new DocumentSuggestionsService( +- identity_manager, profile->GetDefaultStoragePartition() ++ /* identity_manager */ nullptr, profile->GetDefaultStoragePartition() + ->GetURLLoaderFactoryForBrowserProcess()); + } + +@@ -40,7 +37,6 @@ DocumentSuggestionsServiceFactory::DocumentSuggestionsServiceFactory() + : BrowserContextKeyedServiceFactory( + "DocumentSuggestionsService", + BrowserContextDependencyManager::GetInstance()) { +- DependsOn(IdentityManagerFactory::GetInstance()); + } + + DocumentSuggestionsServiceFactory::~DocumentSuggestionsServiceFactory() {} +diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc +--- a/chrome/browser/autofill/personal_data_manager_factory.cc ++++ b/chrome/browser/autofill/personal_data_manager_factory.cc +@@ -11,7 +11,6 @@ + #include "chrome/browser/history/history_service_factory.h" + #include "chrome/browser/profiles/incognito_helpers.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/browser/web_data_service_factory.h" + #include "components/autofill/core/browser/personal_data_manager.h" + #include "components/autofill/core/browser/strike_database.h" +@@ -60,7 +59,6 @@ PersonalDataManagerFactory::PersonalDataManagerFactory() + : BrowserContextKeyedServiceFactory( + "PersonalDataManager", + BrowserContextDependencyManager::GetInstance()) { +- DependsOn(IdentityManagerFactory::GetInstance()); + DependsOn(HistoryServiceFactory::GetInstance()); + DependsOn(WebDataServiceFactory::GetInstance()); + DependsOn(StrikeDatabaseFactory::GetInstance()); +@@ -86,7 +84,7 @@ KeyedService* PersonalDataManagerFactory::BuildPersonalDataManager( + + service->Init(local_storage, account_storage, profile->GetPrefs(), + g_browser_process->local_state(), +- IdentityManagerFactory::GetForProfile(profile), history_service, ++ nullptr, history_service, + strike_database, image_fetcher, profile->IsOffTheRecord()); + + if (!syncer::IsSyncAllowedByFlag()) +diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc +--- a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc ++++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc +@@ -58,14 +58,7 @@ PasswordManagerClient* CommonDependenciesChrome::GetPasswordManagerClient( + + std::string CommonDependenciesChrome::GetSignedInEmail( + WebContents* web_contents) const { +- signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile( +- Profile::FromBrowserContext(web_contents->GetBrowserContext())); +- if (!identity_manager) { + return std::string(); +- } +- return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync) +- .email; + } + + AnnotateDomModelService* +@@ -78,12 +71,6 @@ bool CommonDependenciesChrome::IsWebLayer() const { + return false; + } + +-signin::IdentityManager* CommonDependenciesChrome::GetIdentityManager( +- content::BrowserContext* browser_context) const { +- return IdentityManagerFactory::GetForProfile( +- Profile::FromBrowserContext(browser_context)); +-} +- + version_info::Channel CommonDependenciesChrome::GetChannel() const { + return chrome::GetChannel(); + } +diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.h b/chrome/browser/autofill_assistant/common_dependencies_chrome.h +--- a/chrome/browser/autofill_assistant/common_dependencies_chrome.h ++++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.h +@@ -44,9 +44,6 @@ class CommonDependenciesChrome : public CommonDependencies { + + bool IsWebLayer() const override; + +- signin::IdentityManager* GetIdentityManager( +- content::BrowserContext* browser_context) const override; +- + version_info::Channel GetChannel() const override; + }; + +diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +--- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc ++++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc +@@ -307,8 +307,7 @@ void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy( + bool keep_browser_alive) { + auto* data_types = profile_->GetPrefs()->GetList( + browsing_data::prefs::kClearBrowsingDataOnExitList); +- if (data_types && !data_types->GetListDeprecated().empty() && +- !SyncServiceFactory::IsSyncAllowed(profile_)) { ++ if (data_types && !data_types->GetListDeprecated().empty()) { + profile_->GetPrefs()->SetBoolean( + browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true); + auto* remover = profile_->GetBrowsingDataRemover(); +@@ -347,9 +346,6 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() { + if (removal_settings.time_to_live_in_hours <= 0) + continue; + +- if (SyncServiceFactory::IsSyncAllowed(profile_)) +- continue; +- + auto deletion_end_time = end_time_for_testing_.value_or( + base::Time::Now() - + base::Hours(removal_settings.time_to_live_in_hours)); +diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc +--- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc ++++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc +@@ -13,12 +13,10 @@ + #include "chrome/browser/browsing_data/counters/signin_data_counter.h" + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/signin/account_consistency_mode_manager.h" +-#include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/common/pref_names.h" + #include "chrome/grit/generated_resources.h" + #include "components/browsing_data/core/pref_names.h" + #include "components/prefs/pref_service.h" +-#include "components/signin/public/identity_manager/identity_manager.h" + #include "components/strings/grit/components_strings.h" + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/text/bytes_formatting.h" +@@ -53,10 +51,6 @@ std::u16string FormatBytesMBOrHigher(ResultInt bytes) { + } // namespace + + bool ShouldShowCookieException(Profile* profile) { +- if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile)) { +- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); +- return identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync); +- } + #if BUILDFLAG(ENABLE_DICE_SUPPORT) + if (AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)) { + return GetSyncStatusMessageType(profile) == SyncStatusMessageType::kSynced; +diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc +--- a/chrome/browser/chrome_browser_field_trials.cc ++++ b/chrome/browser/chrome_browser_field_trials.cc +@@ -101,8 +101,8 @@ void ChromeBrowserFieldTrials::SetUpFeatureControllingFieldTrials( + } + } + +-void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { +-#if BUILDFLAG(IS_ANDROID) ++void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { // disabled in Bromite ++#if 0 + static constexpr char kReachedCodeProfilerTrial[] = + "ReachedCodeProfilerSynthetic2"; + std::string reached_code_profiler_group = +@@ -176,7 +176,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { + kFREMobileIdentityConsistencyVariationsTrial, variation_group); + } + } +-#endif // BUILDFLAG(IS_ANDROID) ++#endif // disabled in Bromite + } + + void ChromeBrowserFieldTrials::InstantiateDynamicTrials() { +diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc +--- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc ++++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc +@@ -57,7 +57,7 @@ EndpointFetcher::EndpointFetcher( + annotation_tag, + profile->GetDefaultStoragePartition() + ->GetURLLoaderFactoryForBrowserProcess(), +- IdentityManagerFactory::GetForProfile(profile)) {} ++ nullptr) {} + + EndpointFetcher::EndpointFetcher( + Profile* const profile, +diff --git a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc +--- a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc ++++ b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc +@@ -46,7 +46,6 @@ HistoryUiFaviconRequestHandlerFactory::HistoryUiFaviconRequestHandlerFactory() + BrowserContextDependencyManager::GetInstance()) { + DependsOn(FaviconServiceFactory::GetInstance()); + DependsOn(LargeIconServiceFactory::GetInstance()); +- DependsOn(SyncServiceFactory::GetInstance()); + } + + HistoryUiFaviconRequestHandlerFactory:: diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn --- a/chrome/browser/feed/android/BUILD.gn +++ b/chrome/browser/feed/android/BUILD.gn @@ -3735,6 +4053,43 @@ diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome "//chrome/browser/ui/webui/access_code_cast:mojo_bindings", "//components/cast_channel:cast_channel", "//components/keyed_service/content:content", +diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc +--- a/chrome/browser/metrics/chrome_metrics_service_client.cc ++++ b/chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -49,7 +49,6 @@ + #include "chrome/browser/metrics/desktop_platform_features_metrics_provider.h" + #include "chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service_factory.h" + #include "chrome/browser/metrics/desktop_session_duration/desktop_session_metrics_provider.h" +-#include "chrome/browser/metrics/family_link_user_metrics_provider.h" + #include "chrome/browser/metrics/https_engagement_metrics_provider.h" + #include "chrome/browser/metrics/metrics_reporting_state.h" + #include "chrome/browser/metrics/network_quality_estimator_provider_impl.h" +@@ -178,7 +177,6 @@ + #endif + + #if !BUILDFLAG(IS_CHROMEOS_ASH) +-#include "chrome/browser/signin/chrome_signin_and_sync_status_metrics_provider.h" + #include "components/metrics/content/accessibility_metrics_provider.h" + #endif // !BUILDFLAG(IS_CHROMEOS_ASH) + +@@ -771,8 +769,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { + std::make_unique(local_state)); + metrics_service_->RegisterMetricsProvider( + std::make_unique()); +- metrics_service_->RegisterMetricsProvider( +- std::make_unique()); + #else + metrics_service_->RegisterMetricsProvider( + std::make_unique(local_state)); +@@ -845,8 +841,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if !BUILDFLAG(IS_CHROMEOS_ASH) +- metrics_service_->RegisterMetricsProvider( +- std::make_unique()); + // ChromeOS uses ChromeOSMetricsProvider for accessibility metrics provider. + metrics_service_->RegisterMetricsProvider( + std::make_unique()); diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn @@ -3971,7 +4326,65 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b #include "components/site_isolation/site_isolation_policy.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" -@@ -961,10 +958,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() { +@@ -126,9 +123,6 @@ + #if BUILDFLAG(IS_ANDROID) + #include "chrome/browser/android/tab_android.h" + #include "chrome/browser/autofill/manual_filling_controller.h" +-#include "chrome/browser/password_manager/android/account_chooser_dialog_android.h" +-#include "chrome/browser/password_manager/android/auto_signin_first_run_dialog_android.h" +-#include "chrome/browser/password_manager/android/auto_signin_prompt_controller.h" + #include "chrome/browser/password_manager/android/credential_leak_controller_android.h" + #include "chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h" + #include "chrome/browser/password_manager/android/password_accessory_controller.h" +@@ -295,10 +289,7 @@ bool ChromePasswordManagerClient::IsFillingFallbackEnabled( + } + + bool ChromePasswordManagerClient::IsAutoSignInEnabled() const { +- PasswordManagerSettingsService* settings_service = +- PasswordManagerSettingsServiceFactory::GetForProfile(profile_); +- return settings_service->IsSettingEnabled( +- PasswordManagerSetting::kAutoSignIn); ++ return false; + } + + bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword( +@@ -426,13 +417,7 @@ bool ChromePasswordManagerClient::PromptUserToChooseCredentials( + &PasswordManagerClientHelper::OnCredentialsChosen, + base::Unretained(&helper_), std::move(callback), local_forms.size() == 1); + #if BUILDFLAG(IS_ANDROID) +- // Deletes itself on the event from Java counterpart, when user interacts with +- // dialog. +- AccountChooserDialogAndroid* acccount_chooser_dialog = +- new AccountChooserDialogAndroid(web_contents(), /*client=*/this, +- std::move(local_forms), origin, +- std::move(intercept)); +- return acccount_chooser_dialog->ShowDialog(); ++ return false; + #else + return PasswordsClientUIDelegateFromWebContents(web_contents()) + ->OnChooseCredentials(std::move(local_forms), origin, +@@ -518,7 +503,7 @@ void ChromePasswordManagerClient::NotifyUserAutoSignin( + DCHECK(!local_forms.empty()); + helper_.NotifyUserAutoSignin(); + #if BUILDFLAG(IS_ANDROID) +- ShowAutoSigninPrompt(web_contents(), local_forms[0]->username_value); ++ // do nothing + #else + PasswordsClientUIDelegateFromWebContents(web_contents()) + ->OnAutoSignin(std::move(local_forms), origin); +@@ -765,10 +750,7 @@ net::CertStatus ChromePasswordManagerClient::GetMainFrameCertStatus() const { + + void ChromePasswordManagerClient::PromptUserToEnableAutosignin() { + #if BUILDFLAG(IS_ANDROID) +- // Dialog is deleted by the Java counterpart after user interacts with it. +- AutoSigninFirstRunDialogAndroid* auto_signin_first_run_dialog = +- new AutoSigninFirstRunDialogAndroid(web_contents()); +- auto_signin_first_run_dialog->ShowDialog(); ++ // do nothing + #else + PasswordsClientUIDelegateFromWebContents(web_contents()) + ->OnPromptEnableAutoSignin(); +@@ -961,10 +943,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() { profile_, ServiceAccessType::EXPLICIT_ACCESS); } @@ -4023,6 +4436,81 @@ diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_revie GetPrimaryAccountInfo(signin::ConsentLevel::kSync) +- .email; +- } +- + return std::string(); + } + +@@ -1501,10 +1491,7 @@ void ProfileImpl::SetCreationTimeForTesting(base::Time creation_time) { + } + + bool ProfileImpl::IsSignedIn() { +- signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile(this); +- return identity_manager && +- identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync); ++ return false; + } + + GURL ProfileImpl::GetHomePage() { +diff --git a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc +--- a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc ++++ b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc +@@ -9,7 +9,6 @@ + #include "chrome/browser/history/history_service_factory.h" + #include "chrome/browser/profiles/incognito_helpers.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/sync/sync_service_factory.h" + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/safe_browsing/core/browser/sync/safe_browsing_sync_observer_impl.h" + #include "components/safe_browsing/core/browser/verdict_cache_manager.h" +@@ -35,7 +34,6 @@ VerdictCacheManagerFactory::VerdictCacheManagerFactory() + BrowserContextDependencyManager::GetInstance()) { + DependsOn(HistoryServiceFactory::GetInstance()); + DependsOn(HostContentSettingsMapFactory::GetInstance()); +- DependsOn(SyncServiceFactory::GetInstance()); + } + + KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor( +@@ -46,8 +44,7 @@ KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor( + ServiceAccessType::EXPLICIT_ACCESS), + HostContentSettingsMapFactory::GetForProfile(profile), + profile->GetPrefs(), +- std::make_unique( +- SyncServiceFactory::GetForProfile(profile))); ++ std::make_unique(nullptr)); + } + + content::BrowserContext* VerdictCacheManagerFactory::GetBrowserContextToUse( diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java @@ -4231,46 +4719,6 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s + return false; } } -diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc ---- a/chrome/browser/sync/sync_service_factory.cc -+++ b/chrome/browser/sync/sync_service_factory.cc -@@ -81,7 +81,7 @@ - #if BUILDFLAG(IS_CHROMEOS_LACROS) - #include "components/signin/public/base/signin_switches.h" - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --namespace { -+/*namespace { - - std::unique_ptr BuildSyncService( - content::BrowserContext* context) { -@@ -182,7 +182,7 @@ std::unique_ptr BuildSyncService( - return sync_service; - } - --} // anonymous namespace -+}*/ // anonymous namespace - - // static - SyncServiceFactory* SyncServiceFactory::GetInstance() { -@@ -260,7 +260,7 @@ SyncServiceFactory::~SyncServiceFactory() = default; - - KeyedService* SyncServiceFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { -- return BuildSyncService(context).release(); -+ return nullptr; - } - - bool SyncServiceFactory::ServiceIsNULLWhileTesting() const { -@@ -302,9 +302,3 @@ SyncServiceFactory::GetAllSyncServices() { - } - return sync_services; - } -- --// static --BrowserContextKeyedServiceFactory::TestingFactory --SyncServiceFactory::GetDefaultFactory() { -- return base::BindRepeating(&BuildSyncService); --} diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.cc b/chrome/browser/ui/android/infobars/save_password_infobar.cc --- a/chrome/browser/ui/android/infobars/save_password_infobar.cc +++ b/chrome/browser/ui/android/infobars/save_password_infobar.cc @@ -4343,27 +4791,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.theme.ThemeUtils; import org.chromium.chrome.browser.ui.native_page.NativePage; -diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java ---- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java -+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java -@@ -34,13 +34,6 @@ import org.chromium.chrome.browser.theme.ThemeUtils; - import org.chromium.chrome.browser.ui.theme.BrandedColorScheme; - import org.chromium.components.externalauth.ExternalAuthUtils; - import org.chromium.components.search_engines.TemplateUrlService; --import org.chromium.components.signin.AccountManagerFacade; --import org.chromium.components.signin.AccountManagerFacadeProvider; --import org.chromium.components.signin.AccountsChangeObserver; --import org.chromium.components.signin.base.CoreAccountInfo; --import org.chromium.components.signin.identitymanager.ConsentLevel; --import org.chromium.components.signin.identitymanager.IdentityManager; --import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; - - import java.lang.annotation.Retention; - import java.lang.annotation.RetentionPolicy; diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -285,9 +285,6 @@ CHAR_LIMIT guidelines: +@@ -306,9 +306,6 @@ CHAR_LIMIT guidelines: Sign in to Chrome @@ -4373,7 +4804,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Sync and personalize across devices -@@ -397,21 +394,6 @@ CHAR_LIMIT guidelines: +@@ -418,21 +415,6 @@ CHAR_LIMIT guidelines: Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account. @@ -4425,6 +4856,78 @@ diff --git a/components/autofill_assistant/browser/android/dependencies_android. ScopedJavaGlobalRef DependenciesAndroid::CreateImageFetcher() const { return ScopedJavaGlobalRef( Java_AssistantStaticDependencies_createImageFetcher( +diff --git a/components/autofill_assistant/browser/common_dependencies.h b/components/autofill_assistant/browser/common_dependencies.h +--- a/components/autofill_assistant/browser/common_dependencies.h ++++ b/components/autofill_assistant/browser/common_dependencies.h +@@ -62,9 +62,6 @@ class CommonDependencies { + + virtual bool IsWebLayer() const = 0; + +- virtual signin::IdentityManager* GetIdentityManager( +- content::BrowserContext* browser_context) const = 0; +- + virtual version_info::Channel GetChannel() const = 0; + }; + +diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc +--- a/components/autofill_assistant/browser/headless/client_headless.cc ++++ b/components/autofill_assistant/browser/headless/client_headless.cc +@@ -19,7 +19,6 @@ + #include "components/autofill_assistant/browser/empty_website_login_manager_impl.h" + #include "components/autofill_assistant/browser/features.h" + #include "components/autofill_assistant/browser/public/ui_state.h" +-#include "components/autofill_assistant/browser/service/access_token_fetcher.h" + #include "components/autofill_assistant/browser/switches.h" + #include "components/autofill_assistant/browser/website_login_manager_impl.h" + #include "components/password_manager/content/browser/password_change_success_tracker_factory.h" +@@ -37,9 +36,6 @@ + + namespace autofill_assistant { + +-const char kOAuth2Scope[] = "https://www.googleapis.com/auth/userinfo.profile"; +-const char kConsumerName[] = "autofill_assistant"; +- + ClientHeadless::ClientHeadless( + content::WebContents* web_contents, + const CommonDependencies* common_dependencies, +@@ -175,14 +171,6 @@ void ClientHeadless::FetchAccessToken( + base::OnceCallback callback) { + DCHECK(!fetch_access_token_callback_); + fetch_access_token_callback_ = std::move(callback); +- auto* identity_manager = common_dependencies_->GetIdentityManager( +- GetWebContents()->GetBrowserContext()); +- access_token_fetcher_ = identity_manager->CreateAccessTokenFetcherForAccount( +- identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync), +- kConsumerName, {kOAuth2Scope}, +- base::BindOnce(&ClientHeadless::OnAccessTokenFetchComplete, +- weak_ptr_factory_.GetWeakPtr()), +- signin::AccessTokenFetcher::Mode::kImmediate); + } + + void ClientHeadless::OnAccessTokenFetchComplete( +@@ -203,11 +191,6 @@ void ClientHeadless::OnAccessTokenFetchComplete( + } + + void ClientHeadless::InvalidateAccessToken(const std::string& access_token) { +- auto* identity_manager = common_dependencies_->GetIdentityManager( +- GetWebContents()->GetBrowserContext()); +- identity_manager->RemoveAccessTokenFromCache( +- identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync), +- {kOAuth2Scope}, access_token); + } + + } // namespace autofill_assistant +diff --git a/components/autofill_assistant/browser/headless/client_headless.h b/components/autofill_assistant/browser/headless/client_headless.h +--- a/components/autofill_assistant/browser/headless/client_headless.h ++++ b/components/autofill_assistant/browser/headless/client_headless.h +@@ -89,7 +89,6 @@ class ClientHeadless : public Client, public AccessTokenFetcher { + std::unique_ptr website_login_manager_; + std::unique_ptr headless_ui_controller_; + raw_ptr identity_manager_ = nullptr; +- std::unique_ptr access_token_fetcher_; + base::OnceCallback + fetch_access_token_callback_; + diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc b/components/password_manager/core/browser/leak_detection_delegate.cc --- a/components/password_manager/core/browser/leak_detection_delegate.cc +++ b/components/password_manager/core/browser/leak_detection_delegate.cc