diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 862962e5..44b544b1 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -2b74f7c8269b43e04063b651ab995b67f56387c2- \ No newline at end of file +1ab0cee259c250b41b2adb8e3a7fabc967f5b762- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index 41fd91b1..6a616ecc 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -103.0.5060.47 \ No newline at end of file +103.0.5060.115 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index 1cc41f32..cce6222f 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -a293a5dd3009f4017a8c4422a69f3eb9b3056776 \ No newline at end of file +3764ccd59b9f1ec1d98138dd253bb0eb08887649 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index e7f45760..ea0b575f 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -30,6 +30,7 @@ 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 @@ -68,7 +69,6 @@ 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 3964dfe9..d10e47a6 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 -@@ -61,6 +61,7 @@ public class PrivacySettings - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; +@@ -57,6 +57,7 @@ public class PrivacySettings + private static final String PREF_DO_NOT_TRACK = "do_not_track"; 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 89de3e76..5897a1bf 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", -@@ -960,6 +961,7 @@ chrome_java_sources = [ +@@ -959,6 +960,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; -@@ -1818,8 +1819,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1903,6 +1904,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -630,7 +630,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; -@@ -243,7 +244,8 @@ public class NativePageFactory { +@@ -251,7 +252,8 @@ public class NativePageFactory { String url, NativePage candidatePage, Tab tab, boolean isIncognito) { NativePage page; @@ -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 -@@ -99,7 +99,8 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -83,7 +83,8 @@ public class RecentTabsManager implements AccountsChangeObserver { */ 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 -@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl; +@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; + 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; -@@ -259,6 +260,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -257,6 +258,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 -@@ -125,6 +125,8 @@ import org.chromium.ui.base.DeviceFormFactor; +@@ -123,6 +123,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. -@@ -501,7 +503,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -499,7 +501,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 -@@ -1161,6 +1161,37 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1143,6 +1143,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 2d2c7d6d..4b0dc69c 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -46,7 +47,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -47,7 +48,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; * {@link ChromeTabbedActivity}. */ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate; private final Supplier mShareDelegateSupplier; private final Supplier mEphemeralTabCoordinatorSupplier; -@@ -72,7 +73,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -74,7 +75,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { private NativePageFactory mNativePageFactory; @@ -655,7 +655,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; -@@ -54,7 +55,7 @@ import org.chromium.ui.util.ColorUtils; +@@ -55,7 +56,7 @@ import org.chromium.ui.util.ColorUtils; * Creates NativePage objects to show chrome-native:// URLs using the native Android view system. */ public class NativePageFactory { @@ -664,7 +664,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final BrowserControlsManager mBrowserControlsManager; private final Supplier mCurrentTabSupplier; -@@ -71,7 +72,7 @@ public class NativePageFactory { +@@ -73,7 +74,7 @@ public class NativePageFactory { private NativePageBuilder mNativePageBuilder; @@ -673,7 +673,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat @NonNull BottomSheetController sheetController, @NonNull BrowserControlsManager browserControlsManager, @NonNull Supplier currentTabSupplier, -@@ -119,7 +120,7 @@ public class NativePageFactory { +@@ -124,7 +125,7 @@ public class NativePageFactory { @VisibleForTesting static class NativePageBuilder { @@ -682,16 +682,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final Supplier mUma; private final BrowserControlsManager mBrowserControlsManager; -@@ -132,7 +133,7 @@ public class NativePageFactory { - private final JankTracker mJankTracker; +@@ -138,7 +139,7 @@ public class NativePageFactory { private final Supplier mToolbarSupplier; + private final CrowButtonDelegate mCrowButtonDelegate; - public NativePageBuilder(Activity activity, Supplier uma, + public NativePageBuilder(ChromeActivity activity, Supplier uma, BottomSheetController sheetController, BrowserControlsManager browserControlsManager, Supplier currentTabSupplier, Supplier snackbarManagerSupplier, -@@ -169,7 +170,7 @@ public class NativePageFactory { +@@ -177,7 +178,7 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { return new BookmarkPage(mActivity.getComponentName(), mSnackbarManagerSupplier.get(), mTabModelSelector.isIncognitoSelected(), @@ -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", -@@ -3024,6 +3031,8 @@ static_library("browser") { +@@ -3021,6 +3028,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", -@@ -3666,8 +3675,6 @@ static_library("browser") { +@@ -3658,8 +3667,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 a7a5c090..2543fac7 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 -@@ -85,6 +85,9 @@ public class PrivacySettings +@@ -81,6 +81,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 = -@@ -179,6 +182,9 @@ public class PrivacySettings - new SpanApplier.SpanInfo("", "", servicesLink)); +@@ -148,6 +151,9 @@ public class PrivacySettings + updatePreferences(); } + 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(); -@@ -195,6 +201,14 @@ public class PrivacySettings +@@ -164,6 +170,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; } -@@ -217,6 +231,16 @@ public class PrivacySettings +@@ -186,6 +200,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 -@@ -4687,6 +4687,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 7463499c..7821324e 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 -@@ -216,6 +216,8 @@ import java.util.HashSet; +@@ -213,6 +213,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. -@@ -2110,6 +2112,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2395,6 +2396,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 -@@ -3425,6 +3425,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Dark theme diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 9efb365b..48ed358c 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -186,7 +186,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -363,10 +363,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -378,10 +378,7 @@ void ChromeBrowserMainExtraPartsProfiles:: InstantServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 6019be4f..df3382f8 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -2105,6 +2107,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { // Close only incognito tabs CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), -@@ -2157,6 +2161,28 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index fedd0988..10e16de8 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -73,6 +73,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto +@@ -72,6 +72,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -338,9 +339,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -337,9 +338,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 54f15008..b0697393 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 | 4 +++- + .../renderer_host/render_frame_host_impl.cc | 2 ++ .../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, 51 insertions(+), 19 deletions(-) + 15 files changed, 50 insertions(+), 18 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,16 +175,14 @@ 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 -@@ -11500,7 +11500,8 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( +@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::TakeNewDocumentPropertiesFromNavigation( + early_hints_manager_ = navigation_request->TakeEarlyHintsManager(); - void RenderFrameHostImpl::MaybeGenerateCrashReport( - base::TerminationStatus status, -- int exit_code) { -+ int exit_code) { // disabled in Bromite + // Only take some properties if this is not the synchronous initial +#if BUILDFLAG(ENABLE_REPORTING) - // TODO(1301987): Remove this once the investigation is done. - VLOG(0) << "RenderFrameHostImpl::MaybeGenerateCrashReport url = " - << last_committed_url_ << ", status = " << status + // `about:blank` navigation, because the values set at construction time + // should remain unmodified. + if (!navigation_request->IsWaitingToCommit()) { @@ -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 e53ccf81..a0ece8cf 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -539,6 +539,7 @@ 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 +- @@ -1728,7 +1729,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 +- - 1724 files changed, 5258 insertions(+), 5258 deletions(-) + 1725 files changed, 5259 insertions(+), 5259 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -12888,6 +12889,18 @@ 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 @@ -28699,7 +28712,7 @@ diff --git a/content/browser/portal/portal_navigation_throttle.cc b/content/brow diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -5319,7 +5319,7 @@ NavigationRequest::CheckCredentialedSubresource() const { +@@ -5325,7 +5325,7 @@ NavigationRequest::CheckCredentialedSubresource() const { const char* console_message = "Subresource requests whose URLs contain embedded credentials (e.g. " "`https://user:pass@host/`) are blocked. See " @@ -28708,7 +28721,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows "details."; parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning, console_message); -@@ -5533,7 +5533,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( +@@ -5539,7 +5539,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck( base::StringPrintf( "Navigating a cross-origin opener to a download (%s) is " "deprecated, see " @@ -29947,7 +29960,7 @@ diff --git a/infra/config/generated/builders/try/android_compile_x86_dbg/propert diff --git a/infra/config/generated/builders/try/android_cronet/properties.json b/infra/config/generated/builders/try/android_cronet/properties.json --- a/infra/config/generated/builders/try/android_cronet/properties.json +++ b/infra/config/generated/builders/try/android_cronet/properties.json -@@ -2,7 +2,7 @@ +@@ -50,7 +50,7 @@ "$build/goma": { "enable_ats": true, "rpc_extra_params": "?prod", @@ -45309,7 +45322,7 @@ diff --git a/tools/mb/mb.py b/tools/mb/mb.py diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl -@@ -4149,11 +4149,11 @@ +@@ -4150,11 +4150,11 @@ # Used to pass the list of files to instrument for coverage to the compile # wrapper. See: diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch index d0e0e3a4..e44c7c85 100644 --- a/build/patches/Bromite-AdBlockUpdaterService.patch +++ b/build/patches/Bromite-AdBlockUpdaterService.patch @@ -80,7 +80,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja 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 -@@ -889,6 +889,8 @@ chrome_java_sources = [ +@@ -896,6 +896,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 27f7b7ad..dcdce301 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -61,7 +61,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni 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 -@@ -798,6 +798,9 @@ chrome_java_sources = [ +@@ -799,6 +799,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java", "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java", "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java", diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index b8204d65..ece327a7 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -5,7 +5,7 @@ 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 ------ + .../org/chromium/chrome/browser/AppHooks.java | 1 - .../chrome/browser/IntentHandler.java | 5 ---- .../chrome/browser/app/ChromeActivity.java | 28 ------------------- .../ChromeContextMenuPopulator.java | 7 ----- @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/flags/CachedFeatureFlags.java | 2 +- chrome/browser/ui/android/omnibox/BUILD.gn | 2 -- .../browser/omnibox/LocationBarMediator.java | 1 - - 13 files changed, 3 insertions(+), 86 deletions(-) + 13 files changed, 3 insertions(+), 78 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java_resources", "//chrome/browser/image_descriptions:java", -@@ -970,7 +969,6 @@ junit_binary("chrome_junit_tests") { +@@ -973,7 +972,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/image_descriptions:java", "//chrome/browser/image_editor/public:java", -@@ -1363,7 +1361,6 @@ android_library("chrome_test_java") { +@@ -1366,7 +1364,6 @@ android_library("chrome_test_java") { "//chrome/browser/first_run/android:java", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -57,21 +57,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b import org.chromium.chrome.browser.historyreport.AppIndexingReporter; import org.chromium.chrome.browser.init.ChromeStartupDelegate; import org.chromium.chrome.browser.init.ProcessInitializationHandler; -@@ -125,14 +124,6 @@ public abstract class AppHooks { - return new FeedbackReporter() {}; - } - -- /** -- * @return An instance of {@link GSAHelper} that handles the start point of chrome's integration -- * with GSA. -- */ -- public GSAHelper createGsaHelper() { -- return new GSAHelper(); -- } -- - /** - * Returns a new instance of HelpAndFeedbackLauncher. - */ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java @@ -219,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -371,14 +371,6 @@ public class ProcessInitializationHandler { +@@ -369,14 +369,6 @@ public class ProcessInitializationHandler { } }); diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch index dd9f1827..a5446ec5 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 -@@ -65,7 +65,6 @@ public class PrivacySettings +@@ -61,7 +61,6 @@ public class PrivacySettings + 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"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; -@@ -95,21 +94,6 @@ public class PrivacySettings +@@ -91,21 +90,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); -@@ -264,12 +248,6 @@ public class PrivacySettings +@@ -233,12 +217,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 5398d699..6a853638 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 -@@ -409,7 +409,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -412,7 +412,7 @@ void ProfileImpl::RegisterProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 4d374425..f5f6d3ce 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -350,7 +350,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "safe_browsing/android/password_reuse_controller_android.cc", "safe_browsing/android/password_reuse_controller_android.h", "safe_browsing/android/safe_browsing_referring_app_bridge_android.cc", -@@ -3791,8 +3767,6 @@ static_library("browser") { +@@ -3790,8 +3766,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -359,7 +359,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", -@@ -7866,8 +7840,6 @@ static_library("test_support") { +@@ -7865,8 +7839,6 @@ static_library("test_support") { "//components/reporting/util:status_macros", "//components/reporting/util:status_proto", "//components/reporting/util:task_runner_context", @@ -781,7 +781,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c #include "components/nacl/common/buildflags.h" #include "components/services/screen_ai/buildflags/buildflags.h" #include "device/vr/buildflags/buildflags.h" -@@ -193,9 +191,6 @@ void RegisterComponentsForUpdate() { +@@ -192,9 +190,6 @@ void RegisterComponentsForUpdate() { MaybeRegisterPKIMetadataComponent(cus); @@ -791,7 +791,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c #if BUILDFLAG(IS_CHROMEOS_ASH) RegisterSmartDimComponent(cus); RegisterAppProvisioningComponent(cus); -@@ -218,8 +213,6 @@ void RegisterComponentsForUpdate() { +@@ -216,8 +211,6 @@ void RegisterComponentsForUpdate() { RegisterAutofillStatesComponent(cus, g_browser_process->local_state()); @@ -1074,7 +1074,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow is_being_revived_(false) {} } // namespace -@@ -413,6 +423,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { +@@ -410,6 +420,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) { data->should_prefer_opening_in_browser_ = preference; } @@ -1082,7 +1082,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { const DownloadItemModelData* data = DownloadItemModelData::Get(download_); return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; -@@ -423,6 +434,7 @@ void DownloadItemModel::SetDangerLevel( +@@ -420,6 +431,7 @@ void DownloadItemModel::SetDangerLevel( DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } @@ -1090,7 +1090,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow download::DownloadItem::MixedContentStatus DownloadItemModel::GetMixedContentStatus() const { -@@ -639,9 +651,6 @@ bool DownloadItemModel::IsCommandEnabled( +@@ -636,9 +648,6 @@ bool DownloadItemModel::IsCommandEnabled( // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 1e6957fd..ecf51023 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -7,9 +7,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/BUILD.gn | 5 ----- chrome/android/chrome_java_sources.gni | 1 - .../browser/app/omnibox/OmniboxPedalDelegateImpl.java | 8 -------- - .../chrome/browser/settings/SettingsActivity.java | 6 ------ + .../chrome/browser/settings/SettingsActivity.java | 2 -- chrome/browser/BUILD.gn | 1 - - 5 files changed, 21 deletions(-) + 5 files changed, 17 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -22,7 +22,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/segmentation_platform:factory_java", "//chrome/browser/selection/android:java", -@@ -1000,8 +999,6 @@ junit_binary("chrome_junit_tests") { +@@ -1002,8 +1001,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/preferences:java", "//chrome/browser/preferences:preferences_junit_tests", "//chrome/browser/profiles/android:java", @@ -31,7 +31,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", "//chrome/browser/tab:java", -@@ -1404,8 +1401,6 @@ android_library("chrome_test_java") { +@@ -1407,8 +1404,6 @@ android_library("chrome_test_java") { "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:javatests", @@ -43,7 +43,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 -@@ -925,7 +925,6 @@ chrome_java_sources = [ +@@ -932,7 +932,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", @@ -86,36 +86,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn 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 -@@ -59,9 +59,6 @@ import org.chromium.chrome.browser.privacy_sandbox.FlocSettingsFragment; +@@ -59,8 +59,6 @@ import org.chromium.chrome.browser.privacy_sandbox.FlocSettingsFragment; import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManagerUtils; --import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator; -import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; -import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl; import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager; -@@ -379,9 +376,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity - fragmentHelpAndFeedbackLauncher.setHelpAndFeedbackLauncher( - HelpAndFeedbackLauncherImpl.getInstance()); - } -- if (fragment instanceof SafetyCheckSettingsFragment) { -- // not supported -- } - if (fragment instanceof PasswordCheckFragmentView) { - PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment, - HelpAndFeedbackLauncherImpl.getInstance(), mSettingsLauncher, diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3281,7 +3281,6 @@ static_library("browser") { +@@ -3400,7 +3400,6 @@ static_library("browser") { "//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/reading_list/android", "//chrome/browser/safe_browsing/android:safe_browsing_enums", - "//chrome/browser/safety_check/android", "//chrome/browser/share/android:jni_headers", "//chrome/browser/share/core/crow:crow_configuration", - "//chrome/browser/tab:jni_headers", + "//chrome/browser/signin/services/android:jni_headers", -- 2.25.1 diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index f60f45de..83fb028b 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -7022,7 +7022,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { +@@ -7028,7 +7028,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index 7b7d503f..d5bc8735 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc --- a/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chrome/browser/net/stub_resolver_config_reader.cc -@@ -155,7 +155,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, +@@ -156,7 +156,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, if (entries.count("dns-over-https@1")) { // The user has "Enabled" selected. local_state_->SetString(prefs::kDnsOverHttpsMode, @@ -24,7 +24,7 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/ } else if (entries.count("dns-over-https@2")) { // The user has "Disabled" selected. local_state_->SetString(prefs::kDnsOverHttpsMode, -@@ -338,22 +338,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( +@@ -341,22 +341,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( check_parental_controls = false; } diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index dca2a90e..c83e7248 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 | 82 ++++++++++++++++++- - .../chromium/chrome/browser/tab/TabImpl.java | 50 +++++++++++ + .../settings/PasswordSettings.java | 81 ++++++++++++++++++- + .../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, 311 insertions(+), 13 deletions(-) + 22 files changed, 310 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 -@@ -464,6 +464,7 @@ android_library("chrome_java") { +@@ -459,6 +459,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 -@@ -57,13 +57,19 @@ import java.lang.annotation.Retention; +@@ -55,13 +55,18 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Locale; @@ -80,13 +80,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage */ public class PasswordSettings extends PreferenceFragmentCompat implements PasswordManagerHandler.PasswordListObserver, -- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener { -+ Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener, -+ INeedSnackbarManager { +- Preference.OnPreferenceClickListener { ++ Preference.OnPreferenceClickListener, INeedSnackbarManager { @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) @Retention(RetentionPolicy.SOURCE) -@@ -92,6 +98,12 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -90,6 +95,12 @@ public class PasswordSettings extends PreferenceFragmentCompat public static final String PASSWORD_EXPORT_EVENT_HISTOGRAM = "PasswordManager.PasswordExport.Event"; @@ -99,7 +98,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"; -@@ -121,6 +133,8 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -119,6 +130,8 @@ public class PasswordSettings extends PreferenceFragmentCompat private String mSearchQuery; private Preference mLinkPref; private ChromeSwitchPreference mSavePasswordsSwitch; @@ -108,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private ChromeSwitchPreference mAutoSignInSwitch; private ChromeBasePreference mCheckPasswords; private ChromeBasePreference mTrustedVaultBanner; -@@ -299,6 +313,7 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -293,6 +306,7 @@ public class PasswordSettings extends PreferenceFragmentCompat } createSavePasswordsSwitch(); @@ -116,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage createAutoSignInCheckbox(); if (mPasswordCheck != null) { createCheckPasswords(); -@@ -539,6 +554,71 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -530,6 +544,71 @@ public class PasswordSettings extends PreferenceFragmentCompat getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE)); } @@ -314,7 +313,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 -@@ -2433,6 +2433,14 @@ static_library("browser") { +@@ -2432,6 +2432,14 @@ static_library("browser") { "//ui/web_dialogs", "//ui/webui", ] @@ -394,7 +393,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 -@@ -620,6 +620,12 @@ CHAR_LIMIT guidelines: +@@ -602,6 +602,12 @@ CHAR_LIMIT guidelines: Save passwords diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 3777f035..df945fdd 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja 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 -@@ -947,6 +947,7 @@ chrome_java_sources = [ +@@ -954,6 +954,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java", @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData; import org.chromium.chrome.browser.tasks.tab_management.PriceTrackingUtilities; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager; -@@ -427,6 +428,8 @@ public class ProcessInitializationHandler { +@@ -425,6 +426,8 @@ public class ProcessInitializationHandler { deferredStartupHandler.addDeferredTask( () -> IncognitoTabLauncher.updateComponentEnabledState()); diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index e8478961..3f59ec44 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -241,7 +241,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn } if (enable_vr) { -@@ -553,6 +557,7 @@ android_library("chrome_java") { +@@ -554,6 +558,7 @@ android_library("chrome_java") { "//components/ukm/android:java", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", @@ -290,7 +290,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -124,6 +124,8 @@ import java.util.Date; +@@ -122,6 +122,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; @@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni /** * Handles the initialization dependences of the browser process. This is meant to handle the * initialization that is not tied to any particular Activity, and the logic that should only be -@@ -320,6 +322,7 @@ public class ProcessInitializationHandler { +@@ -318,6 +320,7 @@ public class ProcessInitializationHandler { DefaultBrowserInfo.initBrowserFetcher(); @@ -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 -@@ -3422,6 +3422,11 @@ static_library("browser") { +@@ -3545,6 +3545,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -435,7 +435,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -233,6 +233,8 @@ +@@ -241,6 +241,8 @@ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" #endif @@ -444,7 +444,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { -@@ -557,6 +559,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -574,6 +576,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index 87efd1c5..aa0501ba 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 -@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; - import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; +@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; + import org.chromium.chrome.browser.settings.SettingsLauncherImpl; 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; -@@ -53,6 +54,9 @@ import androidx.preference.PreferenceCategory; +@@ -50,6 +51,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. */ -@@ -87,6 +91,8 @@ public class PrivacySettings +@@ -83,6 +87,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 = -@@ -139,6 +145,40 @@ public class PrivacySettings - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); - syncAndServicesLink.setSummary(buildSyncAndServicesLink()); +@@ -132,6 +138,40 @@ public class PrivacySettings + Preference secureDnsPref = findPreference(PREF_SECURE_DNS); + secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); + // 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(); } -@@ -262,6 +302,29 @@ public class PrivacySettings +@@ -231,6 +271,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 -@@ -1107,6 +1107,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1089,6 +1089,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index d74ae6d2..a5c3e4f5 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -1019,7 +1019,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -92,6 +92,8 @@ import org.chromium.content_public.browser.NavigationEntry; +@@ -93,6 +93,8 @@ import org.chromium.content_public.browser.NavigationEntry; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.mojom.WindowOpenDisposition; @@ -1028,7 +1028,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import java.util.List; -@@ -529,10 +531,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -533,10 +535,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide // + topControlsDistanceToRest| will give the margin for the current animation frame. final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset() - mBrowserControlsStateProvider.getTopControlsHeight(); @@ -1046,7 +1046,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) { layoutParams.topMargin = topMargin; -@@ -555,7 +562,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -559,7 +566,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide * strip. */ private int getToolbarExtraYOffset() { 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 bb822b20..0998a884 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 -@@ -48,6 +48,12 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -45,6 +45,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. */ -@@ -67,6 +73,16 @@ public class PrivacySettings +@@ -63,6 +69,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; -@@ -116,6 +132,16 @@ public class PrivacySettings +@@ -112,6 +128,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); -@@ -175,6 +201,9 @@ public class PrivacySettings +@@ -144,6 +170,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; } -@@ -189,7 +218,7 @@ public class PrivacySettings +@@ -158,7 +187,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 -@@ -463,6 +463,10 @@ CHAR_LIMIT guidelines: +@@ -445,6 +445,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 4721fe60..2971fcbd 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 -@@ -2360,6 +2360,7 @@ static_library("browser") { +@@ -2359,6 +2359,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 cac529fb..df9029eb 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 -@@ -265,6 +265,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() { +@@ -271,6 +271,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 bb8e9db9..4e41ed94 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -49,7 +49,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/password_manager/android/BUILD.gn | 2 - .../PasswordManagerAndroidBackendUtil.java | 31 +- .../PasswordSettingsUpdaterBridge.java | 11 - - ...PasswordStoreAndroidBackendBridgeImpl.java | 5 - ...swordSyncControllerDelegateBridgeImpl.java | 7 - .../push_messaging_service_factory.cc | 8 +- chrome/browser/resources/settings/route.ts | 2 - @@ -109,7 +108,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 +- - 85 files changed, 83 insertions(+), 1999 deletions(-) + 84 files changed, 83 insertions(+), 1994 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 @@ -151,7 +150,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//cc:cc_java", "//chrome/android/features/keyboard_accessory:public_java", "//chrome/android/features/start_surface:java_resources", -@@ -604,8 +596,19 @@ android_library("chrome_java") { +@@ -605,8 +597,19 @@ android_library("chrome_java") { "//services/shape_detection:shape_detection_java", "//services/shape_detection/public/mojom:mojom_java", "//skia/public/mojom:mojom_java", @@ -172,7 +171,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//third_party/android_deps:com_google_code_findbugs_jsr305_java", "//third_party/android_deps:com_google_guava_listenablefuture_java", "//third_party/android_deps:dagger_java", -@@ -932,10 +935,6 @@ junit_binary("chrome_junit_tests") { +@@ -935,10 +938,6 @@ junit_binary("chrome_junit_tests") { ":chrome_jni_headers", ":chrome_public_android_manifest", ":delegate_public_impl_java", @@ -183,7 +182,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java_test_support", "//base:base_junit_test_support", "//base/test:test_support_java", -@@ -1334,13 +1333,6 @@ android_library("chrome_test_java") { +@@ -1337,13 +1336,6 @@ android_library("chrome_test_java") { ":chrome_test_util_java", ":chrome_test_util_jni", ":delegate_public_impl_java", @@ -197,7 +196,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java_test_support", "//base/test:test_support_java", "//build/android:build_java", -@@ -2403,7 +2395,6 @@ android_library("browser_java_test_support") { +@@ -2405,7 +2397,6 @@ android_library("browser_java_test_support") { ] deps = [ ":chrome_java", @@ -205,7 +204,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:jni_java", -@@ -2553,9 +2544,7 @@ android_library("base_monochrome_module_java") { +@@ -2555,9 +2546,7 @@ android_library("base_monochrome_module_java") { # is in a DFM. android_library("base_module_java") { sources = [ @@ -215,7 +214,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java", "java/src/org/chromium/chrome/browser/app/bluetooth/BluetoothNotificationService.java", -@@ -2567,8 +2556,6 @@ android_library("base_module_java") { +@@ -2569,8 +2558,6 @@ android_library("base_module_java") { "java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java", "java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java", "java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java", @@ -224,7 +223,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java", -@@ -2593,17 +2580,11 @@ android_library("base_module_java") { +@@ -2595,17 +2582,11 @@ android_library("base_module_java") { "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", @@ -242,7 +241,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:jni_java", "//build/android:build_java", -@@ -2618,7 +2599,6 @@ android_library("base_module_java") { +@@ -2620,7 +2601,6 @@ android_library("base_module_java") { "//components/media_router/browser/android:cast_options_provider_java", "//components/minidump_uploader:minidump_uploader_java", "//components/module_installer/android:module_installer_java", @@ -250,7 +249,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//ui/android:ui_no_recycler_view_java", -@@ -2638,7 +2618,6 @@ android_library("base_module_java") { +@@ -2640,7 +2620,6 @@ android_library("base_module_java") { # Deps to pull services into base module. # TODO(crbug.com/1126301): Consider moving these to the chrome module to # reduce base dex size. @@ -269,7 +268,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", -@@ -929,10 +928,6 @@ chrome_java_sources = [ +@@ -936,10 +935,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java", "java/src/org/chromium/chrome/browser/searchwidget/SearchType.java", "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java", @@ -445,7 +444,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b import org.chromium.base.ContextUtils; import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.customtabs.CustomTabsConnection; -@@ -248,16 +245,7 @@ public abstract class AppHooks { +@@ -240,16 +237,7 @@ public abstract class AppHooks { * same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}. */ public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) { @@ -882,7 +881,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 -@@ -140,7 +140,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -139,7 +139,6 @@ public class PasswordSettings extends PreferenceFragmentCompat private boolean mSearchRecorded; private Menu mMenu; @@ -890,7 +889,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage private @ManagePasswordsReferrer int mManagePasswordsReferrer; /** -@@ -203,7 +202,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -202,7 +201,6 @@ public class PasswordSettings extends PreferenceFragmentCompat @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -898,7 +897,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage computeTrustedVaultBannerState(); } -@@ -309,9 +307,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -308,9 +306,6 @@ public class PasswordSettings extends PreferenceFragmentCompat createSavePasswordsSwitch(); createEnableAndroidAutofillSwitch(); createAutoSignInCheckbox(); @@ -908,7 +907,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, -@@ -486,10 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -485,10 +480,6 @@ public class PasswordSettings extends PreferenceFragmentCompat // by the system. if (getActivity().isFinishing()) { PasswordManagerHandlerProvider.getInstance().removeObserver(this); @@ -942,7 +941,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 -@@ -6784,8 +6784,6 @@ static_library("browser") { +@@ -6916,8 +6916,6 @@ static_library("browser") { "offline_pages/offliner_helper.h", "offline_pages/offliner_user_data.cc", "offline_pages/offliner_user_data.h", @@ -1085,7 +1084,7 @@ diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn -@@ -81,7 +81,6 @@ android_library("java") { +@@ -84,7 +84,6 @@ android_library("java") { ":android_backend_java_enums", ":java_resources", ":settings_interface_java", @@ -1093,7 +1092,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//base:base_java", "//base:jni_java", "//build/android:build_java", -@@ -172,7 +171,6 @@ junit_binary("password_manager_junit_tests") { +@@ -179,7 +178,6 @@ junit_binary("password_manager_junit_tests") { ":java", ":public_impl_java", ":settings_interface_java", @@ -1194,28 +1193,6 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom PasswordSettingsUpdaterBridgeJni.get().onFailedSettingChange( mNativeSettingsUpdaterBridge, setting, error, apiErrorCode); } -diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java ---- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java -+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordStoreAndroidBackendBridgeImpl.java -@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.password_manager; - - import android.accounts.Account; - --import com.google.android.gms.common.api.ResolvableApiException; - import com.google.common.base.Optional; - - import org.chromium.base.annotations.CalledByNative; -@@ -113,10 +112,6 @@ class PasswordStoreAndroidBackendBridgeImpl { - int error = PasswordManagerAndroidBackendUtil.getBackendError(exception); - int apiErrorCode = PasswordManagerAndroidBackendUtil.getApiErrorCode(exception); - -- if (exception instanceof ResolvableApiException) { -- PasswordManagerAndroidBackendUtil.handleResolvableApiException( -- (ResolvableApiException) exception); -- } - PasswordStoreAndroidBackendBridgeImplJni.get().onError( - mNativeBackendBridge, jobId, error, apiErrorCode); - } diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch index f70a8e39..347a973b 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 -@@ -493,7 +493,6 @@ android_library("chrome_java") { +@@ -488,7 +488,6 @@ android_library("chrome_java") { "//components/content_capture/android:java", "//components/content_settings/android:content_settings_enums_java", "//components/content_settings/android:java", @@ -102,18 +102,19 @@ 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", -@@ -659,10 +658,8 @@ android_library("chrome_java") { +@@ -654,11 +653,9 @@ android_library("chrome_java") { ":chrome_strict_mode_switch", ":resource_id_javagen", ":vr_build_config", - "//chrome:assist_ranker_prediction_enum_javagen", "//chrome:instant_apps_reasons_enum_javagen", "//chrome:offline_pages_enum_javagen", + "//chrome:partner_bookmarks_javagen", - "//chrome:quick_action_category_enum_javagen", "//chrome:supervised_user_url_filter_enum_javagen", "//chrome/browser:screenshot_mode_enum", "//chrome/browser:sharing_dialog_type_generated_enum", -@@ -3869,17 +3866,12 @@ generate_jni("chrome_jni_headers") { +@@ -3851,17 +3848,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 +821,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 -@@ -45,8 +45,4 @@ +@@ -40,8 +40,4 @@ android:summary="@string/prefs_autofill_assistant_summary" android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment" app:isPreferenceVisible="false"/> @@ -846,7 +847,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 -@@ -1657,7 +1657,7 @@ public class ChromeTabbedActivity extends ChromeActivity extends AsyncInitializationActivity @@ -886,7 +887,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv SnackbarManageable, SceneChangeObserver, StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker, MenuOrKeyboardActionController, CompositorViewHolder.Initializer, -@@ -327,8 +324,6 @@ public abstract class ChromeActivity +@@ -320,8 +317,6 @@ public abstract class ChromeActivity new ObservableSupplierImpl<>(); protected final UnownedUserDataSupplier mInsetObserverViewSupplier = new InsetObserverViewSupplier(); @@ -895,7 +896,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv private SnackbarManager mSnackbarManager; -@@ -517,7 +512,7 @@ public abstract class ChromeActivity +@@ -510,7 +505,7 @@ public abstract class ChromeActivity // clang-format off return new RootUiCoordinator(this, null, getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier, @@ -904,7 +905,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(), getWindowAndroid(), -@@ -950,14 +945,6 @@ public abstract class ChromeActivity +@@ -943,14 +938,6 @@ public abstract class ChromeActivity mCompositorViewHolderSupplier.get().onNativeLibraryReady( getWindowAndroid(), getTabContentManager()); @@ -919,7 +920,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv TraceEvent.end("ChromeActivity:CompositorInitialization"); } -@@ -1506,11 +1493,6 @@ public abstract class ChromeActivity +@@ -1430,11 +1417,6 @@ public abstract class ChromeActivity @SuppressLint("NewApi") @Override protected final void onDestroy() { @@ -931,7 +932,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv if (mSnackbarManager != null) { SnackbarManagerProvider.detach(mSnackbarManager); } -@@ -2109,13 +2091,6 @@ public abstract class ChromeActivity +@@ -2033,13 +2015,6 @@ public abstract class ChromeActivity return mCompositorViewHolderSupplier.get(); } @@ -945,7 +946,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. -@@ -2158,15 +2133,6 @@ public abstract class ChromeActivity +@@ -2082,15 +2057,6 @@ public abstract class ChromeActivity } mActivityTabProvider.setLayoutStateProvider(layoutManager); @@ -961,7 +962,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv } /** -@@ -2407,18 +2373,6 @@ public abstract class ChromeActivity +@@ -2331,18 +2297,6 @@ public abstract class ChromeActivity return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null; } @@ -1056,7 +1057,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 -@@ -191,12 +191,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { +@@ -188,12 +188,6 @@ public class CustomTabActivity extends BaseCustomTabActivity { mIntentDataProvider.getSession(), webContents); } @@ -1167,7 +1168,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 -@@ -50,7 +50,6 @@ import org.chromium.ui.text.SpanApplier; +@@ -47,7 +47,6 @@ import org.chromium.ui.text.SpanApplier; import androidx.annotation.Nullable; import androidx.preference.PreferenceCategory; @@ -1175,7 +1176,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; -@@ -76,9 +75,7 @@ public class PrivacySettings +@@ -72,9 +71,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 +1186,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()); -@@ -136,12 +133,6 @@ public class PrivacySettings +@@ -132,12 +129,6 @@ public class PrivacySettings mSearchSuggestions.setOnPreferenceChangeListener(this); mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -1228,7 +1229,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; -@@ -255,7 +254,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -253,7 +252,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier profileSupplier, @NonNull ObservableSupplier bookmarkBridgeSupplier, @@ -1237,7 +1238,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab @NonNull ObservableSupplier tabModelSelectorSupplier, @NonNull OneshotSupplier startSurfaceSupplier, @NonNull OneshotSupplier intentMetadataOneshotSupplier, -@@ -288,7 +287,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -286,7 +285,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { OneshotSupplier tabReparentingControllerSupplier, boolean initializeUiWithIncognitoColors) { super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider, @@ -1382,7 +1383,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 -@@ -2068,9 +2068,6 @@ static_library("browser") { +@@ -2067,9 +2067,6 @@ static_library("browser") { "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/contextual_search:buildflags", @@ -1392,7 +1393,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", -@@ -2666,8 +2663,6 @@ static_library("browser") { +@@ -2665,8 +2662,6 @@ static_library("browser") { "android/compositor/decoration_title.h", "android/compositor/layer/content_layer.cc", "android/compositor/layer/content_layer.h", @@ -1401,7 +1402,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", -@@ -2688,8 +2683,6 @@ static_library("browser") { +@@ -2687,8 +2682,6 @@ static_library("browser") { "android/compositor/resources/resource_factory.cc", "android/compositor/resources/toolbar_resource.cc", "android/compositor/resources/toolbar_resource.h", @@ -1410,7 +1411,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", -@@ -2714,26 +2707,6 @@ static_library("browser") { +@@ -2713,26 +2706,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 +1438,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", -@@ -3315,8 +3288,6 @@ static_library("browser") { +@@ -3312,8 +3285,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 +1546,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 -@@ -819,49 +819,6 @@ CHAR_LIMIT guidelines: +@@ -801,49 +801,6 @@ CHAR_LIMIT guidelines: Privacy and security @@ -1595,7 +1596,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro “Do Not Track” -@@ -3932,41 +3889,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 0ca588f7..fb12d6a3 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 -@@ -2484,16 +2484,6 @@ public abstract class ChromeActivity +@@ -2408,16 +2408,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-offline-measurement-background-task.patch b/build/patches/Remove-offline-measurement-background-task.patch index 4b0dc9fa..acce5927 100644 --- a/build/patches/Remove-offline-measurement-background-task.patch +++ b/build/patches/Remove-offline-measurement-background-task.patch @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.photo_picker.DecoderService; -@@ -446,8 +445,6 @@ public class ProcessInitializationHandler { +@@ -444,8 +443,6 @@ public class ProcessInitializationHandler { () -> VideoTutorialShareHelper.saveUrlsToSharedPrefs()); deferredStartupHandler.addDeferredTask( () -> TosDialogBehaviorSharedPrefInvalidator.refreshSharedPreferenceIfTosSkipped()); diff --git a/build/patches/Remove-price-shopping-commerce-integrations.patch b/build/patches/Remove-price-shopping-commerce-integrations.patch index e99d4072..54b9ab5b 100644 --- a/build/patches/Remove-price-shopping-commerce-integrations.patch +++ b/build/patches/Remove-price-shopping-commerce-integrations.patch @@ -32,9 +32,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ToolbarButtonInProductHelpController.java | 26 ---- .../chrome/browser/ui/RootUiCoordinator.java | 14 -- chrome/android/java_sources.gni | 8 - - chrome/browser/BUILD.gn | 3 - chrome/browser/persisted_state_db/BUILD.gn | 1 - - 30 files changed, 17 insertions(+), 784 deletions(-) + 29 files changed, 17 insertions(+), 781 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -59,7 +58,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/consent_auditor/android:java", "//chrome/browser/contextmenu:java", "//chrome/browser/continuous_search:java", -@@ -726,15 +720,6 @@ android_library("chrome_java") { +@@ -728,15 +722,6 @@ android_library("chrome_java") { sources += share_java_sources deps += share_java_deps @@ -75,7 +74,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn if (enable_basic_printing) { deps += [ "//printing:printing_java" ] } -@@ -814,8 +799,6 @@ group("jni_headers") { +@@ -817,8 +802,6 @@ group("jni_headers") { "//chrome/browser/android/browserservices/metrics:jni_headers", "//chrome/browser/android/browserservices/verification:jni_headers", "//chrome/browser/commerce/merchant_viewer/android:jni_headers", @@ -84,7 +83,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/contextmenu:jni_headers", "//chrome/browser/download/android:jni_headers", "//chrome/browser/enterprise/util:jni_headers", -@@ -967,7 +950,6 @@ junit_binary("chrome_junit_tests") { +@@ -970,7 +953,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/browser_controls/android:java", "//chrome/browser/browser_controls/android:junit", "//chrome/browser/commerce/merchant_viewer/android:junit", @@ -92,7 +91,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/contextmenu:java", "//chrome/browser/continuous_search:junit", "//chrome/browser/continuous_search/internal:junit", -@@ -1651,8 +1633,6 @@ android_library("chrome_test_java") { +@@ -1654,8 +1636,6 @@ android_library("chrome_test_java") { deps += feed_test_deps @@ -1288,7 +1287,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } /** -@@ -244,17 +232,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -239,17 +227,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter return createViewHolderHelper(parent, R.layout.bookmark_folder_row); case ViewType.BOOKMARK: return createViewHolderHelper(parent, R.layout.bookmark_item_row); @@ -1746,19 +1745,6 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni chrome_test_java_sources += commerce_merchant_viewer_java_test_sources if (enable_arcore) { -diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn ---- a/chrome/browser/BUILD.gn -+++ b/chrome/browser/BUILD.gn -@@ -3246,9 +3246,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", -- "//chrome/browser/commerce/subscriptions:commerce_subscription_db", -- "//chrome/browser/commerce/subscriptions:commerce_subscription_db_content_proto", -- "//chrome/browser/commerce/subscriptions/android:jni_headers", - "//chrome/browser/consent_auditor/android:jni_headers", - "//chrome/browser/content_creation/notes/internal/android:jni_headers", - "//chrome/browser/content_creation/reactions/internal/android:jni_headers", diff --git a/chrome/browser/persisted_state_db/BUILD.gn b/chrome/browser/persisted_state_db/BUILD.gn --- a/chrome/browser/persisted_state_db/BUILD.gn +++ b/chrome/browser/persisted_state_db/BUILD.gn diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 782a075b..5ed58c01 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -19,129 +19,93 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions() License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/BUILD.gn | 26 --- - chrome/android/chrome_java_sources.gni | 34 --- + chrome/android/BUILD.gn | 19 -- + chrome/android/chrome_java_sources.gni | 30 --- .../features/autofill_assistant/BUILD.gn | 1 - - .../AssistantAccessTokenUtilChrome.java | 14 -- + .../AssistantAccessTokenUtilChrome.java | 8 - .../AssistantDependencyUtilsChrome.java | 4 +- - .../AssistantProfileImageUtilChrome.java | 25 +-- - .../AssistantStaticDependenciesChrome.java | 12 +- - .../public/java_sources.gni | 1 - + .../AssistantProfileImageUtilChrome.java | 21 +- + .../AssistantStaticDependenciesChrome.java | 6 +- chrome/android/features/tab_ui/BUILD.gn | 1 - .../PriceTrackingUtilities.java | 15 +- - .../TabSuggestionsServerFetcher.java | 12 +- - .../browser/feed/FeedSurfaceCoordinator.java | 26 +-- - .../browser/feed/FeedSurfaceMediator.java | 95 +------- + .../TabSuggestionsServerFetcher.java | 9 +- + .../browser/feed/FeedSurfaceCoordinator.java | 14 +- + .../browser/feed/FeedSurfaceMediator.java | 79 +------ chrome/android/java/AndroidManifest.xml | 19 -- .../res/xml/google_services_preferences.xml | 5 - .../android/java/res/xml/main_preferences.xml | 22 +- .../java/res/xml/manage_sync_preferences.xml | 12 - .../java/res/xml/privacy_preferences.xml | 4 - - .../org/chromium/chrome/browser/AppHooks.java | 26 --- + .../org/chromium/chrome/browser/AppHooks.java | 34 --- .../chrome/browser/ChromeBackupAgentImpl.java | 9 +- - .../chrome/browser/ChromeBackupWatcher.java | 12 - - .../chrome/browser/ChromeTabbedActivity.java | 19 -- + .../chrome/browser/ChromeBackupWatcher.java | 10 - + .../chrome/browser/ChromeTabbedActivity.java | 15 -- .../chrome/browser/app/ChromeActivity.java | 76 ------- .../AutofillAssistantPreferenceFragment.java | 17 +- - .../bookmarks/BookmarkItemsAdapter.java | 49 +---- + .../bookmarks/BookmarkItemsAdapter.java | 56 +---- .../bookmarks/BookmarkPromoHeader.java | 207 +----------------- - .../ClearBrowsingDataFragmentBasic.java | 33 +-- - .../contacts_picker/ChromePickerAdapter.java | 62 +----- + .../ClearBrowsingDataFragmentBasic.java | 27 +-- + .../contacts_picker/ChromePickerAdapter.java | 67 +----- .../browser/customtabs/CustomTabActivity.java | 3 - - .../browser/firstrun/FirstRunActivity.java | 2 +- .../firstrun/FirstRunActivityBase.java | 1 - - .../firstrun/FirstRunFlowSequencer.java | 10 +- - .../firstrun/FirstRunPageDelegate.java | 5 - - .../firstrun/LightweightFirstRunActivity.java | 6 +- + .../firstrun/LightweightFirstRunActivity.java | 4 +- ...FirstRunFragmentWithEnterpriseSupport.java | 6 - - .../history/HistoryContentManager.java | 26 +-- - .../identity_disc/IdentityDiscController.java | 131 +---------- - .../browser/infobar/SavePasswordInfoBar.java | 15 +- - .../infobar/UpdatePasswordInfoBar.java | 17 +- + .../history/HistoryContentManager.java | 27 +-- + .../identity_disc/IdentityDiscController.java | 104 +-------- .../init/ChromeBrowserInitializer.java | 2 - - .../init/ProcessInitializationHandler.java | 7 - - .../chrome/browser/ntp/RecentTabsManager.java | 114 +--------- - .../browser/ntp/RecentTabsRowAdapter.java | 54 ----- + .../init/ProcessInitializationHandler.java | 9 - + .../chrome/browser/ntp/RecentTabsManager.java | 106 +-------- + .../browser/ntp/RecentTabsRowAdapter.java | 30 +-- .../browser/ntp/search/SearchBoxMediator.java | 1 - .../browser/omaha/RequestGenerator.java | 3 - .../AccountChooserDialog.java | 2 +- - .../PasswordManagerLauncher.java | 15 +- + .../AutoSigninSnackbarController.java | 2 +- + .../PasswordManagerLauncher.java | 11 +- .../settings/PasswordSettings.java | 71 +----- - .../browser/payments/ui/PaymentRequestUI.java | 10 - + .../browser/payments/ui/PaymentRequestUI.java | 12 +- .../privacy/settings/PrivacySettings.java | 31 --- .../chrome/browser/settings/MainSettings.java | 125 +---------- - .../browser/settings/SettingsActivity.java | 13 +- + .../browser/settings/SettingsActivity.java | 15 -- + .../share/crow/CrowButtonDelegateImpl.java | 5 +- .../SharedClipboardShareActivity.java | 3 - + .../survey/ChromeSurveyController.java | 6 +- .../tabbed_mode/TabbedRootUiCoordinator.java | 19 -- .../browser/tasks/ReturnToChromeUtil.java | 9 +- - chrome/browser/BUILD.gn | 152 ------------- - .../consent_auditor/consent_auditor_bridge.cc | 21 -- - .../chrome_autocomplete_provider_client.cc | 21 +- - .../chrome_autocomplete_provider_client.h | 1 - - .../document_suggestions_service_factory.cc | 6 +- - .../autofill/personal_data_manager_factory.cc | 4 +- - .../common_dependencies_chrome.cc | 13 -- - .../common_dependencies_chrome.h | 3 - - .../bookmarks/bookmark_model_factory.cc | 5 +- - .../chrome_browsing_data_lifetime_manager.cc | 6 +- - .../counters/browsing_data_counter_factory.cc | 8 +- - .../counters/browsing_data_counter_utils.cc | 6 - - chrome/browser/chrome_browser_field_trials.cc | 6 +- - .../browser/chrome_content_browser_client.cc | 9 - - .../endpoint_fetcher/endpoint_fetcher.cc | 2 +- - .../profile_report_generator_delegate_base.cc | 11 - - ...tory_ui_favicon_request_handler_factory.cc | 1 - + chrome/browser/BUILD.gn | 11 - chrome/browser/feed/android/BUILD.gn | 1 - .../chrome/browser/feed/FeedFeatures.java | 2 - - chrome/browser/feed/feed_service_factory.cc | 6 +- .../browser/firstrun/MobileFreProgress.java | 4 +- - .../gcm/gcm_profile_service_factory.cc | 4 +- - .../history/web_history_service_factory.cc | 16 +- - .../profile_invalidation_provider_factory.cc | 48 +--- .../router/discovery/access_code/BUILD.gn | 1 - - .../metrics/chrome_metrics_service_client.cc | 6 - - .../browser/password_manager/android/BUILD.gn | 6 - - .../PasswordManagerHelper.java | 94 +------- + .../browser/password_manager/android/BUILD.gn | 4 - + .../PasswordManagerHelper.java | 97 +------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - - .../bulk_leak_check_service_factory.cc | 4 +- - .../chrome_password_manager_client.cc | 120 +--------- - .../chrome_password_manager_client.h | 25 --- - ...ssword_manager_settings_service_factory.cc | 6 - - .../password_reuse_manager_factory.cc | 46 +--- - .../password_manager/password_store_utils.cc | 15 +- chrome/browser/privacy/BUILD.gn | 2 - - .../privacy_metrics_service_factory.cc | 13 -- .../res/layout/privacy_review_msbb_step.xml | 8 - - .../privacy_sandbox_service_factory.cc | 8 +- - .../privacy_sandbox_settings_delegate.cc | 18 +- - ...hrome_browser_main_extra_parts_profiles.cc | 17 -- - chrome/browser/profiles/profile_impl.cc | 15 +- - .../verdict_cache_manager_factory.cc | 5 +- - .../DevicePickerBottomSheetContent.java | 46 ---- + .../DevicePickerBottomSheetContent.java | 39 +--- .../SendTabToSelfCoordinator.java | 104 +-------- - .../android/infobars/save_password_infobar.cc | 5 +- - .../infobars/update_password_infobar.cc | 6 +- + .../account_consistency_mode_manager.cc | 7 +- + .../identity_services_provider_android.cc | 9 - + .../services/IdentityServicesProvider.java | 14 -- + chrome/browser/sync/sync_service_factory.cc | 12 +- chrome/browser/ui/android/omnibox/BUILD.gn | 2 - .../browser/omnibox/LocationBarMediator.java | 1 - + ...onfirmImportSyncDataDialogCoordinator.java | 7 +- + .../signin/ConfirmSyncDataStateMachine.java | 16 +- + .../ui/signin/SignOutDialogFragment.java | 13 -- + .../ui/signin/SigninPromoController.java | 15 +- + .../ui/signin/SyncConsentFragmentBase.java | 53 +---- + .../WebSigninAccountPickerDelegate.java | 23 -- + .../ui/signin/fre/SigninFirstRunMediator.java | 52 +---- .../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 - - .../browser/autocomplete_provider_client.h | 7 - - .../password_manager/core/browser/BUILD.gn | 9 - .../core/browser/leak_detection_delegate.cc | 2 +- .../core/browser/password_form_manager.cc | 34 +-- - .../core/browser/password_manager.cc | 82 ------- - .../core/browser/password_manager_client.h | 20 -- .../browser/password_manager_client_helper.cc | 43 +--- .../core/browser/sync_credentials_filter.cc | 48 +--- components/signin/features.gni | 4 +- .../signin/SystemAccountManagerDelegate.java | 25 +-- .../net/HttpNegotiateAuthenticator.java | 88 +------- .../chromoting/base/OAuthTokenFetcher.java | 2 - - 122 files changed, 103 insertions(+), 2785 deletions(-) + 86 files changed, 82 insertions(+), 2080 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -178,23 +142,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/messages/android:java", -@@ -561,7 +556,6 @@ android_library("chrome_java") { - "//components/security_state/core:security_state_enums_java", - "//components/segmentation_platform/public:public_java", - "//components/signin/core/browser:signin_enums_java", -- "//components/signin/public/android:java", - "//components/site_engagement/content/android:java", - "//components/spellcheck/browser/android:java", - "//components/strictmode/android:java", -@@ -814,7 +808,6 @@ java_group("chrome_all_java") { - group("jni_headers") { - public_deps = [ - ":chrome_jni_headers", -- "//chrome/android/features/autofill_assistant:jni_headers_public", - "//chrome/android/features/keyboard_accessory:jni_headers", - "//chrome/android/features/start_surface:jni_headers", - "//chrome/browser/android/browserservices/metrics:jni_headers", -@@ -1029,9 +1022,6 @@ junit_binary("chrome_junit_tests") { +@@ -1031,9 +1026,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/safety_check/android:junit", "//chrome/browser/search_engines/android:java", "//chrome/browser/share:java", @@ -204,7 +152,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", -@@ -1062,8 +1052,6 @@ junit_binary("chrome_junit_tests") { +@@ -1064,8 +1056,6 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/ui/android/omnibox:junit", "//chrome/browser/ui/android/quickactionsearchwidget:java", "//chrome/browser/ui/android/searchactivityutils:java", @@ -213,25 +161,18 @@ 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", -@@ -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", -- "//components/signin/public/android:java", - "//components/signin/public/android:signin_java_test_support", - "//components/sync/android:sync_java", - "//components/ukm/android:java", -@@ -1451,9 +1438,6 @@ android_library("chrome_test_java") { +@@ -1453,10 +1443,6 @@ android_library("chrome_test_java") { "//chrome/browser/settings:test_support_java", "//chrome/browser/share:java", "//chrome/browser/share/android:java_resources", - "//chrome/browser/signin/services/android:java", - "//chrome/browser/signin/services/android:javatests", - "//chrome/browser/sync/android:java", - "//chrome/browser/sync/test/android:test_support_java", +- "//chrome/browser/sync/test/android:test_support_java", "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java", "//chrome/browser/tab:critical_persisted_tab_data_proto_java", -@@ -1482,8 +1466,6 @@ android_library("chrome_test_java") { + "//chrome/browser/tab:java", +@@ -1484,8 +1470,6 @@ android_library("chrome_test_java") { "//chrome/browser/ui/android/quickactionsearchwidget:javatests", "//chrome/browser/ui/android/searchactivityutils:java", "//chrome/browser/ui/android/searchactivityutils:javatests", @@ -240,15 +181,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", -@@ -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", -- "//components/signin/public/android:java", - "//components/signin/public/android:javatests", - "//components/signin/public/android:signin_java_test_support", - "//components/site_engagement/content/android:java", -@@ -2432,7 +2413,6 @@ android_library("browser_java_test_support") { +@@ -2433,7 +2417,6 @@ android_library("browser_java_test_support") { "//chrome/browser/download/android:java", "//chrome/browser/prefetch/android:java", "//chrome/browser/profiles/android:java", @@ -256,7 +189,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", -@@ -3924,7 +3904,6 @@ generate_jni("chrome_jni_headers") { +@@ -3930,7 +3913,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", @@ -264,21 +197,10 @@ 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", -@@ -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", -- "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java", -- "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java", -- "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.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/PasswordChangeLauncher.java", -@@ -3998,8 +3974,6 @@ generate_jni("chrome_jni_headers") { - "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandler.java", +@@ -4006,7 +3988,6 @@ generate_jni("chrome_jni_headers") { "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", -- "java/src/org/chromium/chrome/browser/signin/SigninBridge.java", + "java/src/org/chromium/chrome/browser/signin/SigninBridge.java", - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java", "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java", "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java", @@ -286,15 +208,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 -@@ -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", -- "java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.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", -@@ -547,14 +546,11 @@ chrome_java_sources = [ +@@ -598,14 +598,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", @@ -309,7 +223,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", -@@ -644,7 +640,6 @@ chrome_java_sources = [ +@@ -695,7 +692,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", @@ -317,7 +231,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", -@@ -758,7 +753,6 @@ chrome_java_sources = [ +@@ -809,7 +805,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", @@ -325,16 +239,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", -@@ -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", -- "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java", -- "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.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", -@@ -961,14 +953,6 @@ chrome_java_sources = [ +@@ -1015,14 +1010,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", @@ -349,11 +254,8 @@ 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", -@@ -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", -- "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java", +@@ -1061,23 +1048,6 @@ chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyController.java", "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java", - "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java", @@ -390,26 +292,21 @@ diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/androi diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java -@@ -6,10 +6,7 @@ package org.chromium.chrome.browser.autofill_assistant; - +@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.autofill_assistant; import android.accounts.Account; --import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil; --import org.chromium.components.signin.identitymanager.IdentityManager; + import org.chromium.components.signin.identitymanager.IdentityManager; - /** - * Implementation of {@link AssistantAccessTokenUtil} for Chrome. -@@ -19,18 +16,7 @@ public class AssistantAccessTokenUtilChrome implements AssistantAccessTokenUtil - private static final String AUTH_TOKEN_TYPE = - "oauth2:https://www.googleapis.com/auth/userinfo.profile"; +@@ -21,16 +20,9 @@ public class AssistantAccessTokenUtilChrome implements AssistantAccessTokenUtil -- @Override -- public void getAccessToken(Account account, IdentityManager.GetAccessTokenCallback callback) { + @Override + public void getAccessToken(Account account, IdentityManager.GetAccessTokenCallback callback) { - getIdentityManager().getAccessToken(account, AUTH_TOKEN_TYPE, callback); -- } -- + } + @Override public void invalidateAccessToken(String accessToken) { - getIdentityManager().invalidateAccessToken(accessToken); @@ -444,7 +341,7 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java -@@ -10,49 +10,26 @@ import android.graphics.drawable.Drawable; +@@ -10,49 +10,30 @@ import android.graphics.drawable.Drawable; import androidx.annotation.DimenRes; import org.chromium.base.ObserverList; @@ -469,14 +366,14 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro @Override public void addObserver(Observer observer) { -- if (mObservers.isEmpty() && mObservers.addObserver(observer)) { + if (mObservers.isEmpty() && mObservers.addObserver(observer)) { - mProfileCache.addObserver(this); -- } + } } @Override public void removeObserver(Observer observer) { -- if (mObservers.removeObserver(observer) && mObservers.isEmpty()) { + if (mObservers.removeObserver(observer) && mObservers.isEmpty()) { - mProfileCache.removeObserver(this); - } - } @@ -492,13 +389,13 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro - - for (Observer observer : mObservers) { - observer.onProfileImageChanged(profileImage); -- } + } } } diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java -@@ -13,11 +13,9 @@ import androidx.annotation.Nullable; +@@ -13,7 +13,6 @@ import androidx.annotation.Nullable; import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.NativeMethods; import org.chromium.chrome.browser.profiles.Profile; @@ -506,23 +403,7 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro import org.chromium.chrome.browser.ui.TabObscuringHandler; import org.chromium.chrome.browser.ui.TabObscuringHandlerSupplier; import org.chromium.chrome.browser.util.ChromeAccessibilityUtil; --import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil; - import org.chromium.components.autofill_assistant.AssistantDependencies; - import org.chromium.components.autofill_assistant.AssistantEditorFactory; - import org.chromium.components.autofill_assistant.AssistantFeedbackUtil; -@@ -92,11 +90,6 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende - return new AssistantSettingsUtilChrome(); - } - -- @Override -- public AssistantAccessTokenUtil createAccessTokenUtil() { -- return new AssistantAccessTokenUtilChrome(); -- } -- - /** - * Getter for the current profile while assistant is running. Since autofill assistant is only - * available in regular mode and there is only one regular profile in android, this method -@@ -129,10 +122,7 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende +@@ -129,10 +128,7 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende @Nullable public String getSignedInAccountEmailOrNull() { @@ -534,17 +415,6 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro } @Override -diff --git a/chrome/android/features/autofill_assistant/public/java_sources.gni b/chrome/android/features/autofill_assistant/public/java_sources.gni ---- a/chrome/android/features/autofill_assistant/public/java_sources.gni -+++ b/chrome/android/features/autofill_assistant/public/java_sources.gni -@@ -3,7 +3,6 @@ - # found in the LICENSE file. - - public_autofill_assistant_java_sources = [ -- "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java", - "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAddressEditorAutofill.java", - "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillUtilChrome.java", - "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java", diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn @@ -609,16 +479,17 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.net.NetworkTrafficAnnotationTag; import java.util.Collections; -@@ -150,15 +148,7 @@ public class TabSuggestionsServerFetcher implements TabSuggestionsFetcher { +@@ -150,15 +148,12 @@ public class TabSuggestionsServerFetcher implements TabSuggestionsFetcher { // avoid fetching server if the TabGroupsAndroid flag is disabled. We need to move this // flag checking logic to somewhere if this server fetcher supports suggestions other than // grouping in the future. - return isSignedIn() && isServerFetcherFlagEnabled() - && TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext); -- } -- -- @VisibleForTesting -- protected boolean isSignedIn() { ++ return false; + } + + @VisibleForTesting + protected boolean isSignedIn() { - return IdentityServicesProvider.get() - .getIdentityManager(Profile.getLastUsedRegularProfile()) - .hasPrimaryAccount(ConsentLevel.SYNC); @@ -637,20 +508,10 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabSelectionType; import org.chromium.chrome.browser.tabmodel.TabModelObserver; -@@ -69,7 +68,6 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils; - import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; - import org.chromium.components.feature_engagement.EventConstants; - import org.chromium.components.feature_engagement.Tracker; --import org.chromium.components.signin.identitymanager.ConsentLevel; - import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout; - import org.chromium.ui.base.ViewUtils; - import org.chromium.ui.base.WindowAndroid; -@@ -707,17 +705,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe - return mSectionHeaderModel; - } +@@ -709,13 +708,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe -- /** @return The {@link View} for this class. */ -- View getSigninPromoView() { + /** @return The {@link View} for this class. */ + View getSigninPromoView() { - if (mSigninPromoView == null) { - LayoutInflater inflater = LayoutInflater.from(mRootView.getContext()); - mSigninPromoView = inflater.inflate( @@ -658,34 +519,11 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ - false); - } - return mSigninPromoView; -- } -- ++ return null; + } + /** - * Update header views in the Feed. - */ -@@ -731,9 +718,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe - - headers.add(mSectionHeaderView); - -- if (isSignInPromoVisible) { -- headers.add(getSigninPromoView()); -- } - setHeaders(headers); - } - -@@ -742,11 +726,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe - return mMediator; - } - -- @VisibleForTesting -- public View getSignInPromoViewForTesting() { -- return getSigninPromoView(); -- } -- - @VisibleForTesting - public View getSectionHeaderViewForTesting() { - return mSectionHeaderView; -@@ -843,10 +822,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe +@@ -843,10 +836,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe @Override public boolean isSignedIn() { @@ -718,78 +556,33 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger; import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType; import org.chromium.components.browser_ui.widget.listmenu.ListMenu; -@@ -52,10 +47,6 @@ import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties - import org.chromium.components.feed.proto.wire.ReliabilityLoggingEnums.DiscoverLaunchResult; - import org.chromium.components.prefs.PrefService; - import org.chromium.components.search_engines.TemplateUrlService.TemplateUrlServiceObserver; --import org.chromium.components.signin.identitymanager.ConsentLevel; --import org.chromium.components.signin.identitymanager.IdentityManager; --import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; --import org.chromium.components.signin.metrics.SigninAccessPoint; - import org.chromium.components.user_prefs.UserPrefs; - import org.chromium.content_public.browser.LoadUrlParams; - import org.chromium.ui.modelutil.MVCListAdapter; -@@ -75,7 +66,7 @@ import java.util.Locale; - @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) - public class FeedSurfaceMediator - implements FeedSurfaceScrollDelegate, TouchEnabledDelegate, TemplateUrlServiceObserver, -- ListMenu.Delegate, IdentityManager.Observer { -+ ListMenu.Delegate { - private static final String TAG = "FeedSurfaceMediator"; - private static final int INTEREST_FEED_HEADER_POSITION = 0; - -@@ -130,50 +121,6 @@ public class FeedSurfaceMediator - } - } - -- /** -- * The {@link SignInPromo} for the Feed. -- * TODO(huayinz): Update content and visibility through a ModelChangeProcessor. +@@ -133,7 +128,6 @@ public class FeedSurfaceMediator + /** + * The {@link SignInPromo} for the Feed. + * TODO(huayinz): Update content and visibility through a ModelChangeProcessor. - */ -- private class FeedSignInPromo extends SignInPromo { -- FeedSignInPromo(SigninManager signinManager) { -- super(signinManager); -- maybeUpdateSignInPromo(); -- } -- -- @Override -- protected void setVisibilityInternal(boolean visible) { -- if (isVisible() == visible) return; -- -- super.setVisibilityInternal(visible); -- mCoordinator.updateHeaderViews(visible); -- maybeUpdateSignInPromo(); -- } -- -- @Override -- protected void notifyDataChanged() { -- maybeUpdateSignInPromo(); -- } -- + private class FeedSignInPromo extends SignInPromo { + FeedSignInPromo(SigninManager signinManager) { + super(signinManager); +@@ -154,7 +148,7 @@ public class FeedSurfaceMediator + maybeUpdateSignInPromo(); + } + - /** Update the content displayed in {@link PersonalizedSigninPromoView}. */ -- private void maybeUpdateSignInPromo() { -- // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially -- // blocking the UI thread for several seconds if the accounts cache is not populated -- // yet. -- if (isVisible()) { -- mSigninPromoController.setUpSyncPromoView(mProfileDataCache, -- mCoordinator.getSigninPromoView().findViewById( -- R.id.signin_promo_view_container), -- this::onDismissPromo); -- } -- } -- -- @Override -- public void onDismissPromo() { -- super.onDismissPromo(); -- mCoordinator.updateHeaderViews(false); -- } ++ ** Update the content displayed in {@link PersonalizedSigninPromoView}. * + private void maybeUpdateSignInPromo() { + // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially + // blocking the UI thread for several seconds if the accounts cache is not populated +@@ -172,7 +166,7 @@ public class FeedSurfaceMediator + super.onDismissPromo(); + mCoordinator.updateHeaderViews(false); + } - } -- ++ } */ + @VisibleForTesting static void setPrefForTest(PrefChangeRegistrar prefChangeRegistrar, PrefService prefService) { - sTestPrefChangeRegistar = prefChangeRegistrar; -@@ -187,7 +134,6 @@ public class FeedSurfaceMediator +@@ -187,7 +181,6 @@ public class FeedSurfaceMediator private final Context mContext; private final @Nullable SnapScrollHelper mSnapScrollHelper; private final PrefChangeRegistrar mPrefChangeRegistrar; @@ -797,7 +590,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private final PropertyModel mSectionHeaderModel; private final FeedActionDelegate mActionDelegate; private final FeedOptionsCoordinator mOptionsCoordinator; -@@ -196,7 +142,6 @@ public class FeedSurfaceMediator +@@ -196,7 +189,6 @@ public class FeedSurfaceMediator private final ObserverList mScrollListeners = new ObserverList<>(); private ContentChangedListener mStreamContentChangedListener; private MemoryPressureCallback mMemoryPressureCallback; @@ -805,7 +598,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ private RecyclerViewAnimationFinishDetector mRecyclerViewAnimationFinishDetector = new RecyclerViewAnimationFinishDetector(); -@@ -237,8 +182,6 @@ public class FeedSurfaceMediator +@@ -237,8 +229,6 @@ public class FeedSurfaceMediator mCoordinator = coordinator; mContext = context; mSnapScrollHelper = snapScrollHelper; @@ -814,7 +607,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mActionDelegate = actionDelegate; mOptionsCoordinator = optionsCoordinator; -@@ -394,7 +337,6 @@ public class FeedSurfaceMediator +@@ -394,7 +384,6 @@ public class FeedSurfaceMediator mFeedMenuModel = buildMenuItems(); mCoordinator.initializeBubbleTriggering(); @@ -822,7 +615,26 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, mFeedMenuModel); mSectionHeaderModel.set( -@@ -634,17 +576,7 @@ public class FeedSurfaceMediator +@@ -435,8 +424,6 @@ public class FeedSurfaceMediator + }; + mCoordinator.getRecyclerView().addOnScrollListener(mStreamScrollListener); + +- initStreamHeaderViews(); +- + mMemoryPressureCallback = + pressure -> mCoordinator.getRecyclerView().getRecycledViewPool().clear(); + MemoryPressureListener.addCallback(mMemoryPressureCallback); +@@ -624,27 +611,12 @@ public class FeedSurfaceMediator + } + } + +- private void initStreamHeaderViews() { +- boolean signInPromoVisible = shouldShowSigninPromo(); +- mCoordinator.updateHeaderViews(signInPromoVisible); +- } +- + /** + * Determines whether a signin promo should be shown. * @return Whether the SignPromo should be visible. */ private boolean shouldShowSigninPromo() { @@ -841,7 +653,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ } /** Clear any dependencies related to the {@link Stream}. */ -@@ -659,11 +591,6 @@ public class FeedSurfaceMediator +@@ -659,11 +631,6 @@ public class FeedSurfaceMediator MemoryPressureListener.removeCallback(mMemoryPressureCallback); mMemoryPressureCallback = null; @@ -853,7 +665,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ unbindStream(); for (Stream s : mTabToStreamMap.values()) { s.removeOnContentChangedListener(mStreamContentChangedListener); -@@ -674,7 +601,6 @@ public class FeedSurfaceMediator +@@ -674,7 +641,6 @@ public class FeedSurfaceMediator mPrefChangeRegistrar.removeObserver(Pref.ARTICLES_LIST_VISIBLE); TemplateUrlServiceFactory.get().removeObserver(this); @@ -861,7 +673,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY).clear(); -@@ -745,9 +671,6 @@ public class FeedSurfaceMediator +@@ -745,9 +711,6 @@ public class FeedSurfaceMediator // Update toggleswitch item, which is last item in list. mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, buildMenuItems()); @@ -871,7 +683,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ if (suggestionsVisible) mCoordinator.getSurfaceLifecycleManager().show(); mStreamContentChanged = true; -@@ -779,7 +702,7 @@ public class FeedSurfaceMediator +@@ -779,7 +742,7 @@ public class FeedSurfaceMediator } private boolean isSignedIn() { @@ -880,17 +692,46 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/ } /** -@@ -1037,18 +960,6 @@ public class FeedSurfaceMediator - } +@@ -828,35 +791,6 @@ public class FeedSurfaceMediator + + private ModelList buildMenuItems() { + ModelList itemList = new ModelList(); +- int iconId = 0; +- if (isSignedIn()) { +- if (ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)) { +- itemList.add(buildMenuListItem( +- R.string.ntp_manage_feed, R.id.ntp_feed_header_menu_item_manage, iconId)); +- } else { +- itemList.add(buildMenuListItem(R.string.ntp_manage_my_activity, +- R.id.ntp_feed_header_menu_item_activity, iconId)); +- itemList.add(buildMenuListItem(R.string.ntp_manage_interests, +- R.id.ntp_feed_header_menu_item_interest, iconId)); +- if (FeedServiceBridge.isAutoplayEnabled()) { +- itemList.add(buildMenuListItem(R.string.ntp_manage_autoplay, +- R.id.ntp_feed_header_menu_item_autoplay, iconId)); +- } +- if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_V2_HEARTS)) { +- itemList.add(buildMenuListItem(R.string.ntp_manage_reactions, +- R.id.ntp_feed_header_menu_item_reactions, iconId)); +- } +- } +- } else if (FeedServiceBridge.isAutoplayEnabled()) { +- // Show manage autoplay if not signed in. +- itemList.add(buildMenuListItem( +- R.string.ntp_manage_autoplay, R.id.ntp_feed_header_menu_item_autoplay, iconId)); +- } +- itemList.add(buildMenuListItem( +- R.string.learn_more, R.id.ntp_feed_header_menu_item_learn, iconId)); +- itemList.add(getMenuToggleSwitch( +- mSectionHeaderModel.get(SectionHeaderListProperties.IS_SECTION_ENABLED_KEY), +- iconId)); + return itemList; + } + +@@ -1044,11 +978,6 @@ public class FeedSurfaceMediator + updateSectionHeader(); } -- // IdentityManager.Observer interface. -- -- @Override -- public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) { -- updateSectionHeader(); -- } -- - @VisibleForTesting - public SignInPromo getSignInPromoForTesting() { - return mSignInPromo; @@ -902,7 +743,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 -@@ -65,9 +65,7 @@ by a child template that "extends" this file. +@@ -66,9 +66,7 @@ by a child template that "extends" this file. @@ -912,7 +753,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -78,7 +76,6 @@ by a child template that "extends" this file. +@@ -79,7 +77,6 @@ by a child template that "extends" this file. @@ -920,7 +761,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -123,8 +120,6 @@ by a child template that "extends" this file. +@@ -124,8 +121,6 @@ by a child template that "extends" this file. @@ -929,7 +770,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -529,15 +524,6 @@ by a child template that "extends" this file. +@@ -530,15 +525,6 @@ by a child template that "extends" this file. TODO(crbug.com/1093292): investigate why @android:style/Theme.NoDisplay can't be used here. --> @@ -945,7 +786,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% endif %} @@ -1030,7 +871,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 -@@ -85,8 +85,4 @@ +@@ -50,8 +50,4 @@ android:title="@string/cablev2_paask_title" android:summary="@string/cablev2_paask_body" android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/> @@ -1076,7 +917,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b /** * @return An instance of AppDetailsDelegate that can be queried about app information for the * App Banner feature. Will be null if one is unavailable. -@@ -140,13 +128,6 @@ public abstract class AppHooks { +@@ -140,21 +128,6 @@ public abstract class AppHooks { return new FeedbackReporter() {}; } @@ -1086,11 +927,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b - public GoogleActivityController createGoogleActivityController() { - return new GoogleActivityController(); - } +- +- /** +- * @return An instance of {@link GSAHelper} that handles the start point of chrome's integration +- * with GSA. +- */ +- public GSAHelper createGsaHelper() { +- return new GSAHelper(); +- } - /** - * @return An instance of {@link GSAHelper} that handles the start point of chrome's integration - * with GSA. -@@ -279,13 +260,6 @@ public abstract class AppHooks { + * Returns a new instance of HelpAndFeedbackLauncher. + */ +@@ -279,13 +252,6 @@ public abstract class AppHooks { return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED; } @@ -1147,17 +996,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAge diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java -@@ -16,9 +16,6 @@ import org.chromium.base.annotations.JNINamespace; +@@ -16,7 +16,6 @@ import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; --import org.chromium.components.signin.identitymanager.IdentityManager; --import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; + import org.chromium.components.signin.identitymanager.IdentityManager; + import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent; - /** - * Class for watching for changes to the Android preferences that are backed up using Android -@@ -57,15 +54,6 @@ public class ChromeBackupWatcher { +@@ -57,15 +56,6 @@ public class ChromeBackupWatcher { } } }); @@ -1176,7 +1023,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 -@@ -85,7 +85,6 @@ import org.chromium.chrome.browser.download.DownloadUtils; +@@ -83,7 +83,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; @@ -1184,7 +1031,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; -@@ -100,7 +99,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup; +@@ -98,7 +97,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; @@ -1192,17 +1039,16 @@ 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; -@@ -135,9 +133,6 @@ import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification - import org.chromium.chrome.browser.settings.SettingsLauncherImpl; +@@ -135,8 +133,6 @@ import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.suggestions.SuggestionsMetrics; --import org.chromium.chrome.browser.survey.ChromeSurveyController; + import org.chromium.chrome.browser.survey.ChromeSurveyController; -import org.chromium.chrome.browser.sync.ui.SyncErrorMessage; -import org.chromium.chrome.browser.sync.ui.SyncErrorPromptUtils; import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabAssociatedApp; -@@ -671,9 +666,6 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -313,9 +309,6 @@ public abstract class ChromeActivity private boolean mRemoveWindowBackgroundDone; protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler; @@ -1275,7 +1111,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; -@@ -1041,61 +1034,6 @@ public abstract class ChromeActivity +@@ -1052,61 +1045,6 @@ public abstract class ChromeActivity return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR; } @@ -1337,7 +1173,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. -@@ -1229,14 +1167,6 @@ public abstract class ChromeActivity +@@ -1240,14 +1178,6 @@ public abstract class ChromeActivity if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); } @@ -1352,7 +1188,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv super.onStopWithNative(); } -@@ -1327,11 +1257,6 @@ public abstract class ChromeActivity +@@ -1338,11 +1268,6 @@ public abstract class ChromeActivity .recordUserFontPrefOnStartup(); }); @@ -1364,7 +1200,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; -@@ -1346,7 +1271,6 @@ public abstract class ChromeActivity +@@ -1357,7 +1282,6 @@ public abstract class ChromeActivity GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); } mGSAAccountChangeListener.connect(); @@ -1470,7 +1306,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm mImageFetcher = ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE, -@@ -242,9 +235,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -173,11 +166,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter + clearHighlight(); + mElements.clear(); + +- // Restore the header, if it exists, then update it. +- if (hasPromoHeader()) { +- mElements.add(BookmarkListEntry.createSyncPromoHeader(mPromoHeaderType)); +- } +- + updateHeader(false); + if (BookmarkId.SHOPPING_FOLDER.equals(mCurrentFolder)) { + filterForPriceTrackingCategory(bookmarks); +@@ -242,9 +230,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter case ViewType.PERSONALIZED_SIGNIN_PROMO: // fall through case ViewType.PERSONALIZED_SYNC_PROMO: @@ -1482,7 +1330,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm case ViewType.SECTION_HEADER: return createSectionHeaderViewHolder(parent, viewType); case ViewType.FOLDER: -@@ -280,10 +273,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -280,10 +268,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter public void onBindViewHolder(ViewHolder holder, int position) { if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO || holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) { @@ -1493,7 +1341,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) { bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position)); } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) { -@@ -344,7 +333,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -344,7 +328,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter case ViewType.PERSONALIZED_SIGNIN_PROMO: // fall through case ViewType.PERSONALIZED_SYNC_PROMO: @@ -1501,7 +1349,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm break; default: // Other view holders don't have special recycling code. -@@ -367,7 +355,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -367,7 +350,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter updateHeader(true); }; @@ -1509,7 +1357,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm populateTopLevelFoldersList(); mElements = new ArrayList<>(); -@@ -382,8 +369,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -382,8 +364,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter mDelegate.getModel().removeObserver(mBookmarkModelObserver); mDelegate.getSelectionDelegate().removeObserver(this); mDelegate = null; @@ -1518,7 +1366,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } @Override -@@ -478,18 +463,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -478,18 +458,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter setOrder(mElements); } @@ -1537,7 +1385,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the * promo header. This 0th index is null iff there is a promo header. -@@ -510,22 +483,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -510,29 +478,12 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) { mPromoHeaderType = ViewType.INVALID; } else { @@ -1560,7 +1408,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } boolean willShowPromo = hasPromoHeader(); -@@ -648,7 +606,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter + + if (!wasShowingPromo && willShowPromo) { +- // A null element at the 0th index represents a promo header. +- mElements.add(0, BookmarkListEntry.createSyncPromoHeader(mPromoHeaderType)); + if (shouldNotify) notifyItemInserted(0); + } else if (wasShowingPromo && willShowPromo) { + if (shouldNotify) notifyItemChanged(0); +@@ -648,7 +599,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter @VisibleForTesting void simulateSignInForTests() { @@ -1866,28 +1721,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C ClickableSpansTextMessagePreference googleDataTextPref = (ClickableSpansTextMessagePreference) findPreference( ClearBrowsingDataFragment.PREF_GOOGLE_DATA_TEXT); -@@ -120,20 +100,11 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment { +@@ -120,8 +100,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment { boolean isDefaultSearchEngineGoogle = templateUrlService.isDefaultSearchEngineGoogle(); // Google-related links to delete search history and other browsing activity. - if (defaultSearchEngine == null - || !identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN)) { ++ if (defaultSearchEngine == null) { // One of two cases: // 1. The default search engine is disabled. // 2. The user is not signed into Chrome. - // In all those cases, delete the link to clear Google data using MyActivity. - deleteGoogleDataTextIfExists(); -- } else if (isDefaultSearchEngineGoogle) { -- // Signed-in and the DSE is Google. Build the text with two links. -- googleDataTextPref.setSummary(buildGoogleSearchHistoryText()); -- } else { -- // Signed-in and non-Google DSE. Build the text with the MyActivity link only. -- googleDataTextPref.setSummary(buildGoogleMyActivityText()); -- } - - // Text for search history if DSE is not Google. - if (defaultSearchEngine == null || isDefaultSearchEngineGoogle) { -@@ -224,9 +195,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment { +@@ -224,9 +203,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment { } private boolean isHistorySyncEnabled() { @@ -1993,7 +1837,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker } @Override -@@ -134,25 +92,11 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac +@@ -134,25 +92,8 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac */ @SuppressLint("HardwareIds") private ContactDetails constructOwnerInfo(String ownerEmail) { @@ -2002,15 +1846,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker - if (TextUtils.isEmpty(name) || TextUtils.equals(name, ownerEmail)) { - name = CoreAccountInfo.getEmailFrom(getCoreAccountInfo()); - } -+ String name = "nobody@example.com"; - - ContactDetails contact = new ContactDetails(ContactDetails.SELF_CONTACT_ID, name, +- +- ContactDetails contact = new ContactDetails(ContactDetails.SELF_CONTACT_ID, name, ++ ContactDetails contact = new ContactDetails(ContactDetails.SELF_CONTACT_ID, ownerEmail, Collections.singletonList(ownerEmail), /*phoneNumbers=*/null, /*addresses=*/null); - Drawable icon = profileData.getImage(); - contact.setIsSelf(true); +- contact.setIsSelf(true); - contact.setSelfIcon(icon); - return contact; - } +- return contact; +- } - - private CoreAccountInfo getCoreAccountInfo() { - // Since this is read-only operation to obtain email address, always using regular profile @@ -2018,7 +1862,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager( - Profile.getLastUsedRegularProfile()); - return identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC); -- } ++ return null; + } } 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 @@ -2040,18 +1885,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust mConnection.showSignInToastIfNecessary(mSession, getIntent()); new CustomTabTrustedCdnPublisherUrlVisibility( -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java -@@ -265,7 +265,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa - findViewById(android.R.id.content), () -> mPages.size() > 0); - } - -- mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) { -+ mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) { - @Override - public void onFlowIsKnown(Bundle freProperties) { - assert freProperties != null; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java @@ -2063,62 +1896,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR import org.chromium.components.policy.PolicyService; import org.chromium.components.signin.AccountManagerFacade; import org.chromium.components.signin.AccountManagerFacadeProvider; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java -@@ -131,13 +131,11 @@ public abstract class FirstRunFlowSequencer { - public abstract void onFlowIsKnown(Bundle freProperties); - - public FirstRunFlowSequencer( -- Activity activity, OneshotSupplier childAccountStatusSupplier) { -+ Activity activity) { - mActivity = activity; - - mDelegate = sDelegateForTesting != null ? sDelegateForTesting - : new FirstRunFlowSequencerDelegate(); -- -- childAccountStatusSupplier.onAvailable(this::setChildAccountStatus); - } - - /** -@@ -165,12 +163,6 @@ public abstract class FirstRunFlowSequencer { - return mDelegate.shouldShowSyncConsentPage(mActivity, mGoogleAccounts, mIsChild); - } - -- private void setChildAccountStatus(boolean isChild) { -- assert mIsChild == null; -- mIsChild = isChild; -- maybeProcessFreEnvironmentPreNative(); -- } -- - private void setAccountList(List accounts) { - assert mGoogleAccounts == null && accounts != null; - mGoogleAccounts = accounts; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java -@@ -84,9 +84,4 @@ public interface FirstRunPageDelegate { - * See {@link PolicyLoadListener} for details. - */ - OneshotSupplier getPolicyLoadListener(); -- -- /** -- * Returns the supplier that supplies child account status. -- */ -- OneshotSupplier getChildAccountStatusSupplier(); - } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java -@@ -88,7 +88,7 @@ public class LightweightFirstRunActivity - - setFinishOnTouchOutside(true); - -- mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) { -+ mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) { - @Override - public void onFlowIsKnown(Bundle freProperties) { - if (freProperties == null) { @@ -96,9 +96,7 @@ public class LightweightFirstRunActivity return; } @@ -2189,7 +1969,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History mPrefChangeRegistrar.destroy(); } -@@ -453,18 +443,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver +@@ -453,22 +443,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver mHistoryAdapter.removeHeader(); } @@ -2208,7 +1988,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History @Override public void onPreferenceChange() { mObserver.onUserAccountStateChanged(); -@@ -511,4 +489,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver +- mHistoryAdapter.onSignInStateChange(); + } + + /** +@@ -511,4 +488,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver public static void setScrollToLoadDisabledForTesting(boolean isScrollToLoadDisabled) { sIsScrollToLoadDisabledForTests = isScrollToLoadDisabled; } @@ -2227,25 +2011,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.toolbar.ButtonData; import org.chromium.chrome.browser.toolbar.ButtonData.ButtonSpec; -@@ -35,10 +33,6 @@ import org.chromium.components.browser_ui.settings.SettingsLauncher; - import org.chromium.components.feature_engagement.EventConstants; +@@ -36,9 +34,6 @@ import org.chromium.components.feature_engagement.EventConstants; import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.feature_engagement.Tracker; --import org.chromium.components.signin.base.CoreAccountInfo; + 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; -@@ -47,8 +41,8 @@ import java.lang.annotation.RetentionPolicy; +@@ -47,8 +42,7 @@ import java.lang.annotation.RetentionPolicy; * Handles displaying IdentityDisc on toolbar depending on several conditions * (user sign-in state, whether NTP is shown) */ -public class IdentityDiscController implements NativeInitObserver, ProfileDataCache.Observer, - IdentityManager.Observer, ButtonDataProvider { -+public class IdentityDiscController implements NativeInitObserver, -+ ButtonDataProvider { ++public class IdentityDiscController implements NativeInitObserver, ButtonDataProvider { // Visual state of Identity Disc. @Retention(RetentionPolicy.SOURCE) @IntDef({IdentityDiscState.NONE, IdentityDiscState.SMALL, IdentityDiscState.LARGE}) @@ -2265,26 +2047,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I // Identity disc visibility state. @IdentityDiscState private int mState = IdentityDiscState.NONE; -@@ -165,18 +150,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa - assert !mButtonData.canShow(); - return; - } -- -- String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo()); -- mState = email == null ? IdentityDiscState.NONE : IdentityDiscState.SMALL; -- ensureProfileDataCache(email, mState); -- -- if (mState != IdentityDiscState.NONE) { -- mButtonData.setButtonSpec( -- buttonSpecWithDrawable(mButtonData.getButtonSpec(), getProfileImage(email))); -- mButtonData.setCanShow(true); -- } else { -- mButtonData.setCanShow(false); -- } - } - - private static ButtonSpec buttonSpecWithDrawable(ButtonSpec buttonSpec, Drawable drawable) { -@@ -191,24 +164,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa +@@ -191,16 +176,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa * IdentityDiscController for profile data updates. */ private void ensureProfileDataCache(String accountName, @IdentityDiscState int state) { @@ -2298,18 +2061,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I - ProfileDataCache.createWithoutBadge(mContext, dimension_id); - profileDataCache.addObserver(this); - mProfileDataCache[state] = profileDataCache; -- } -- -- /** -- * Returns Profile picture Drawable. The size of the image corresponds to current visual state. -- */ -- private Drawable getProfileImage(String accountName) { -- assert mState != IdentityDiscState.NONE; -- return mProfileDataCache[mState].getProfileDataOrDefault(accountName).getImage(); } /** -@@ -216,13 +171,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa +@@ -208,7 +183,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa + */ + private Drawable getProfileImage(String accountName) { + assert mState != IdentityDiscState.NONE; +- return mProfileDataCache[mState].getProfileDataOrDefault(accountName).getImage(); ++ return null; + } + + /** +@@ -216,13 +191,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa * when sign-in state changes. */ private void resetIdentityDiscCache() { @@ -2323,7 +2087,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I } private void notifyObservers(boolean hint) { -@@ -231,47 +179,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa +@@ -231,47 +199,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa } } @@ -2371,7 +2135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I /** * Call to tear down dependencies. */ -@@ -282,18 +189,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa +@@ -282,18 +209,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa mActivityLifecycleDispatcher = null; } @@ -2390,23 +2154,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I if (mNativeIsInitialized) { mProfileSupplier.removeObserver(mProfileSupplierObserver); } -@@ -310,32 +205,10 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa - RecordUserAction.record("MobileToolbarIdentityDiscTap"); - } - -- /** -- * Returns the account info of mIdentityManager if current profile is regular, and -- * null for off-the-record ones. -- * @return account info for the current profile. Returns null for OTR profile. -- */ -- private CoreAccountInfo getSignedInAccountInfo() { +@@ -316,9 +231,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa + * @return account info for the current profile. Returns null for OTR profile. + */ + private CoreAccountInfo getSignedInAccountInfo() { - return mIdentityManager != null - ? mIdentityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN) - : null; -- } -- ++ return null; + } + /** - * Triggered by mProfileSupplierObserver when profile is changed in mProfileSupplier. +@@ -326,16 +239,5 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa * mIdentityManager is updated with the profile, as set to null if profile is off-the-record. */ private void setProfile(Profile profile) { @@ -2423,109 +2182,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I - } } } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java -@@ -12,29 +12,26 @@ import org.chromium.components.infobars.ConfirmInfoBar; - import org.chromium.components.infobars.InfoBar; - import org.chromium.components.infobars.InfoBarControlLayout; - import org.chromium.components.infobars.InfoBarLayout; --import org.chromium.components.signin.base.AccountInfo; - - /** - * The Save Password infobar asks the user whether they want to save the password for the site. - */ - public class SavePasswordInfoBar extends ConfirmInfoBar { - private final String mDetailsMessage; -- private final AccountInfo mAccountInfo; - - @CalledByNative - private static InfoBar show(int iconId, String message, String detailsMessage, -- String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) { -+ String primaryButtonText, String secondaryButtonText) { - // If accountInfo is empty, no footer will be shown. - return new SavePasswordInfoBar(iconId, message, detailsMessage, primaryButtonText, -- secondaryButtonText, accountInfo); -+ secondaryButtonText); - } - - private SavePasswordInfoBar(int iconDrawbleId, String message, String detailsMessage, -- String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) { -+ String primaryButtonText, String secondaryButtonText) { - super(iconDrawbleId, R.color.infobar_icon_drawable_color, null, message, null, - primaryButtonText, secondaryButtonText); - mDetailsMessage = detailsMessage; -- mAccountInfo = accountInfo; - } - - @Override -@@ -44,11 +41,5 @@ public class SavePasswordInfoBar extends ConfirmInfoBar { - InfoBarControlLayout detailsMessageLayout = layout.addControlLayout(); - detailsMessageLayout.addDescription(mDetailsMessage); - } -- -- if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail()) -- && mAccountInfo.getAccountImage() != null) { -- layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter( -- layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail())); -- } - } - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java -@@ -14,7 +14,6 @@ import org.chromium.components.infobars.InfoBar; - import org.chromium.components.infobars.InfoBarControlLayout; - import org.chromium.components.infobars.InfoBarControlLayout.InfoBarArrayAdapter; - import org.chromium.components.infobars.InfoBarLayout; --import org.chromium.components.signin.base.AccountInfo; - - /** - * The Update Password infobar offers the user the ability to update a password for the site. -@@ -23,27 +22,23 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar { - private final String[] mUsernames; - private final int mUsernameIndex; - private final String mDetailsMessage; -- private final AccountInfo mAccountInfo; - private Spinner mUsernamesSpinner; - - @CalledByNative - private static InfoBar show(int iconId, String[] usernames, int selectedUsername, -- String message, String detailsMessage, String primaryButtonText, -- AccountInfo accountInfo) { -+ String message, String detailsMessage, String primaryButtonText) { - // If accountInfo is empty, no footer will be shown. - return new UpdatePasswordInfoBar(iconId, usernames, selectedUsername, message, -- detailsMessage, primaryButtonText, accountInfo); -+ detailsMessage, primaryButtonText); - } - - private UpdatePasswordInfoBar(int iconDrawableId, String[] usernames, int selectedUsername, -- String message, String detailsMessage, String primaryButtonText, -- AccountInfo accountInfo) { -+ String message, String detailsMessage, String primaryButtonText) { - super(iconDrawableId, R.color.infobar_icon_drawable_color, null, message, null, - primaryButtonText, null); - mDetailsMessage = detailsMessage; - mUsernames = usernames; - mUsernameIndex = selectedUsername; -- mAccountInfo = accountInfo; - } - - @Override -@@ -65,12 +60,6 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar { - InfoBarControlLayout detailsMessageLayout = layout.addControlLayout(); - detailsMessageLayout.addDescription(mDetailsMessage); - } -- -- if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail()) -- && mAccountInfo.getAccountImage() != null) { -- layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter( -- layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail())); -- } - } - - @CalledByNative diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java @@ -2556,7 +2212,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData; import org.chromium.chrome.browser.tasks.tab_management.PriceTrackingUtilities; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager; -@@ -196,11 +195,6 @@ public class ProcessInitializationHandler { +@@ -100,8 +99,6 @@ import org.chromium.components.content_capture.PlatformContentCaptureController; + import org.chromium.components.embedder_support.util.UrlUtilities; + import org.chromium.components.minidump_uploader.CrashFileManager; + import org.chromium.components.optimization_guide.proto.HintsProto; +-import org.chromium.components.signin.AccountManagerFacadeImpl; +-import org.chromium.components.signin.AccountManagerFacadeProvider; + import org.chromium.components.version_info.Channel; + import org.chromium.components.version_info.VersionConstants; + import org.chromium.components.version_info.VersionInfo; +@@ -196,11 +193,6 @@ public class ProcessInitializationHandler { Context application = ContextUtils.getApplicationContext(); @@ -2568,7 +2233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni // For ANR uploading - we set the version number so that when we ask Android for our ANRs, // it can also give us the version it happened on. This helps in the case that before we can // report the ANR, our app gets updated. -@@ -398,7 +392,6 @@ public class ProcessInitializationHandler { +@@ -398,7 +390,6 @@ public class ProcessInitializationHandler { deferredStartupHandler.addDeferredTask(new Runnable() { @Override public void run() { @@ -2579,7 +2244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -15,22 +15,12 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager; +@@ -15,20 +15,11 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab; import org.chromium.chrome.browser.profiles.Profile; @@ -2598,21 +2263,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM -import org.chromium.chrome.browser.ui.signin.SigninPromoController; -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState; import org.chromium.components.signin.AccountManagerFacadeProvider; --import org.chromium.components.signin.AccountsChangeObserver; + import org.chromium.components.signin.AccountsChangeObserver; import org.chromium.components.signin.identitymanager.ConsentLevel; - import org.chromium.components.signin.metrics.SigninAccessPoint; - import org.chromium.url.GURL; -@@ -42,8 +32,7 @@ import java.util.Map; +@@ -42,8 +33,7 @@ import java.util.Map; /** * Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter. */ -public class RecentTabsManager implements SyncService.SyncStateChangedListener, SignInStateObserver, - ProfileDataCache.Observer, AccountsChangeObserver { -+public class RecentTabsManager { ++public class RecentTabsManager implements AccountsChangeObserver { /** * Implement this to receive updates when the page contents change. */ -@@ -64,21 +53,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -64,21 +54,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, private final Runnable mShowHistoryManager; private TabModel mTabModel; @@ -2634,7 +2297,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 -@@ -110,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -109,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null ? sRecentlyClosedTabManagerForTests : new RecentlyClosedBridge(profile, tabModelSelector); @@ -2647,20 +2310,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries); updateRecentlyClosedEntries(); -@@ -124,12 +101,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -123,11 +101,7 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, updateForeignSessions(); mForeignSessionHelper.triggerSessionSync(); - mSyncService.addSyncStateChangedListener(this); - mSignInManager.addSignInStateObserver(this); - mProfileDataCache.addObserver(this); -- AccountManagerFacadeProvider.getInstance().addObserver(this); + AccountManagerFacadeProvider.getInstance().addObserver(this); - updatePromoState(); -- + SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened(); } - -@@ -167,14 +138,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -166,12 +140,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, recordEntries("Group", mGroupSessionIdsRestored); recordEntries("Bulk", mBulkSessionIdsRestored); @@ -2670,15 +2332,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM - mSignInManager = null; - - mProfileDataCache.removeObserver(this); -- AccountManagerFacadeProvider.getInstance().removeObserver(this); -- - mFaviconHelper.destroy(); - mFaviconHelper = null; + AccountManagerFacadeProvider.getInstance().removeObserver(this); -@@ -419,80 +382,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, - return mPrefs.getSyncPromoCollapsed(); + mFaviconHelper.destroy(); +@@ -406,7 +374,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, + */ + public void setPromoCollapsed(boolean isCollapsed) { + if (mIsDestroyed) return; +- mPrefs.setSyncPromoCollapsed(isCollapsed); } + /** +@@ -415,63 +382,7 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, + * @return Whether the promo is collapsed. + */ + public boolean isPromoCollapsed() { +- return mPrefs.getSyncPromoCollapsed(); +- } +- - /** Returns the current promo state. */ - @SyncPromoState - int getPromoState() { @@ -2733,14 +2404,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM - @Override - public void onSignedOut() { - update(); -- } -- -- // AccountsChangeObserver implementation. -- @Override -- public void onAccountsChanged() { -- update(); -- } -- ++ return true; + } + + // AccountsChangeObserver implementation. +@@ -480,18 +391,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, + update(); + } + - // ProfileDataCache.Observer implementation. - @Override - public void onProfileDataUpdated(String accountEmail) { @@ -2756,7 +2427,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM private void onUpdateDone() { if (mUpdatedCallback != null) { mUpdatedCallback.onUpdated(); -@@ -500,7 +389,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, +@@ -499,7 +398,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener, } private void update() { @@ -2767,7 +2438,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java -@@ -31,15 +31,12 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -31,11 +31,9 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab; import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow; @@ -2779,35 +2450,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR import org.chromium.components.browser_ui.styles.SemanticColorUtils; import org.chromium.components.browser_ui.widget.RoundedIconGenerator; import org.chromium.components.embedder_support.util.UrlUtilities; --import org.chromium.components.signin.metrics.SigninAccessPoint; - import org.chromium.ui.base.DeviceFormFactor; - import org.chromium.ui.mojom.WindowOpenDisposition; - import org.chromium.url.GURL; -@@ -432,38 +429,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { - } - } - -- /** A group containing the personalized sync promo. */ -- class PersonalizedSyncPromoGroup extends PromoGroup { -- private final @ChildType int mChildType; -- -- PersonalizedSyncPromoGroup(@ChildType int childType) { -- assert childType == ChildType.PERSONALIZED_SIGNIN_PROMO -- || childType -- == ChildType.PERSONALIZED_SYNC_PROMO : "Unsupported child type:" -- + childType; -- mChildType = childType; -- } -- -- @Override -- @ChildType -- int getChildType() { -- return mChildType; -- } -- -- @Override -- View getChildView( -- int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { +@@ -453,14 +451,7 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { + @Override + View getChildView( + int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { - if (convertView == null) { - LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext()); - convertView = layoutInflater.inflate( @@ -2816,13 +2462,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR - mRecentTabsManager.setUpSyncPromoView( - convertView.findViewById(R.id.signin_promo_view_container)); - return convertView; -- } -- } -- - /** - * A group containing the sync promo. - */ -@@ -476,9 +441,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { ++ return null; + } + } + +@@ -476,9 +467,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { @Override View getChildView( int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { @@ -2832,7 +2476,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsR return convertView; } } -@@ -904,22 +866,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { +@@ -904,22 +892,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter { addGroup(new ForeignSessionGroup(session)); } @@ -2887,10 +2531,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage if (avatar == null) { avatar = AppCompatResources.getDrawable( - getContext(), R.drawable.logo_avatar_anonymous); -+ getContext(), R.drawable.omnibox_info); ++ getContext(), R.drawable.ic_help_and_feedback); } avatarView.setImageDrawable(avatar); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java +@@ -47,7 +47,7 @@ public class AutoSigninSnackbarController implements SnackbarManager.SnackbarCon + Snackbar snackbar = Snackbar.make( + text, snackbarController, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_AUTO_LOGIN); + int backgroundColor = SemanticColorUtils.getDefaultControlColorActive(activity); +- Drawable icon = AppCompatResources.getDrawable(activity, R.drawable.logo_avatar_anonymous); ++ Drawable icon = AppCompatResources.getDrawable(activity, R.drawable.ic_help_and_feedback); + snackbar.setSingleLine(false) + .setBackgroundColor(backgroundColor) + .setProfileImage(icon) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java @@ -2902,7 +2558,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; -@@ -32,20 +31,8 @@ public class PasswordManagerLauncher { +@@ -32,20 +31,12 @@ public class PasswordManagerLauncher { public static void showPasswordSettings(Activity activity, @ManagePasswordsReferrer int referrer, ObservableSupplier modalDialogManagerSupplier) { @@ -2914,13 +2570,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage - ChromeFeatureList.PASSWORD_DOMAIN_CAPABILITIES_FETCHING))) { - PasswordScriptsFetcherBridge.prewarmCache(); - } -- CredentialManagerLauncher credentialManagerLauncher = -- PasswordManagerHelper.usesUnifiedPasswordManagerUI() -- ? CredentialManagerLauncherFactory.getInstance().createLauncher() -- : null; + CredentialManagerLauncher credentialManagerLauncher = + PasswordManagerHelper.usesUnifiedPasswordManagerUI() + ? CredentialManagerLauncherFactory.getInstance().createLauncher() + : null; PasswordManagerHelper.showPasswordSettings(activity, referrer, new SettingsLauncherImpl(), - credentialManagerLauncher, syncService, modalDialogManagerSupplier); -+ null, modalDialogManagerSupplier); ++ credentialManagerLauncher, modalDialogManagerSupplier); } @CalledByNative @@ -2936,16 +2592,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; -@@ -68,7 +66,7 @@ import org.chromium.chrome.browser.ApplicationLifetime; +@@ -63,7 +61,7 @@ import java.util.Locale; */ public class PasswordSettings extends PreferenceFragmentCompat implements PasswordManagerHandler.PasswordListObserver, -- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener, -+ Preference.OnPreferenceClickListener, - INeedSnackbarManager { +- Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener { ++ Preference.OnPreferenceClickListener { @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN, TrustedVaultBannerState.OPTED_IN}) -@@ -176,10 +174,6 @@ public class PasswordSettings extends PreferenceFragmentCompat + @Retention(RetentionPolicy.SOURCE) +@@ -162,10 +160,6 @@ public class PasswordSettings extends PreferenceFragmentCompat setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext())); PasswordManagerHandlerProvider.getInstance().addObserver(this); @@ -2956,7 +2612,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); -@@ -487,9 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -472,9 +466,6 @@ public class PasswordSettings extends PreferenceFragmentCompat public void onDestroy() { super.onDestroy(); @@ -2966,7 +2622,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. -@@ -667,34 +658,6 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -587,34 +578,6 @@ public class PasswordSettings extends PreferenceFragmentCompat } private void displayManageAccountLink() { @@ -3001,7 +2657,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } private Context getStyledContext() { -@@ -705,43 +668,11 @@ public class PasswordSettings extends PreferenceFragmentCompat +@@ -625,43 +588,11 @@ public class PasswordSettings extends PreferenceFragmentCompat return UserPrefs.get(Profile.getLastUsedRegularProfile()); } @@ -3061,7 +2717,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/Pay @Nullable private String getSignedInUsersEmail() { - if (mProfile.isOffTheRecord()) { - return null; +- return null; - } - - IdentityManager identityManager = @@ -3070,13 +2726,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/Pay - CoreAccountInfo info = identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC); - if (info == null) return null; - return info.getEmail(); ++ return null; } private Callback createUpdateSectionCallback(@DataType final int type) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- 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 -@@ -34,9 +34,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen +@@ -31,9 +31,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; @@ -3085,26 +2742,22 @@ 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.SpinnerPreference; -@@ -67,7 +64,6 @@ public class PrivacySettings + import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; +@@ -55,7 +52,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_PROXY_OPTIONS = "proxy"; + private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; private static final String PREF_PRIVACY_REVIEW = "privacy_review"; -@@ -142,9 +138,6 @@ public class PrivacySettings +@@ -126,36 +122,9 @@ 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(); } @@ -3132,9 +2785,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting - new SpanApplier.SpanInfo("", "", servicesLink)); - } - - 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"; - + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + String key = preference.getKey(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -3359,18 +3012,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe 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 -@@ -63,7 +63,6 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator; +@@ -59,11 +59,9 @@ import org.chromium.chrome.browser.privacy_sandbox.FlocSettingsFragment; + import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment; + import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.profiles.ProfileManagerUtils; +-import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator; import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment; 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; -@@ -376,17 +375,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity + import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; +@@ -371,19 +369,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity + fragmentHelpAndFeedbackLauncher.setHelpAndFeedbackLauncher( HelpAndFeedbackLauncherImpl.getInstance()); } - if (fragment instanceof SafetyCheckSettingsFragment) { +- if (fragment instanceof SafetyCheckSettingsFragment) { - PasswordCheckupClientHelper checkupHelper = null; - if (PasswordManagerHelper.canUseUpmCheckup()) { - // At this point it can still happen that the helper cannot be created. @@ -3382,10 +3040,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin - new SafetyCheckUpdatesDelegateImpl(this), mSettingsLauncher, - SyncConsentActivityLauncherImpl.get(), checkupHelper, - getModalDialogManagerSupplier()); -+ // not supported - } +- } if (fragment instanceof PasswordCheckFragmentView) { PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment, + HelpAndFeedbackLauncherImpl.getInstance(), mSettingsLauncher, +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/share/crow/CrowButtonDelegateImpl.java +@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity; + import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; + import org.chromium.chrome.browser.profiles.Profile; +-import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge; + import org.chromium.chrome.browser.tab.Tab; + import org.chromium.ui.util.ColorUtils; + import org.chromium.url.GURL; +@@ -137,9 +136,7 @@ public class CrowButtonDelegateImpl implements CrowButtonDelegate { + + private boolean areMetricsEnabled() { + // Require UMA and "Make searches and browsing better" to be enabled. +- return (PrivacyPreferencesManagerImpl.getInstance().isUsageAndCrashReportingPermitted() +- && UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled( +- Profile.getLastUsedRegularProfile())); ++ return false; + } + + @VisibleForTesting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java @@ -3411,10 +3091,40 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_ onInitialLayoutInflationComplete(); } +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java +@@ -274,7 +274,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { + .with(MessageBannerProperties.TITLE, + resources.getString(R.string.chrome_survey_message_title)) + .with(MessageBannerProperties.ICON_RESOURCE_ID, +- R.drawable.chrome_sync_logo) ++ R.drawable.ic_help_and_feedback) + .with(MessageBannerProperties.ICON_TINT_COLOR, + MessageBannerProperties.TINT_NONE) + .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT, +@@ -348,7 +348,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { + InfoBarContainer.get(tab).addAnimationListener(this); + + SurveyInfoBar.showSurveyInfoBar( +- tab.getWebContents(), R.drawable.chrome_sync_logo, getSurveyInfoBarDelegate()); ++ tab.getWebContents(), R.drawable.ic_help_and_feedback, getSurveyInfoBarDelegate()); + + RecordUserAction.record("Android.Survey.ShowSurveyInfoBar"); + } +@@ -361,7 +361,7 @@ public class ChromeSurveyController implements InfoBarAnimationListener { + */ + private void showSurvey(String siteId) { + SurveyController.getInstance().showSurveyIfAvailable( +- mActivity, siteId, true, R.drawable.chrome_sync_logo, mLifecycleDispatcher); ++ mActivity, siteId, true, R.drawable.ic_help_and_feedback, mLifecycleDispatcher); + } + + /** 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 -@@ -78,7 +78,6 @@ import org.chromium.chrome.browser.share.ShareDelegate; +@@ -79,7 +79,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; @@ -3422,7 +3132,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; -@@ -99,7 +98,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; +@@ -100,7 +99,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; @@ -3430,7 +3140,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; -@@ -903,21 +901,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -902,21 +900,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { return isShowingPromo; } */ return false; } @@ -3489,116 +3199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -349,8 +349,6 @@ static_library("browser") { - "component_updater/trust_token_key_commitments_component_installer.h", - "component_updater/url_param_classification_component_installer.cc", - "component_updater/url_param_classification_component_installer.h", -- "consent_auditor/consent_auditor_factory.cc", -- "consent_auditor/consent_auditor_factory.h", - "content_index/content_index_metrics.cc", - "content_index/content_index_metrics.h", - "content_index/content_index_provider_factory.cc", -@@ -1611,58 +1609,6 @@ static_library("browser") { - "sharing/web_push/web_push_sender.h", - "shell_integration.cc", - "shell_integration.h", -- "signin/about_signin_internals_factory.cc", -- "signin/about_signin_internals_factory.h", -- "signin/account_consistency_mode_manager.cc", -- "signin/account_consistency_mode_manager.h", -- "signin/account_consistency_mode_manager_factory.cc", -- "signin/account_consistency_mode_manager_factory.h", -- "signin/account_id_from_account_info.cc", -- "signin/account_id_from_account_info.h", -- "signin/account_investigator_factory.cc", -- "signin/account_investigator_factory.h", -- "signin/account_reconcilor_factory.cc", -- "signin/account_reconcilor_factory.h", -- "signin/chrome_device_id_helper.cc", -- "signin/chrome_device_id_helper.h", -- "signin/chrome_signin_client.cc", -- "signin/chrome_signin_client.h", -- "signin/chrome_signin_client_factory.cc", -- "signin/chrome_signin_client_factory.h", -- "signin/chrome_signin_helper.cc", -- "signin/chrome_signin_helper.h", -- "signin/chrome_signin_proxying_url_loader_factory.cc", -- "signin/chrome_signin_proxying_url_loader_factory.h", -- "signin/chrome_signin_url_loader_throttle.cc", -- "signin/chrome_signin_url_loader_throttle.h", -- "signin/cookie_reminter_factory.cc", -- "signin/cookie_reminter_factory.h", -- "signin/header_modification_delegate.h", -- "signin/header_modification_delegate_impl.cc", -- "signin/header_modification_delegate_impl.h", -- "signin/identity_manager_factory.cc", -- "signin/identity_manager_factory.h", -- "signin/investigator_dependency_provider.cc", -- "signin/investigator_dependency_provider.h", -- "signin/primary_account_policy_manager.cc", -- "signin/primary_account_policy_manager.h", -- "signin/primary_account_policy_manager_factory.cc", -- "signin/primary_account_policy_manager_factory.h", -- "signin/reauth_result.h", -- "signin/reauth_tab_helper.cc", -- "signin/reauth_tab_helper.h", -- "signin/signin_error_controller_factory.cc", -- "signin/signin_error_controller_factory.h", -- "signin/signin_features.cc", -- "signin/signin_features.h", -- "signin/signin_profile_attributes_updater.cc", -- "signin/signin_profile_attributes_updater.h", -- "signin/signin_profile_attributes_updater_factory.cc", -- "signin/signin_profile_attributes_updater_factory.h", -- "signin/signin_promo_util.cc", -- "signin/signin_promo_util.h", -- "signin/signin_util.cc", -- "signin/signin_util.h", - "site_isolation/about_flags.h", - "site_isolation/prefs_observer.cc", - "site_isolation/prefs_observer.h", -@@ -1734,40 +1680,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 +1905,6 @@ static_library("browser") { +@@ -1986,7 +1986,6 @@ static_library("browser") { "//chrome/browser/share", "//chrome/browser/sharing:buildflags", "//chrome/browser/sharing/proto", @@ -3606,134 +3207,37 @@ 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", -@@ -2265,10 +2176,6 @@ static_library("browser") { - "//components/services/unzip/public/mojom", - "//components/sessions", - "//components/shared_highlighting/core/common", -- "//components/signin/core/browser", -- "//components/signin/public/base:signin_buildflags", -- "//components/signin/public/identity_manager", -- "//components/signin/public/webdata", - "//components/site_engagement/content", - "//components/site_engagement/core/mojom:mojo_bindings", - "//components/site_isolation", -@@ -2923,16 +2830,6 @@ static_library("browser") { - "android/service_tab_launcher.h", - "android/shortcut_helper.cc", - "android/shortcut_helper.h", -- "android/signin/fre_mobile_identity_consistency_field_trial.cc", -- "android/signin/fre_mobile_identity_consistency_field_trial.h", -- "android/signin/signin_bridge.cc", -- "android/signin/signin_bridge.h", +@@ -2938,8 +2937,6 @@ static_library("browser") { + "android/signin/fre_mobile_identity_consistency_field_trial.h", + "android/signin/signin_bridge.cc", + "android/signin/signin_bridge.h", - "android/signin/signin_manager_android.cc", - "android/signin/signin_manager_android.h", -- "android/signin/signin_metrics_utils.cc", -- "android/signin/unified_consent_service_bridge.cc", -- "android/signin/web_signin_bridge.cc", -- "android/signin/web_signin_bridge.h", - "android/startup_bridge.cc", - "android/startup_bridge.h", - "android/survey/http_client_type.cc", -@@ -3201,16 +3098,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", -- "password_manager/android/account_chooser_dialog_android.cc", -- "password_manager/android/account_chooser_dialog_android.h", - "password_manager/android/all_passwords_bottom_sheet_controller.cc", - "password_manager/android/all_passwords_bottom_sheet_controller.h", - "password_manager/android/all_passwords_bottom_sheet_helper.cc", - "password_manager/android/all_passwords_bottom_sheet_helper.h", -- "password_manager/android/auto_signin_first_run_dialog_android.cc", -- "password_manager/android/auto_signin_first_run_dialog_android.h", -- "password_manager/android/auto_signin_prompt_controller.cc", -- "password_manager/android/auto_signin_prompt_controller.h", - "password_manager/android/credential_android.cc", - "password_manager/android/credential_android.h", - "password_manager/android/credential_leak_controller_android.cc", -@@ -3314,27 +3205,12 @@ static_library("browser") { - "sharing/sms/sms_fetch_request_handler.cc", + "android/signin/signin_metrics_utils.cc", + "android/signin/unified_consent_service_bridge.cc", + "android/signin/web_signin_bridge.cc", +@@ -3326,8 +3323,6 @@ static_library("browser") { "sharing/sms/sms_fetch_request_handler.h", "shell_integration_android.cc", -- "signin/identity_services_provider_android.cc", + "signin/identity_services_provider_android.cc", - "signin/signin_manager_android_factory.cc", - "signin/signin_manager_android_factory.h", "ssl/chrome_security_state_client.cc", "ssl/chrome_security_state_client.h", "ssl/chrome_security_state_model_delegate.cc", - "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", +@@ -3342,8 +3337,6 @@ static_library("browser") { + "sync/glue/synced_window_delegate_android.h", + "sync/glue/synced_window_delegates_getter_android.cc", + "sync/glue/synced_window_delegates_getter_android.h", - "sync/sync_error_infobar_delegate_android.cc", - "sync/sync_error_infobar_delegate_android.h", -- "sync/trusted_vault_client_android.cc", -- "sync/trusted_vault_client_android.h", + "sync/trusted_vault_client_android.cc", + "sync/trusted_vault_client_android.h", "tab/web_contents_state.cc", - "tab/web_contents_state.h", - "touch_to_fill/touch_to_fill_controller.cc", -@@ -3411,8 +3287,6 @@ static_library("browser") { - "//chrome/browser/safety_check/android", - "//chrome/browser/share/android:jni_headers", - "//chrome/browser/share/core/crow:crow_configuration", -- "//chrome/browser/signin/services/android:jni_headers", -- "//chrome/browser/sync/android:jni_headers", - "//chrome/browser/tab:jni_headers", - "//chrome/browser/ui/android/layouts:android", - "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings", -@@ -3493,8 +3367,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", -- "//components/signin/internal/identity_manager", # cf android/signin/DEPS -- "//components/signin/public/android:jni_headers", - "//components/subresource_filter/android", - "//components/thin_webview/internal", - "//components/translate/content/android", -@@ -4270,12 +4142,6 @@ static_library("browser") { - "sharing_hub/sharing_hub_service.h", - "sharing_hub/sharing_hub_service_factory.cc", - "sharing_hub/sharing_hub_service_factory.h", -- "signin/signin_promo.cc", -- "signin/signin_promo.h", -- "signin/signin_ui_delegate.cc", -- "signin/signin_ui_delegate.h", -- "signin/signin_ui_util.cc", -- "signin/signin_ui_util.h", - "speech/chrome_speech_recognition_service.cc", - "speech/chrome_speech_recognition_service.h", - "speech/extension_api/tts_extension_api_constants.cc", # Should be moved -@@ -5098,8 +4964,6 @@ static_library("browser") { - "profiles/gaia_info_update_service.h", - "profiles/gaia_info_update_service_factory.cc", - "profiles/gaia_info_update_service_factory.h", -- "signin/chrome_signin_and_sync_status_metrics_provider.cc", -- "signin/chrome_signin_and_sync_status_metrics_provider.h", - ] - - if (!is_android && !is_chromeos_lacros) { -@@ -5353,8 +5217,6 @@ static_library("browser") { - "notifications/notification_platform_bridge_lacros.cc", - "notifications/notification_platform_bridge_lacros.h", - "platform_util_lacros.cc", -- "signin/signin_ui_delegate_impl_lacros.cc", -- "signin/signin_ui_delegate_impl_lacros.h", - "speech/tts_client_factory_lacros.cc", - "speech/tts_client_factory_lacros.h", - "speech/tts_client_lacros.cc", -@@ -6243,12 +6105,6 @@ static_library("browser") { - "profiles/profile_statistics_common.h", - "profiles/profile_statistics_factory.cc", +@@ -6257,10 +6250,6 @@ static_library("browser") { "profiles/profile_statistics_factory.h", -- "signin/force_signin_verifier.cc", -- "signin/force_signin_verifier.h", + "signin/force_signin_verifier.cc", + "signin/force_signin_verifier.h", - "signin/signin_manager.cc", - "signin/signin_manager.h", - "signin/signin_manager_factory.cc", @@ -3741,492 +3245,6 @@ 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", -@@ -7783,10 +7639,6 @@ static_library("test_support") { - "resource_coordinator/tab_load_tracker_test_support.h", - "share/fake_share_history.cc", - "share/fake_share_history.h", -- "signin/chrome_signin_client_test_util.cc", -- "signin/chrome_signin_client_test_util.h", -- "signin/e2e_tests/test_accounts_util.cc", -- "signin/e2e_tests/test_accounts_util.h", - "ssl/ssl_browsertest_util.cc", - "ssl/ssl_browsertest_util.h", - "ssl/ssl_client_auth_requestor_mock.cc", -@@ -7832,7 +7684,6 @@ static_library("test_support") { - "//components/security_interstitials/content:security_interstitial_page", - "//components/services/unzip/content", - "//components/sessions:test_support", -- "//components/signin/public/identity_manager:test_support", - "//components/subresource_filter/core/browser:test_support", - "//components/subresource_filter/core/common:test_support", - "//components/sync_preferences:test_support", -@@ -8074,8 +7925,6 @@ if (!is_android) { - visibility = [ "//chrome/test:test_support_ui" ] - - sources = [ -- "signin/token_revoker_test_utils.cc", -- "signin/token_revoker_test_utils.h", - "ui/webui/test_data_source.cc", - "ui/webui/test_data_source.h", - "ui/webui/web_ui_test_handler.cc", -@@ -8091,7 +7940,6 @@ if (!is_android) { - "//chrome/test/data:web_ui_test_bindings", - "//components/metrics:test_support", - "//components/password_manager/core/browser:test_support", -- "//components/signin/public/identity_manager", - "//components/sync/driver:test_support", - "//components/translate/content/common", - "//content/test:test_support", -diff --git a/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc b/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc ---- a/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc -+++ b/chrome/browser/android/consent_auditor/consent_auditor_bridge.cc -@@ -11,10 +11,8 @@ - #include "base/android/jni_array.h" - #include "base/android/jni_string.h" - #include "chrome/browser/consent_auditor/android/jni_headers/ConsentAuditorBridge_jni.h" --#include "chrome/browser/consent_auditor/consent_auditor_factory.h" - #include "chrome/browser/profiles/profile_android.h" - #include "components/consent_auditor/consent_auditor.h" --#include "components/signin/public/identity_manager/account_info.h" - - using base::android::JavaParamRef; - -@@ -26,23 +24,4 @@ static void JNI_ConsentAuditorBridge_RecordConsent( - jint j_feature, - const JavaParamRef& j_consent_description, - jint j_consent_confirmation) { -- // TODO(markusheintz): Update the ConsentAuditorBridgeInterface. -- DCHECK_EQ(static_cast(j_feature), -- consent_auditor::Feature::CHROME_SYNC); -- -- std::vector consent_description; -- base::android::JavaIntArrayToIntVector(env, j_consent_description, -- &consent_description); -- -- sync_pb::UserConsentTypes::SyncConsent sync_consent; -- sync_consent.set_status(sync_pb::UserConsentTypes::ConsentStatus:: -- UserConsentTypes_ConsentStatus_GIVEN); -- sync_consent.set_confirmation_grd_id(j_consent_confirmation); -- for (int id : consent_description) { -- sync_consent.add_description_grd_ids(id); -- } -- ConsentAuditorFactory::GetForProfile( -- ProfileAndroid::FromProfileAndroid(j_profile)) -- ->RecordSyncConsent(ConvertFromJavaCoreAccountId(env, j_account_id), -- sync_consent); - } -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,8 +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" - #include "chrome/browser/ui/browser_finder.h" -@@ -55,9 +53,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" -@@ -109,8 +104,7 @@ ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient( - : profile_(profile), - scheme_classifier_(profile), - url_consent_helper_(unified_consent::UrlKeyedDataCollectionConsentHelper:: -- NewPersonalizedDataCollectionConsentHelper( -- SyncServiceFactory::GetForProfile(profile_))), -+ NewPersonalizedDataCollectionConsentHelper(nullptr)), - tab_matcher_(*this, profile_), - storage_partition_(nullptr), - omnibox_triggered_feature_service_( -@@ -300,11 +294,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 +319,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/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h ---- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h -+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h -@@ -76,7 +76,6 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient { - query_tiles::TileService* GetQueryTileService() const override; - OmniboxTriggeredFeatureService* GetOmniboxTriggeredFeatureService() - const override; -- signin::IdentityManager* GetIdentityManager() const override; - bool IsOffTheRecord() const override; - bool IsAlwaysIncognitoEnabled() const override; - bool SearchSuggestEnabled() const override; -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/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc ---- a/chrome/browser/bookmarks/bookmark_model_factory.cc -+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc -@@ -12,7 +12,6 @@ - #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" - #include "chrome/browser/profiles/incognito_helpers.h" - #include "chrome/browser/profiles/profile.h" --#include "chrome/browser/sync/bookmark_sync_service_factory.h" - #include "chrome/browser/ui/webui/bookmarks/bookmarks_ui.h" - #include "chrome/browser/undo/bookmark_undo_service_factory.h" - #include "chrome/common/chrome_switches.h" -@@ -20,7 +19,6 @@ - #include "components/bookmarks/browser/bookmark_utils.h" - #include "components/keyed_service/content/browser_context_dependency_manager.h" - #include "components/prefs/pref_service.h" --#include "components/sync_bookmarks/bookmark_sync_service.h" - #include "components/undo/bookmark_undo_service.h" - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" -@@ -35,7 +33,7 @@ std::unique_ptr BuildBookmarkModel( - auto bookmark_model = - std::make_unique(std::make_unique( - profile, ManagedBookmarkServiceFactory::GetForProfile(profile), -- BookmarkSyncServiceFactory::GetForProfile(profile))); -+ nullptr)); - bookmark_model->Load(profile->GetPrefs(), profile->GetPath()); - BookmarkUndoServiceFactory::GetForProfile(profile)->Start( - bookmark_model.get()); -@@ -75,7 +73,6 @@ BookmarkModelFactory::BookmarkModelFactory() - BrowserContextDependencyManager::GetInstance()) { - DependsOn(BookmarkUndoServiceFactory::GetInstance()); - DependsOn(ManagedBookmarkServiceFactory::GetInstance()); -- DependsOn(BookmarkSyncServiceFactory::GetInstance()); - } - - BookmarkModelFactory::~BookmarkModelFactory() { -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_factory.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc ---- a/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc -+++ b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc -@@ -21,7 +21,6 @@ - #include "chrome/browser/password_manager/account_password_store_factory.h" - #include "chrome/browser/password_manager/password_store_factory.h" - #include "chrome/browser/profiles/profile.h" --#include "chrome/browser/sync/sync_service_factory.h" - #include "chrome/browser/web_data_service_factory.h" - #include "chrome/browser/webauthn/chrome_authenticator_request_delegate.h" - #include "components/browsing_data/core/counters/autofill_counter.h" -@@ -31,7 +30,6 @@ - #include "components/browsing_data/core/pref_names.h" - #include "components/history/core/browser/web_history_service.h" - #include "components/password_manager/core/browser/password_store_interface.h" --#include "components/sync/driver/sync_service.h" - #include "extensions/buildflags/buildflags.h" - - #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -68,7 +66,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, - profile, ServiceAccessType::EXPLICIT_ACCESS), - base::BindRepeating(&GetUpdatedWebHistoryService, - base::Unretained(profile)), -- SyncServiceFactory::GetForProfile(profile)); -+ nullptr); - } - if (pref_name == browsing_data::prefs::kDeleteBrowsingHistoryBasic) { - // The history option on the basic tab doesn't use a counter. -@@ -105,7 +103,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, - ServiceAccessType::EXPLICIT_ACCESS), - AccountPasswordStoreFactory::GetForProfile( - profile, ServiceAccessType::EXPLICIT_ACCESS), -- SyncServiceFactory::GetForProfile(profile), -+ nullptr, - std::move(credential_store)); - } - -@@ -113,7 +111,7 @@ BrowsingDataCounterFactory::GetForProfileAndPref(Profile* profile, - return std::make_unique( - WebDataServiceFactory::GetAutofillWebDataForProfile( - profile, ServiceAccessType::EXPLICIT_ACCESS), -- SyncServiceFactory::GetForProfile(profile)); -+ nullptr); - } - - if (pref_name == browsing_data::prefs::kDeleteDownloadHistory) { -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/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc ---- a/chrome/browser/chrome_content_browser_client.cc -+++ b/chrome/browser/chrome_content_browser_client.cc -@@ -4814,11 +4814,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( - std::make_unique(profile); - #endif - -- auto signin_throttle = -- signin::URLLoaderThrottle::MaybeCreate(std::move(delegate), wc_getter); -- if (signin_throttle) -- result.push_back(std::move(signin_throttle)); -- - return result; - } - -@@ -5154,10 +5149,6 @@ bool ChromeContentBrowserClient::WillCreateURLLoaderFactory( - } - #endif - -- use_proxy |= signin::ProxyingURLLoaderFactory::MaybeProxyRequest( -- frame, type == URLLoaderFactoryType::kNavigation, request_initiator, -- factory_receiver); -- - auto* prefetch_proxy_service = PrefetchProxyServiceFactory::GetForProfile( - Profile::FromBrowserContext(browser_context)); - // |frame| is null when |type| is service worker. -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/enterprise/reporting/profile_report_generator_delegate_base.cc b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc ---- a/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc -+++ b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc -@@ -13,13 +13,10 @@ - #include "chrome/browser/policy/chrome_browser_policy_connector.h" - #include "chrome/browser/policy/chrome_policy_conversions_client.h" - #include "chrome/browser/profiles/profile_manager.h" --#include "chrome/browser/signin/identity_manager_factory.h" - #include "components/enterprise/browser/reporting/profile_report_generator.h" - #include "components/policy/core/browser/policy_conversions.h" - #include "components/policy/core/browser/policy_conversions_client.h" - #include "components/policy/proto/device_management_backend.pb.h" --#include "components/signin/public/identity_manager/account_info.h" --#include "components/signin/public/identity_manager/identity_manager.h" - - namespace enterprise_reporting { - -@@ -37,14 +34,6 @@ bool ProfileReportGeneratorDelegateBase::Init(const base::FilePath& path) { - - void ProfileReportGeneratorDelegateBase::GetSigninUserInfo( - enterprise_management::ChromeUserProfileInfo* report) { -- auto account_info = -- IdentityManagerFactory::GetForProfile(profile_)->GetPrimaryAccountInfo( -- signin::ConsentLevel::kSync); -- if (account_info.IsEmpty()) -- return; -- auto* signed_in_user_info = report->mutable_chrome_signed_in_user(); -- signed_in_user_info->set_email(account_info.email); -- signed_in_user_info->set_obfuscated_gaia_id(account_info.gaia); - } - - std::unique_ptr -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 @@ -4251,43 +3269,6 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe import org.chromium.components.user_prefs.UserPrefs; /** -diff --git a/chrome/browser/feed/feed_service_factory.cc b/chrome/browser/feed/feed_service_factory.cc ---- a/chrome/browser/feed/feed_service_factory.cc -+++ b/chrome/browser/feed/feed_service_factory.cc -@@ -17,7 +17,6 @@ - #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_key.h" --#include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/common/channel_info.h" - #include "chrome/common/chrome_version.h" - #include "components/background_task_scheduler/background_task_scheduler_factory.h" -@@ -160,7 +159,6 @@ FeedServiceFactory::FeedServiceFactory() - : BrowserContextKeyedServiceFactory( - "FeedService", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - DependsOn(HistoryServiceFactory::GetInstance()); - DependsOn(background_task::BackgroundTaskSchedulerFactory::GetInstance()); - } -@@ -181,8 +179,6 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor( - content::StoragePartition* storage_partition = - context->GetDefaultStoragePartition(); - -- signin::IdentityManager* identity_manager = -- IdentityManagerFactory::GetForProfile(profile); - std::string api_key; - if (google_apis::IsGoogleChromeAPIKeyUsed()) { - bool is_stable_channel = -@@ -223,7 +219,7 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor( - storage_partition->GetProtoDatabaseProvider()->GetDB( - leveldb_proto::ProtoDbType::FEED_KEY_VALUE_DATABASE, - feed_dir.AppendASCII("keyvaldb"), background_task_runner), -- identity_manager, -+ /* identity_manager */ nullptr, - HistoryServiceFactory::GetForProfile(profile, - ServiceAccessType::IMPLICIT_ACCESS), - storage_partition->GetURLLoaderFactoryForBrowserProcess(), diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java --- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java +++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java @@ -4309,181 +3290,6 @@ diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/brows int SYNC_CONSENT_SHOWN = 3; /** The user clicked on the continue button to continue with sync consent. */ int SYNC_CONSENT_ACCEPTED = 4; -diff --git a/chrome/browser/gcm/gcm_profile_service_factory.cc b/chrome/browser/gcm/gcm_profile_service_factory.cc ---- a/chrome/browser/gcm/gcm_profile_service_factory.cc -+++ b/chrome/browser/gcm/gcm_profile_service_factory.cc -@@ -13,7 +13,6 @@ - #include "chrome/browser/profiles/incognito_helpers.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/profiles/profile_key.h" --#include "chrome/browser/signin/identity_manager_factory.h" - #include "components/gcm_driver/gcm_profile_service.h" - #include "components/keyed_service/content/browser_context_dependency_manager.h" - #include "components/offline_pages/buildflags/buildflags.h" -@@ -113,7 +112,6 @@ GCMProfileServiceFactory::GCMProfileServiceFactory() - : BrowserContextKeyedServiceFactory( - "GCMProfileService", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - #if BUILDFLAG(ENABLE_OFFLINE_PAGES) - DependsOn(offline_pages::PrefetchServiceFactory::GetInstance()); - #endif // BUILDFLAG(ENABLE_OFFLINE_PAGES) -@@ -147,7 +145,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( - ->GetURLLoaderFactoryForBrowserProcess(), - content::GetNetworkConnectionTracker(), chrome::GetChannel(), - gcm::GetProductCategoryForSubtypes(profile->GetPrefs()), -- IdentityManagerFactory::GetForProfile(profile), -+ /* identity_manager = */ nullptr, - std::make_unique(), content::GetUIThreadTaskRunner({}), - content::GetIOThreadTaskRunner({}), blocking_task_runner); - #endif -diff --git a/chrome/browser/history/web_history_service_factory.cc b/chrome/browser/history/web_history_service_factory.cc ---- a/chrome/browser/history/web_history_service_factory.cc -+++ b/chrome/browser/history/web_history_service_factory.cc -@@ -4,11 +4,9 @@ - - #include "chrome/browser/history/web_history_service_factory.h" - --#include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/browser/sync/sync_service_factory.h" - #include "components/history/core/browser/web_history_service.h" - #include "components/keyed_service/content/browser_context_dependency_manager.h" --#include "components/sync/driver/sync_service.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/storage_partition.h" - -@@ -16,9 +14,7 @@ namespace { - // Returns true if the user is signed in and full history sync is enabled, - // and false otherwise. - bool IsHistorySyncEnabled(Profile* profile) { -- syncer::SyncService* sync = SyncServiceFactory::GetForProfile(profile); -- return sync && sync->IsSyncFeatureActive() && !sync->IsLocalSyncEnabled() && -- sync->GetActiveDataTypes().Has(syncer::HISTORY_DELETE_DIRECTIVES); -+ return false; - } - - } // namespace -@@ -40,23 +36,13 @@ history::WebHistoryService* WebHistoryServiceFactory::GetForProfile( - - KeyedService* WebHistoryServiceFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { -- Profile* profile = static_cast(context); -- // Ensure that the service is not instantiated or used if the user is not -- // signed into sync, or if web history is not enabled. -- if (!IsHistorySyncEnabled(profile)) - return nullptr; -- -- return new history::WebHistoryService( -- IdentityManagerFactory::GetForProfile(profile), -- profile->GetDefaultStoragePartition() -- ->GetURLLoaderFactoryForBrowserProcess()); - } - - WebHistoryServiceFactory::WebHistoryServiceFactory() - : BrowserContextKeyedServiceFactory( - "WebHistoryServiceFactory", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - } - - WebHistoryServiceFactory::~WebHistoryServiceFactory() { -diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc ---- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc -+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc -@@ -15,7 +15,6 @@ - #include "chrome/browser/gcm/gcm_profile_service_factory.h" - #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h" - #include "chrome/browser/profiles/profile.h" --#include "chrome/browser/signin/identity_manager_factory.h" - #include "chrome/common/chrome_content_client.h" - #include "components/gcm_driver/gcm_profile_service.h" - #include "components/gcm_driver/instance_id/instance_id_profile_service.h" -@@ -42,36 +41,11 @@ - #endif - - namespace invalidation { --namespace { -- --std::unique_ptr CreateInvalidationServiceForSenderId( -- Profile* profile, -- IdentityProvider* identity_provider, -- const std::string& sender_id) { -- auto service = std::make_unique( -- identity_provider, -- base::BindRepeating( -- &FCMNetworkHandler::Create, -- gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(), -- instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile) -- ->driver()), -- base::BindRepeating( -- &PerUserTopicSubscriptionManager::Create, identity_provider, -- profile->GetPrefs(), -- base::RetainedRef(profile->GetDefaultStoragePartition() -- ->GetURLLoaderFactoryForBrowserProcess())), -- instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile) -- ->driver(), -- profile->GetPrefs(), sender_id); -- service->Init(); -- return service; --} -- --} // namespace - - // static - ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile( - Profile* profile) { -+ return NULL; - #if BUILDFLAG(IS_CHROMEOS_ASH) - // Using ProfileHelper::GetSigninProfile() here would lead to an infinite loop - // when this method is called during the creation of the sign-in profile -@@ -85,8 +59,6 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile( - return NULL; - } - #endif -- return static_cast( -- GetInstance()->GetServiceForBrowserContext(profile, true)); - } - - // static -@@ -99,7 +71,6 @@ ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory() - : BrowserContextKeyedServiceFactory( - "InvalidationService", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - DependsOn(gcm::GCMProfileServiceFactory::GetInstance()); - } - -@@ -116,8 +87,6 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor( - if (testing_factory_) - return testing_factory_.Run(context).release(); - -- std::unique_ptr identity_provider; -- - #if BUILDFLAG(IS_CHROMEOS_ASH) - policy::BrowserPolicyConnectorAsh* connector = - g_browser_process->platform_part()->browser_policy_connector_ash(); -@@ -129,20 +98,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor( - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - -- Profile* profile = Profile::FromBrowserContext(context); -- -- if (!identity_provider) { -- identity_provider = std::make_unique( -- IdentityManagerFactory::GetForProfile(profile)); -- } -- auto service = -- CreateInvalidationServiceForSenderId(profile, identity_provider.get(), -- /* sender_id = */ ""); -- auto custom_sender_id_factory = base::BindRepeating( -- &CreateInvalidationServiceForSenderId, profile, identity_provider.get()); -- return new ProfileInvalidationProvider(std::move(service), -- std::move(identity_provider), -- std::move(custom_sender_id_factory)); -+ return NULL; - } - - void ProfileInvalidationProviderFactory::RegisterProfilePrefs( diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome/browser/media/router/discovery/access_code/BUILD.gn --- a/chrome/browser/media/router/discovery/access_code/BUILD.gn +++ b/chrome/browser/media/router/discovery/access_code/BUILD.gn @@ -4495,48 +3301,11 @@ 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 -@@ -90,15 +90,12 @@ android_library("java") { - "//chrome/browser/loading_modal/android:java", +@@ -94,8 +94,6 @@ android_library("java") { + "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", "//chrome/browser/settings:java", - "//chrome/browser/signin/services/android:java", @@ -4544,54 +3313,36 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//components/browser_ui/settings/android:java", "//components/browser_ui/widget/android:java_resources", "//components/device_reauth:device_reauth_java_enums", - "//components/password_manager/core/browser:password_manager_java_enums", - "//components/password_manager/core/common:password_manager_common_java_enums", - "//components/signin/public/android:java", -- "//components/sync/android:sync_java", - "//components/sync/protocol:protocol_java", - "//content/public/android:content_java", - "//third_party/android_deps:guava_android_java", -@@ -182,14 +179,11 @@ junit_binary("password_manager_junit_tests") { - "//chrome/browser/flags:java", +@@ -189,8 +187,6 @@ junit_binary("password_manager_junit_tests") { "//chrome/browser/loading_modal/android:java", + "//chrome/browser/preferences:java", "//chrome/browser/profiles/android:java", - "//chrome/browser/signin/services/android:java", - "//chrome/browser/sync/android:java", "//chrome/test/android:chrome_java_test_support", "//components/browser_ui/settings/android:java", "//components/password_manager/core/browser:password_manager_java_enums", - "//components/password_manager/core/common:password_manager_common_java_enums", - "//components/signin/public/android:java", -- "//components/sync/android:sync_java", - "//components/sync/protocol:protocol_java", - "//third_party/android_deps:guava_android_java", - "//third_party/android_deps:protobuf_lite_runtime_java", diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java -@@ -26,11 +26,9 @@ import org.chromium.base.supplier.ObservableSupplier; - import org.chromium.chrome.browser.flags.ChromeFeatureList; - import org.chromium.chrome.browser.loading_modal.LoadingModalDialogCoordinator; +@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.loading_modal.LoadingModalDialogCoordinator; import org.chromium.chrome.browser.password_manager.CredentialManagerLauncher.CredentialManagerError; + import org.chromium.chrome.browser.preferences.Pref; + import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.sync.SyncService; import org.chromium.components.browser_ui.settings.SettingsLauncher; + import org.chromium.components.prefs.PrefService; import org.chromium.components.signin.base.CoreAccountInfo; - import org.chromium.components.signin.base.GoogleServiceAuthError; --import org.chromium.components.sync.ModelType; - import org.chromium.ui.modaldialog.ModalDialogManager; - - import java.lang.annotation.Retention; -@@ -131,20 +129,10 @@ public class PasswordManagerHelper { +@@ -133,50 +132,19 @@ public class PasswordManagerHelper { */ public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer, SettingsLauncher settingsLauncher, CredentialManagerLauncher credentialManagerLauncher, - SyncService syncService, ObservableSupplier modalDialogManagerSupplier) { - RecordHistogram.recordEnumeratedHistogram("PasswordManager.ManagePasswordsReferrer", - referrer, ManagePasswordsReferrer.MAX_VALUE + 1); - -- if (credentialManagerLauncher != null && hasChosenToSyncPasswords(syncService) -- && !hasPersistentAuthError(syncService)) { +- RecordHistogram.recordEnumeratedHistogram("PasswordManager.ManagePasswordsReferrer", +- referrer, ManagePasswordsReferrer.MAX_VALUE + 1); +- +- if (credentialManagerLauncher != null && canUseUpmCheckup()) { - LoadingModalDialogCoordinator loadingDialogCoordinator = - LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context); - launchTheCredentialManager( @@ -4599,16 +3350,22 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom - return; - } - - Bundle fragmentArgs = new Bundle(); - fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer); - context.startActivity(settingsLauncher.createSettingsActivityIntent( -@@ -155,19 +143,15 @@ public class PasswordManagerHelper { +- Bundle fragmentArgs = new Bundle(); +- fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer); +- context.startActivity(settingsLauncher.createSettingsActivityIntent( +- context, PASSWORD_SETTINGS_CLASS, fragmentArgs)); + } + + // TODO(crbug.com/1327294): Make sure we rely on the same util in all places that need // to check whether UPM can be used (for password check as well as for all other cases that // share the same preconditions, e.g. launching the credential manager). public static boolean canUseUpmCheckup() { - SyncService syncService = SyncService.get(); +- PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile()); - return PasswordManagerHelper.usesUnifiedPasswordManagerUI() && syncService != null -- && hasChosenToSyncPasswords(syncService) && !hasPersistentAuthError(syncService); +- && hasChosenToSyncPasswords(syncService) +- && !prefService.getBoolean( +- Pref.UNENROLLED_FROM_GOOGLE_MOBILE_SERVICES_DUE_TO_ERRORS); + return false; } @@ -4616,16 +3373,20 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom - PasswordCheckupClientHelper checkupClient, SyncService syncService, + PasswordCheckupClientHelper checkupClient, ObservableSupplier modalDialogManagerSupplier) { - if (!usesUnifiedPasswordManagerUI()) return; - +- if (!usesUnifiedPasswordManagerUI()) return; +- - Optional account = hasChosenToSyncPasswords(syncService) - ? Optional.of(CoreAccountInfo.getEmailFrom(syncService.getAccountInfo())) - : Optional.absent(); -+ Optional account = Optional.absent(); +- +- LoadingModalDialogCoordinator loadingDialogCoordinator = +- LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context); +- +- launchPasswordCheckup(referrer, checkupClient, account, loadingDialogCoordinator); + } - LoadingModalDialogCoordinator loadingDialogCoordinator = - LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context); -@@ -223,49 +207,6 @@ public class PasswordManagerHelper { + /** +@@ -227,49 +195,6 @@ public class PasswordManagerHelper { }); } @@ -4675,7 +3436,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom public static boolean usesUnifiedPasswordManagerUI() { if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false; @UpmExperimentVariation -@@ -286,15 +227,15 @@ public class PasswordManagerHelper { +@@ -290,24 +215,8 @@ public class PasswordManagerHelper { @VisibleForTesting static void launchTheCredentialManager(@ManagePasswordsReferrer int referrer, @@ -4683,47 +3444,24 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom + CredentialManagerLauncher credentialManagerLauncher, LoadingModalDialogCoordinator loadingDialogCoordinator) { - if (!hasChosenToSyncPasswords(syncService)) return; -+ if ((true)) return; - - loadingDialogCoordinator.show(); - - long startTimeMs = SystemClock.elapsedRealtime(); - credentialManagerLauncher.getCredentialManagerIntentForAccount(referrer, +- +- loadingDialogCoordinator.show(); +- +- long startTimeMs = SystemClock.elapsedRealtime(); +- credentialManagerLauncher.getCredentialManagerIntentForAccount(referrer, - CoreAccountInfo.getEmailFrom(syncService.getAccountInfo()), -+ "nobody@example.com", - (intent) - -> PasswordManagerHelper.launchCredentialManagerIntent( - intent, startTimeMs, true, loadingDialogCoordinator), -@@ -331,29 +272,6 @@ public class PasswordManagerHelper { - }); +- (intent) +- -> PasswordManagerHelper.launchCredentialManagerIntent( +- intent, startTimeMs, true, loadingDialogCoordinator), +- (error) -> { +- PasswordManagerHelper.recordFailureMetrics(error, true); +- recordLoadingDialogMetrics(LOADING_DIALOG_CREDENTIAL_MANAGER_HISTOGRAM, +- loadingDialogCoordinator.getState()); +- loadingDialogCoordinator.dismiss(); +- }); } -- private static boolean hasPersistentAuthError(@NonNull SyncService syncService) { -- // TODO(crbug.com/1327311): Ensure that the enum is generated from C++ and maybe -- // that the transient check is properly mirrored in java to avoid manual code duplication -- // which is error-prone. -- switch (syncService.getAuthError()) { -- // These are failures that are likely to succeed if tried again (or there is no -- // failure. -- case GoogleServiceAuthError.State.NONE: -- case GoogleServiceAuthError.State.CONNECTION_FAILED: -- case GoogleServiceAuthError.State.SERVICE_UNAVAILABLE: -- case GoogleServiceAuthError.State.REQUEST_CANCELED: -- return false; -- case GoogleServiceAuthError.State.INVALID_GAIA_CREDENTIALS: -- case GoogleServiceAuthError.State.USER_NOT_SIGNED_UP: -- case GoogleServiceAuthError.State.UNEXPECTED_SERVICE_RESPONSE: -- case GoogleServiceAuthError.State.SERVICE_ERROR: -- return true; -- default: -- assert false : "All error values should be classified as persistent or transient"; -- return true; -- } -- } -- - private static void recordFailureMetrics( - @CredentialManagerError int error, boolean forAccount) { - // While support for the local storage API exists in Chrome, it isn't used at this time. + @VisibleForTesting diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java @@ -4748,581 +3486,6 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom } /** -diff --git a/chrome/browser/password_manager/bulk_leak_check_service_factory.cc b/chrome/browser/password_manager/bulk_leak_check_service_factory.cc ---- a/chrome/browser/password_manager/bulk_leak_check_service_factory.cc -+++ b/chrome/browser/password_manager/bulk_leak_check_service_factory.cc -@@ -6,7 +6,6 @@ - - #include "base/no_destructor.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/password_manager/core/browser/bulk_leak_check_service.h" - #include "content/public/browser/storage_partition.h" -@@ -15,7 +14,6 @@ BulkLeakCheckServiceFactory::BulkLeakCheckServiceFactory() - : BrowserContextKeyedServiceFactory( - "PasswordBulkLeakCheck", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - } - - BulkLeakCheckServiceFactory::~BulkLeakCheckServiceFactory() = default; -@@ -37,7 +35,7 @@ KeyedService* BulkLeakCheckServiceFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { - Profile* profile = Profile::FromBrowserContext(context); - return new password_manager::BulkLeakCheckService( -- IdentityManagerFactory::GetForProfile(profile), -+ nullptr, - profile->GetDefaultStoragePartition() - ->GetURLLoaderFactoryForBrowserProcess()); - } -diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc ---- a/chrome/browser/password_manager/chrome_password_manager_client.cc -+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -30,14 +30,11 @@ - #include "chrome/browser/password_manager/account_password_store_factory.h" - #include "chrome/browser/password_manager/field_info_manager_factory.h" - #include "chrome/browser/password_manager/password_manager_settings_service_factory.h" --#include "chrome/browser/password_manager/password_reuse_manager_factory.h" - #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h" - #include "chrome/browser/password_manager/password_store_factory.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" - #include "chrome/browser/safe_browsing/user_interaction_observer.h" --#include "chrome/browser/signin/identity_manager_factory.h" --#include "chrome/browser/sync/sync_service_factory.h" - #include "chrome/browser/touch_to_fill/touch_to_fill_webauthn_credential.h" - #include "chrome/browser/translate/chrome_translate_client.h" - #include "chrome/browser/ui/passwords/password_generation_popup_controller_impl.h" -@@ -84,11 +81,7 @@ - #include "components/profile_metrics/browser_profile_type.h" - #include "components/safe_browsing/buildflags.h" - #include "components/sessions/content/content_record_password_state.h" --#include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/identity_manager/identity_manager.h" - #include "components/site_isolation/site_isolation_policy.h" --#include "components/sync/driver/sync_service.h" --#include "components/sync/driver/sync_user_settings.h" - #include "components/translate/core/browser/translate_manager.h" - #include "components/version_info/version_info.h" - #include "content/public/browser/back_forward_cache.h" -@@ -126,9 +119,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" -@@ -193,12 +183,6 @@ namespace { - static const char kPasswordBreachEntryTrigger[] = "PASSWORD_ENTRY"; - #endif - --const syncer::SyncService* GetSyncServiceForProfile(Profile* profile) { -- if (SyncServiceFactory::HasSyncService(profile)) -- return SyncServiceFactory::GetForProfile(profile); -- return nullptr; --} -- - // Adds |observer| to the input observers of |widget_host|. - void AddToWidgetInputEventObservers( - content::RenderWidgetHost* widget_host, -@@ -295,10 +279,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 +407,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, -@@ -467,7 +442,6 @@ void ChromePasswordManagerClient::ShowTouchToFill( - - void ChromePasswordManagerClient::OnPasswordSelected( - const std::u16string& text) { -- password_reuse_detection_manager_.OnPaste(text); - } - #endif - -@@ -518,7 +492,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); -@@ -685,10 +659,6 @@ PrefService* ChromePasswordManagerClient::GetPrefs() const { - return profile_->GetPrefs(); - } - --const syncer::SyncService* ChromePasswordManagerClient::GetSyncService() const { -- return GetSyncServiceForProfile(profile_); --} -- - password_manager::PasswordStoreInterface* - ChromePasswordManagerClient::GetProfilePasswordStore() const { - // Always use EXPLICIT_ACCESS as the password manager checks IsIncognito -@@ -707,11 +677,6 @@ ChromePasswordManagerClient::GetAccountPasswordStore() const { - .get(); - } - --password_manager::PasswordReuseManager* --ChromePasswordManagerClient::GetPasswordReuseManager() const { -- return PasswordReuseManagerFactory::GetForProfile(profile_); --} -- - password_manager::PasswordScriptsFetcher* - ChromePasswordManagerClient::GetPasswordScriptsFetcher() { - return PasswordScriptsFetcherFactory::GetForBrowserContext(profile_); -@@ -723,13 +688,6 @@ ChromePasswordManagerClient::GetPasswordChangeSuccessTracker() { - GetForBrowserContext(profile_); - } - --password_manager::SyncState ChromePasswordManagerClient::GetPasswordSyncState() -- const { -- const syncer::SyncService* sync_service = -- SyncServiceFactory::GetForProfile(profile_); -- return password_manager_util::GetPasswordSyncState(sync_service); --} -- - bool ChromePasswordManagerClient::WasLastNavigationHTTPError() const { - DCHECK(web_contents()); - -@@ -765,10 +723,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(); -@@ -833,10 +788,6 @@ url::Origin ChromePasswordManagerClient::GetLastCommittedOrigin() const { - DCHECK(web_contents()); - return web_contents()->GetMainFrame()->GetLastCommittedOrigin(); - } --const password_manager::CredentialsFilter* --ChromePasswordManagerClient::GetStoreResultFilter() const { -- return &credentials_filter_; --} - - const autofill::LogManager* ChromePasswordManagerClient::GetLogManager() const { - return log_manager_.get(); -@@ -887,17 +838,6 @@ void ChromePasswordManagerClient::CheckSafeBrowsingReputation( - } - #endif // defined(ON_FOCUS_PING_ENABLED) - --void ChromePasswordManagerClient::CheckProtectedPasswordEntry( -- PasswordType password_type, -- const std::string& username, -- const std::vector& -- matching_reused_credentials, -- bool password_field_exists) { --} -- --void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() { --} -- - #if !BUILDFLAG(IS_ANDROID) - void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent( - const GURL& url, -@@ -961,10 +901,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() { - profile_, ServiceAccessType::EXPLICIT_ACCESS); - } - --signin::IdentityManager* ChromePasswordManagerClient::GetIdentityManager() { -- return IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile()); --} -- - scoped_refptr - ChromePasswordManagerClient::GetURLLoaderFactory() { - return profile_->GetDefaultStoragePartition() -@@ -1194,18 +1130,14 @@ void ChromePasswordManagerClient::GenerationElementLostFocus() { - #if BUILDFLAG(IS_ANDROID) - void ChromePasswordManagerClient::OnImeTextCommittedEvent( - const std::u16string& text_str) { -- password_reuse_detection_manager_.OnKeyPressedCommitted(text_str); - } - - void ChromePasswordManagerClient::OnImeSetComposingTextEvent( - const std::u16string& text_str) { - last_composing_text_ = text_str; -- password_reuse_detection_manager_.OnKeyPressedUncommitted( -- last_composing_text_); - } - - void ChromePasswordManagerClient::OnImeFinishComposingTextEvent() { -- password_reuse_detection_manager_.OnKeyPressedCommitted(last_composing_text_); - last_composing_text_.clear(); - } - #endif // BUILDFLAG(IS_ANDROID) -@@ -1301,34 +1233,13 @@ ChromePasswordManagerClient::ChromePasswordManagerClient( - profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())), - password_manager_(this), - password_feature_manager_(profile_->GetPrefs(), -- SyncServiceFactory::GetForProfile(profile_)), -+ nullptr), - httpauth_manager_(this), -- password_reuse_detection_manager_(this), - driver_factory_(nullptr), - webauthn_credentials_delegate_(this), - content_credential_manager_(this), - password_generation_driver_receivers_(web_contents, this), - observer_(nullptr), --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- credentials_filter_( -- this, -- base::BindRepeating(&GetSyncServiceForProfile, profile_), -- DiceWebSigninInterceptorFactory::GetForProfile(profile_)), -- account_storage_auth_helper_( -- IdentityManagerFactory::GetForProfile(profile_), -- &password_feature_manager_, -- base::BindRepeating( -- [](content::WebContents* web_contents) { -- Browser* browser = -- chrome::FindBrowserWithWebContents(web_contents); -- return browser ? browser->signin_view_controller() : nullptr; -- }, -- web_contents)), --#else -- credentials_filter_( -- this, -- base::BindRepeating(&GetSyncServiceForProfile, profile_)), --#endif - helper_(this) { - ContentPasswordManagerDriverFactory::CreateForWebContents(web_contents, this, - autofill_client); -@@ -1364,8 +1275,6 @@ void ChromePasswordManagerClient::PrimaryPageChanged(content::Page& page) { - // requests. - content_credential_manager_.DisconnectBinding(); - -- password_reuse_detection_manager_.DidNavigateMainFrame(GetLastCommittedURL()); -- - AddToWidgetInputEventObservers(page.GetMainDocument().GetRenderWidgetHost(), - this); - -@@ -1437,7 +1346,6 @@ void ChromePasswordManagerClient::OnPaste() { - } - - was_on_paste_called_ = true; -- password_reuse_detection_manager_.OnPaste(std::move(text)); - } - #endif - -@@ -1460,10 +1368,6 @@ void ChromePasswordManagerClient::OnInputEvent( - // Android keyboard, ImeTextCommittedEvent is triggered instead. - if (event.GetType() != blink::WebInputEvent::Type::kKeyDown) - return; -- const blink::WebKeyboardEvent& key_event = -- static_cast(event); -- password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text); -- - #else // !BUILDFLAG(IS_ANDROID) - if (event.GetType() != blink::WebInputEvent::Type::kChar) - return; -@@ -1473,8 +1377,6 @@ void ChromePasswordManagerClient::OnInputEvent( - // command key is pressed. This detects CTRL+V, COMMAND+V, and CTRL+SHIFT+V. - if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) { - OnPaste(); -- } else { -- password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text); - } - #endif // BUILDFLAG(IS_ANDROID) - } -@@ -1540,19 +1442,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage( - // static - bool ChromePasswordManagerClient::ShouldAnnotateNavigationEntries( - Profile* profile) { -- // Only annotate PasswordState onto the navigation entry if user is -- // opted into UMA and they're not syncing w/ a custom passphrase. -- if (!ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled()) -- return false; -- -- syncer::SyncService* sync_service = -- SyncServiceFactory::GetForProfile(profile); -- if (!sync_service || !sync_service->IsSyncFeatureActive() || -- sync_service->GetUserSettings()->IsUsingExplicitPassphrase()) { - return false; -- } -- -- return true; - } - - void ChromePasswordManagerClient::GenerationResultAvailable( -diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h ---- a/chrome/browser/password_manager/chrome_password_manager_client.h -+++ b/chrome/browser/password_manager/chrome_password_manager_client.h -@@ -31,12 +31,9 @@ - #include "components/password_manager/core/browser/password_manager_client_helper.h" - #include "components/password_manager/core/browser/password_manager_metrics_recorder.h" - #include "components/password_manager/core/browser/password_manager_metrics_util.h" --#include "components/password_manager/core/browser/password_reuse_detection_manager.h" --#include "components/password_manager/core/browser/password_reuse_detector.h" - #include "components/prefs/pref_member.h" - #include "components/safe_browsing/buildflags.h" - #include "components/signin/public/base/signin_buildflags.h" --#include "components/sync/driver/sync_service.h" - #include "content/public/browser/render_frame_host_receiver_set.h" - #include "content/public/browser/render_widget_host.h" - #include "content/public/browser/web_contents_observer.h" -@@ -57,8 +54,6 @@ class TouchToFillController; - #if BUILDFLAG(ENABLE_DICE_SUPPORT) - #include "chrome/browser/password_manager/multi_profile_credentials_filter.h" - #include "chrome/browser/ui/passwords/account_storage_auth_helper.h" --#else --#include "components/password_manager/core/browser/sync_credentials_filter.h" - #endif - - class PasswordGenerationPopupObserver; -@@ -184,18 +179,14 @@ class ChromePasswordManagerClient - base::OnceCallback reauth_callback) override; - void TriggerSignIn(signin_metrics::AccessPoint access_point) override; - PrefService* GetPrefs() const override; -- const syncer::SyncService* GetSyncService() const override; - password_manager::PasswordStoreInterface* GetProfilePasswordStore() - const override; - password_manager::PasswordStoreInterface* GetAccountPasswordStore() - const override; -- password_manager::PasswordReuseManager* GetPasswordReuseManager() -- const override; - password_manager::PasswordScriptsFetcher* GetPasswordScriptsFetcher() - override; - password_manager::PasswordChangeSuccessTracker* - GetPasswordChangeSuccessTracker() override; -- password_manager::SyncState GetPasswordSyncState() const override; - bool WasLastNavigationHTTPError() const override; - - net::CertStatus GetMainFrameCertStatus() const override; -@@ -211,8 +202,6 @@ class ChromePasswordManagerClient - bool IsCommittedMainFrameSecure() const override; - const GURL& GetLastCommittedURL() const override; - url::Origin GetLastCommittedOrigin() const override; -- const password_manager::CredentialsFilter* GetStoreResultFilter() -- const override; - const autofill::LogManager* GetLogManager() const override; - void AnnotateNavigationEntry(bool has_password_field) override; - autofill::LanguageCode GetPageLanguage() const override; -@@ -225,15 +214,6 @@ class ChromePasswordManagerClient - const GURL& frame_url) override; - #endif - -- void CheckProtectedPasswordEntry( -- password_manager::metrics_util::PasswordType reused_password_type, -- const std::string& username, -- const std::vector& -- matching_reused_credentials, -- bool password_field_exists) override; -- -- void LogPasswordReuseDetectedEvent() override; -- - // Reporting these events is only supported on desktop platforms. - #if !BUILDFLAG(IS_ANDROID) - void MaybeReportEnterpriseLoginEvent( -@@ -252,7 +232,6 @@ class ChromePasswordManagerClient - password_manager::PasswordRequirementsService* - GetPasswordRequirementsService() override; - favicon::FaviconService* GetFaviconService() override; -- signin::IdentityManager* GetIdentityManager() override; - scoped_refptr GetURLLoaderFactory() override; - network::mojom::NetworkContext* GetNetworkContext() const override; - void UpdateFormManagers() override; -@@ -377,8 +356,6 @@ class ChromePasswordManagerClient - password_manager::PasswordManager password_manager_; - password_manager::PasswordFeatureManagerImpl password_feature_manager_; - password_manager::HttpAuthManagerImpl httpauth_manager_; -- password_manager::PasswordReuseDetectionManager -- password_reuse_detection_manager_; - - #if BUILDFLAG(IS_ANDROID) - // Holds and facilitates a credential store for each origin in this tab. -@@ -421,8 +398,6 @@ class ChromePasswordManagerClient - // MultiProfileCredentialsFilter requires DICE support. - const MultiProfileCredentialsFilter credentials_filter_; - AccountStorageAuthHelper account_storage_auth_helper_; --#else -- const password_manager::SyncCredentialsFilter credentials_filter_; - #endif - - std::unique_ptr log_manager_; -diff --git a/chrome/browser/password_manager/password_manager_settings_service_factory.cc b/chrome/browser/password_manager/password_manager_settings_service_factory.cc ---- a/chrome/browser/password_manager/password_manager_settings_service_factory.cc -+++ b/chrome/browser/password_manager/password_manager_settings_service_factory.cc -@@ -7,7 +7,6 @@ - #include "chrome/browser/password_manager/password_manager_settings_service_impl.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/password_manager/core/browser/password_manager_settings_service.h" - #include "components/password_manager/core/common/password_manager_features.h" -@@ -34,7 +33,6 @@ PasswordManagerSettingsServiceFactory::PasswordManagerSettingsServiceFactory() - : BrowserContextKeyedServiceFactory( - "PasswordManagerSettingsService", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(SyncServiceFactory::GetInstance()); - } - - PasswordManagerSettingsServiceFactory:: -@@ -44,10 +42,6 @@ KeyedService* PasswordManagerSettingsServiceFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { - Profile* profile = Profile::FromBrowserContext(context); - #if BUILDFLAG(IS_ANDROID) -- if (password_manager::features::UsesUnifiedPasswordManagerUi()) { -- return new PasswordManagerSettingsServiceAndroidImpl( -- profile->GetPrefs(), SyncServiceFactory::GetForProfile(profile)); -- } - // Reset the migration pref in case the client is no longer in the enabled - // group. - profile->GetPrefs()->SetBoolean( -diff --git a/chrome/browser/password_manager/password_reuse_manager_factory.cc b/chrome/browser/password_manager/password_reuse_manager_factory.cc ---- a/chrome/browser/password_manager/password_reuse_manager_factory.cc -+++ b/chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -11,43 +11,18 @@ - #include "chrome/browser/password_manager/password_store_factory.h" - #include "chrome/browser/profiles/incognito_helpers.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/password_manager/core/browser/password_reuse_manager_impl.h" - #include "components/password_manager/core/browser/password_store_interface.h" - #include "components/password_manager/core/browser/password_store_signin_notifier_impl.h" - #include "components/password_manager/core/common/password_manager_features.h" --#include "components/signin/public/identity_manager/identity_manager.h" - #include "content/public/browser/browser_context.h" - #include "content/public/browser/storage_partition.h" - --namespace { -- --std::string GetSyncUsername(Profile* profile) { -- auto* identity_manager = -- IdentityManagerFactory::GetForProfileIfExists(profile); -- return identity_manager -- ? identity_manager -- ->GetPrimaryAccountInfo(signin::ConsentLevel::kSync) -- .email -- : std::string(); --} -- --bool IsSignedIn(Profile* profile) { -- auto* identity_manager = -- IdentityManagerFactory::GetForProfileIfExists(profile); -- return identity_manager -- ? !identity_manager->GetAccountsWithRefreshTokens().empty() -- : false; --} -- --} // namespace -- - PasswordReuseManagerFactory::PasswordReuseManagerFactory() - : BrowserContextKeyedServiceFactory( - "PasswordReuseManager", - BrowserContextDependencyManager::GetInstance()) { -- DependsOn(IdentityManagerFactory::GetInstance()); - DependsOn(PasswordStoreFactory::GetInstance()); - DependsOn(AccountPasswordStoreFactory::GetInstance()); - } -@@ -74,34 +49,17 @@ KeyedService* PasswordReuseManagerFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { - DCHECK(base::FeatureList::IsEnabled( - password_manager::features::kPasswordReuseDetectionEnabled)); -- -- Profile* profile = Profile::FromBrowserContext(context); -- -- password_manager::PasswordReuseManager* reuse_manager = -- new password_manager::PasswordReuseManagerImpl(); -- reuse_manager->Init(profile->GetPrefs(), -- PasswordStoreFactory::GetForProfile( -- profile, ServiceAccessType::EXPLICIT_ACCESS) -- .get(), -- AccountPasswordStoreFactory::GetForProfile( -- profile, ServiceAccessType::EXPLICIT_ACCESS) -- .get()); -- -- // Prepare password hash data for reuse detection. -- reuse_manager->PreparePasswordHashData(GetSyncUsername(profile), -- IsSignedIn(profile)); -- - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) - std::unique_ptr notifier = - std::make_unique( -- IdentityManagerFactory::GetForProfile(profile)); -+ nullptr); - reuse_manager->SetPasswordStoreSigninNotifier(std::move(notifier)); - #endif - -- return reuse_manager; -+ return nullptr; - } - - content::BrowserContext* PasswordReuseManagerFactory::GetBrowserContextToUse( -diff --git a/chrome/browser/password_manager/password_store_utils.cc b/chrome/browser/password_manager/password_store_utils.cc ---- a/chrome/browser/password_manager/password_store_utils.cc -+++ b/chrome/browser/password_manager/password_store_utils.cc -@@ -7,13 +7,10 @@ - #include "base/bind.h" - #include "base/memory/raw_ptr.h" - #include "chrome/browser/password_manager/account_password_store_factory.h" --#include "chrome/browser/password_manager/password_reuse_manager_factory.h" - #include "chrome/browser/password_manager/password_store_factory.h" - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" - #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" --#include "chrome/browser/signin/identity_manager_factory.h" --#include "chrome/browser/sync/sync_service_factory.h" - #include "components/password_manager/core/browser/password_form.h" - #include "components/password_manager/core/browser/password_store_interface.h" - #include "components/password_manager/core/browser/store_metrics_reporter.h" -@@ -65,20 +62,12 @@ class StoreMetricReporterHelper : public base::SupportsUserData::Data { - AccountPasswordStoreFactory::GetForProfile( - profile_, ServiceAccessType::EXPLICIT_ACCESS) - .get(); -- syncer::SyncService* sync_service = -- SyncServiceFactory::HasSyncService(profile_) -- ? SyncServiceFactory::GetForProfile(profile_) -- : nullptr; -- signin::IdentityManager* identity_manager = -- IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile()); -- password_manager::PasswordReuseManager* password_reuse_manager = -- PasswordReuseManagerFactory::GetForProfile(profile_); - PrefService* pref_service = profile_->GetPrefs(); - - metrics_reporter_ = - std::make_unique( -- profile_store, account_store, sync_service, identity_manager, -- pref_service, password_reuse_manager, -+ profile_store, account_store, nullptr, nullptr, -+ pref_service, nullptr, - IsUnderAdvancedProtection(profile_), - base::BindOnce( - &StoreMetricReporterHelper::RemoveInstanceFromProfileUserData, diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn --- a/chrome/browser/privacy/BUILD.gn +++ b/chrome/browser/privacy/BUILD.gn @@ -5335,39 +3498,6 @@ diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn ] sources = [ "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java", -diff --git a/chrome/browser/privacy/privacy_metrics_service_factory.cc b/chrome/browser/privacy/privacy_metrics_service_factory.cc ---- a/chrome/browser/privacy/privacy_metrics_service_factory.cc -+++ b/chrome/browser/privacy/privacy_metrics_service_factory.cc -@@ -8,8 +8,6 @@ - #include "chrome/browser/content_settings/host_content_settings_map_factory.h" - #include "chrome/browser/privacy/privacy_metrics_service.h" - #include "chrome/browser/profiles/profile.h" --#include "chrome/browser/signin/identity_manager_factory.h" --#include "chrome/browser/sync/sync_service_factory.h" - #include "components/keyed_service/content/browser_context_dependency_manager.h" - #include "components/keyed_service/core/keyed_service.h" - -@@ -28,20 +26,9 @@ PrivacyMetricsServiceFactory::PrivacyMetricsServiceFactory() - "PrivacyMetricsService", - BrowserContextDependencyManager::GetInstance()) { - DependsOn(HostContentSettingsMapFactory::GetInstance()); -- DependsOn(SyncServiceFactory::GetInstance()); -- DependsOn(IdentityManagerFactory::GetInstance()); - } - - KeyedService* PrivacyMetricsServiceFactory::BuildServiceInstanceFor( - content::BrowserContext* context) const { -- // No metrics recorded for OTR profiles. -- if (context->IsOffTheRecord()) - return nullptr; -- -- Profile* profile = Profile::FromBrowserContext(context); -- return new PrivacyMetricsService( -- profile->GetPrefs(), -- HostContentSettingsMapFactory::GetForProfile(profile), -- SyncServiceFactory::GetForProfile(profile), -- IdentityManagerFactory::GetForProfile(profile)); - } diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml --- a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml +++ b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml @@ -5386,222 +3516,10 @@ diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_revie GetPrefs(), - profile->GetProfilePolicyConnector()->policy_service(), -- SyncServiceFactory::GetForProfile(profile), -- IdentityManagerFactory::GetForProfile(profile), -+ nullptr, -+ nullptr, - profile->GetDefaultStoragePartition()->GetInterestGroupManager(), - profile_metrics::GetBrowserProfileType(profile), - (!profile->IsGuestSession() || profile->IsOffTheRecord()) -diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc ---- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc -+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc -@@ -10,27 +10,11 @@ - #include "components/prefs/pref_service.h" - #include "components/privacy_sandbox/privacy_sandbox_features.h" - #include "components/privacy_sandbox/privacy_sandbox_prefs.h" --#include "components/signin/public/identity_manager/identity_manager.h" --#include "components/signin/public/identity_manager/tribool.h" - - namespace { - - bool PrivacySandboxRestrictedByAcccountCapability(Profile* profile) { -- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile); -- -- if (!identity_manager) -- return false; -- -- const auto core_account_info = -- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin); -- const AccountInfo account_info = -- identity_manager->FindExtendedAccountInfo(core_account_info); -- auto capability = -- account_info.capabilities.can_run_chrome_privacy_sandbox_trials(); -- -- // The Privacy Sandbox is not considered restricted unless the capability -- // has a definitive false signal. -- return capability == signin::Tribool::kFalse; -+ return false; - } - - } // namespace -diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -87,16 +87,8 @@ - #include "chrome/browser/sessions/tab_restore_service_factory.h" - #include "chrome/browser/sharing/sharing_service_factory.h" - #include "chrome/browser/sharing_hub/sharing_hub_service_factory.h" --#include "chrome/browser/signin/about_signin_internals_factory.h" --#include "chrome/browser/signin/account_consistency_mode_manager_factory.h" --#include "chrome/browser/signin/account_investigator_factory.h" --#include "chrome/browser/signin/account_reconcilor_factory.h" --#include "chrome/browser/signin/chrome_signin_client_factory.h" --#include "chrome/browser/signin/identity_manager_factory.h" --#include "chrome/browser/signin/signin_profile_attributes_updater_factory.h" - #include "chrome/browser/ssl/sct_reporting_service_factory.h" - #include "chrome/browser/sync/model_type_store_service_factory.h" --#include "chrome/browser/sync/sync_service_factory.h" - #include "chrome/browser/sync/user_event_service_factory.h" - #include "chrome/browser/themes/theme_service_factory.h" - #include "chrome/browser/translate/translate_ranker_factory.h" -@@ -280,12 +272,8 @@ void ChromeBrowserMainExtraPartsProfiles:: - ash::EnsureBrowserContextKeyedServiceFactoriesBuilt(); - #endif - -- AboutSigninInternalsFactory::GetInstance(); - AboutThisSiteServiceFactory::GetInstance(); - AccessContextAuditServiceFactory::GetInstance(); -- AccountConsistencyModeManagerFactory::GetInstance(); -- AccountInvestigatorFactory::GetInstance(); -- AccountReconcilorFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) - AccuracyServiceFactory::GetInstance(); - #endif -@@ -310,7 +298,6 @@ void ChromeBrowserMainExtraPartsProfiles:: - BookmarkUndoServiceFactory::GetInstance(); - if (breadcrumbs::IsEnabled()) - BreadcrumbManagerKeyedServiceFactory::GetInstance(); -- browser_sync::UserEventServiceFactory::GetInstance(); - BrowsingDataHistoryObserverService::Factory::GetInstance(); - browsing_topics::BrowsingTopicsServiceFactory::GetInstance(); - #if BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -333,7 +320,6 @@ void ChromeBrowserMainExtraPartsProfiles:: - ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); - #endif - ChromeBrowsingDataRemoverDelegateFactory::GetInstance(); -- ChromeSigninClientFactory::GetInstance(); - ClientHintsFactory::GetInstance(); - ConsentAuditorFactory::GetInstance(); - CookieSettingsFactory::GetInstance(); -@@ -370,7 +356,6 @@ void ChromeBrowserMainExtraPartsProfiles:: - HistoryUiFaviconRequestHandlerFactory::GetInstance(); - HostContentSettingsMapFactory::GetInstance(); - HttpsEngagementServiceFactory::GetInstance(); -- IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt(); - InMemoryURLIndexFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) - InstantServiceFactory::GetInstance(); -@@ -475,7 +460,6 @@ void ChromeBrowserMainExtraPartsProfiles:: - ProfileAccountManagerFactory::GetInstance(); - #endif - ProfileNetworkContextServiceFactory::GetInstance(); -- SyncServiceFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) - ProfileThemeUpdateServiceFactory::GetInstance(); - #endif -@@ -521,7 +505,6 @@ void ChromeBrowserMainExtraPartsProfiles:: - #endif - commerce::ShoppingServiceFactory::GetInstance(); - ShortcutsBackendFactory::GetInstance(); -- SigninProfileAttributesUpdaterFactory::GetInstance(); - if (site_engagement::SiteEngagementService::IsEnabled()) - site_engagement::SiteEngagementServiceFactory::GetInstance(); - #if BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) -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 -@@ -91,8 +91,6 @@ - #include "chrome/browser/push_messaging/push_messaging_service_impl.h" - #include "chrome/browser/sessions/exit_type_service.h" - #include "chrome/browser/sharing/sharing_service_factory.h" --#include "chrome/browser/signin/identity_manager_factory.h" --#include "chrome/browser/signin/signin_ui_util.h" - #include "chrome/browser/ssl/https_first_mode_settings_tracker.h" - #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h" - #include "chrome/browser/startup_data.h" -@@ -145,7 +143,6 @@ - #include "components/profile_metrics/browser_profile_type.h" - #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" - #include "components/signin/public/base/signin_pref_names.h" --#include "components/signin/public/identity_manager/identity_manager.h" - #include "components/site_isolation/site_isolation_policy.h" - #include "components/spellcheck/spellcheck_buildflags.h" - #include "components/sync_preferences/pref_service_syncable.h" -@@ -923,13 +920,6 @@ ProfileImpl::~ProfileImpl() { - } - - std::string ProfileImpl::GetProfileUserName() const { -- const signin::IdentityManager* identity_manager = -- IdentityManagerFactory::GetForProfileIfExists(this); -- if (identity_manager) { -- return identity_manager->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 -@@ -27,14 +27,10 @@ import org.chromium.chrome.browser.browserservices.intents.WebappConstants; +@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.profiles.Profile; @@ -5609,22 +3527,10 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.widget.RoundedCornerImageView; - import org.chromium.components.embedder_support.util.UrlConstants; --import org.chromium.components.signin.base.AccountInfo; --import org.chromium.components.signin.identitymanager.ConsentLevel; --import org.chromium.components.signin.identitymanager.IdentityManager; - import org.chromium.ui.text.NoUnderlineClickableSpan; - import org.chromium.ui.text.SpanApplier; - import org.chromium.ui.widget.Toast; -@@ -108,41 +104,6 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte - ListView listView = mContentView.findViewById(R.id.device_picker_list); - listView.setAdapter(mAdapter); - listView.setOnItemClickListener(this); -- -- createManageDevicesLink(listView); -- } -- -- private void createManageDevicesLink(ListView deviceListView) { +@@ -113,36 +112,7 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte + } + + private void createManageDevicesLink(ListView deviceListView) { - ViewGroup containerView = (ViewGroup) LayoutInflater.from(mContext).inflate( - R.layout.send_tab_to_self_manage_devices_link, null); - deviceListView.addFooterView(containerView); @@ -5655,10 +3561,11 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s - TextView linkView = containerView.findViewById(R.id.manage_devices_link); - linkView.setText(linkText); - linkView.setMovementMethod(LinkMovementMethod.getInstance()); ++ // the user must be signed-in to share a tab } private void openManageDevicesPageInNewTab(View unused) { -@@ -252,11 +213,4 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte +@@ -252,11 +222,4 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte mController.hideContent(this, true); } @@ -5806,48 +3713,119 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s + return false; } } -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 -@@ -41,14 +41,11 @@ SavePasswordInfoBar::CreateRenderInfoBar( - ConvertUTF16ToJavaString(env, save_password_delegate->GetMessageText()); - ScopedJavaLocalRef details_message_text = ConvertUTF16ToJavaString( - env, save_password_delegate->GetDetailsMessageText()); -- ScopedJavaLocalRef account_info = -- !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_) -- : nullptr; +diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc +--- a/chrome/browser/signin/account_consistency_mode_manager.cc ++++ b/chrome/browser/signin/account_consistency_mode_manager.cc +@@ -31,9 +31,9 @@ + #error "Dice and Mirror cannot be both enabled." + #endif - base::android::ScopedJavaLocalRef infobar; - infobar.Reset(Java_SavePasswordInfoBar_show( - env, resource_id_mapper.Run(delegate()->GetIconId()), message_text, -- details_message_text, ok_button_text, cancel_button_text, account_info)); -+ details_message_text, ok_button_text, cancel_button_text)); +-#if !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR) +-#error "Either Dice or Mirror should be enabled." +-#endif ++// #if !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR) ++// #error "Either Dice or Mirror should be enabled." ++// #endif - java_infobar_.Reset(env, infobar.obj()); - return infobar; -diff --git a/chrome/browser/ui/android/infobars/update_password_infobar.cc b/chrome/browser/ui/android/infobars/update_password_infobar.cc ---- a/chrome/browser/ui/android/infobars/update_password_infobar.cc -+++ b/chrome/browser/ui/android/infobars/update_password_infobar.cc -@@ -45,9 +45,6 @@ UpdatePasswordInfoBar::CreateRenderInfoBar( - ConvertUTF16ToJavaString(env, update_password_delegate->GetMessageText()); - ScopedJavaLocalRef details_message_text = ConvertUTF16ToJavaString( - env, update_password_delegate->GetDetailsMessageText()); -- ScopedJavaLocalRef account_info = -- !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_) -- : nullptr; - std::vector usernames; - unsigned int selected_username = - update_password_delegate->GetDisplayUsernames(&usernames); -@@ -57,8 +54,7 @@ UpdatePasswordInfoBar::CreateRenderInfoBar( - base::android::ScopedJavaLocalRef infobar; - infobar.Reset(Java_UpdatePasswordInfoBar_show( - env, resource_id_mapper.Run(delegate()->GetIconId()), display_usernames, -- selected_username, message_text, details_message_text, ok_button_text, -- account_info)); -+ selected_username, message_text, details_message_text, ok_button_text)); + using signin::AccountConsistencyMethod; - java_infobar_.Reset(env, infobar.obj()); - return infobar; +@@ -202,6 +202,5 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( + return AccountConsistencyMethod::kDice; + #endif + +- NOTREACHED(); + return AccountConsistencyMethod::kDisabled; + } +diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrome/browser/signin/identity_services_provider_android.cc +--- a/chrome/browser/signin/identity_services_provider_android.cc ++++ b/chrome/browser/signin/identity_services_provider_android.cc +@@ -6,7 +6,6 @@ + #include "chrome/browser/profiles/profile_android.h" + #include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/browser/signin/services/android/jni_headers/IdentityServicesProvider_jni.h" +-#include "chrome/browser/signin/signin_manager_android_factory.h" + #include "components/signin/public/identity_manager/identity_manager.h" + + using base::android::JavaParamRef; +@@ -29,11 +28,3 @@ JNI_IdentityServicesProvider_GetAccountTrackerService( + IdentityManagerFactory::GetForProfile(profile); + return identity_manager->LegacyGetAccountTrackerServiceJavaObject(); + } +- +-static ScopedJavaLocalRef +-JNI_IdentityServicesProvider_GetSigninManager( +- JNIEnv* env, +- const JavaParamRef& j_profile_android) { +- Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile_android); +- return SigninManagerAndroidFactory::GetJavaObjectForProfile(profile); +-} +diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java +--- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java ++++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/IdentityServicesProvider.java +@@ -61,23 +61,9 @@ public class IdentityServicesProvider { + return result; + } + +- /** +- * Getter for {@link SigninManager} instance for given profile. +- * @param profile The profile to get regarding sign-in manager. +- * @return a {@link SigninManager} instance. +- */ +- @MainThread +- public SigninManager getSigninManager(Profile profile) { +- ThreadUtils.assertOnUiThread(); +- SigninManager result = IdentityServicesProviderJni.get().getSigninManager(profile); +- assert result != null; +- return result; +- } +- + @NativeMethods + public interface Natives { + IdentityManager getIdentityManager(Profile profile); + AccountTrackerService getAccountTrackerService(Profile profile); +- SigninManager getSigninManager(Profile profile); + } + } +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/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn @@ -5878,10 +3856,336 @@ 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/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmImportSyncDataDialogCoordinator.java +@@ -13,7 +13,6 @@ import androidx.annotation.MainThread; + + import org.chromium.base.metrics.RecordUserAction; + import org.chromium.chrome.browser.profiles.Profile; +-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; + import org.chromium.components.browser_ui.settings.ManagedPreferencesUtils; + import org.chromium.components.browser_ui.widget.RadioButtonWithDescription; + import org.chromium.ui.modaldialog.DialogDismissalCause; +@@ -80,11 +79,7 @@ public class ConfirmImportSyncDataDialogCoordinator { + mKeepSeparateOption = + mConfirmImportSyncDataView.findViewById(R.id.sync_keep_separate_choice); + +- boolean isCurrentAccountManaged = +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .getManagementDomain() +- != null; ++ boolean isCurrentAccountManaged = false; + mModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) + .with(ModalDialogProperties.CANCEL_ON_TOUCH_OUTSIDE, true) + .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/ConfirmSyncDataStateMachine.java +@@ -175,9 +175,6 @@ public class ConfirmSyncDataStateMachine implements ConfirmImportSyncDataDialogC + } + + private void requestNewAccountManagementStatus() { +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .isAccountManaged(mNewAccountName, this::setIsNewAccountManaged); + } + + private void setIsNewAccountManaged(Boolean isManaged) { +@@ -193,17 +190,8 @@ public class ConfirmSyncDataStateMachine implements ConfirmImportSyncDataDialogC + assert mNewAccountManaged != null; + assert mState == State.AFTER_NEW_ACCOUNT_DIALOG; + +- if (mNewAccountManaged) { +- // Show 'logging into managed account' dialog +- // This will call back into onConfirm on success. +- mDelegate.showSignInToManagedAccountDialog(this, +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .extractDomainName(mNewAccountName)); +- } else { +- mDelegate.dismissAllDialogs(); +- progress(); +- } ++ mDelegate.dismissAllDialogs(); ++ progress(); + } + + private void showProgressDialog() { +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SignOutDialogFragment.java +@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.preferences.Pref; + import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics; + import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; +-import org.chromium.chrome.browser.signin.services.SigninManager; + import org.chromium.chrome.browser.signin.services.SigninMetricsUtils; + import org.chromium.components.signin.GAIAServiceType; + import org.chromium.components.user_prefs.UserPrefs; +@@ -91,12 +90,6 @@ public class SignOutDialogFragment + assert getArguments() != null; + mActionType = getArguments().getInt(ACTION_TYPE); + mGaiaServiceType = getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType); +- String domain = IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .getManagementDomain(); +- if (domain != null) { +- return createDialogForManagedAccount(domain); +- } + + return createDialog(); + } +@@ -152,12 +145,6 @@ public class SignOutDialogFragment + if (which == AlertDialog.BUTTON_POSITIVE) { + SigninMetricsUtils.logProfileAccountManagementMenu( + ProfileAccountManagementMetrics.SIGNOUT_SIGNOUT, mGaiaServiceType); +- SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- if (mWipeUserData != null) { +- RecordHistogram.recordBooleanHistogram( +- "Signin.UserRequestedWipeDataOnSignout", mWipeUserData.isChecked()); +- } + SignOutDialogListener targetFragment = (SignOutDialogListener) getTargetFragment(); + targetFragment.onSignOutClicked(mWipeUserData != null && mWipeUserData.isChecked()); + } +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninPromoController.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninPromoController.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninPromoController.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SigninPromoController.java +@@ -131,20 +131,7 @@ public class SigninPromoController { + * @param accessPoint The access point for which the impression limit is being checked. + */ + public static boolean canShowSyncPromo(@AccessPoint int accessPoint) { +- switch (accessPoint) { +- case SigninAccessPoint.BOOKMARK_MANAGER: +- return canShowBookmarkPromo(); +- case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS: +- return canShowNTPPromo(); +- case SigninAccessPoint.RECENT_TABS: +- // There is no impression limit or dismiss button in Recent Tabs promo. +- return true; +- case SigninAccessPoint.SETTINGS: +- return canShowSettingsPromo(); +- default: +- assert false : "Unexpected value for access point: " + accessPoint; +- return false; +- } ++ return false; + } + + /** +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/SyncConsentFragmentBase.java +@@ -206,35 +206,8 @@ public abstract class SyncConsentFragmentBase + // this method replaces onSyncAccepted(), the field can be set directly. + protected void signinAndEnableSync( + String accountName, boolean settingsClicked, Runnable callback) { +- AccountManagerFacadeProvider.getInstance().getAccounts().then(accounts -> { +- @Nullable +- Account account = AccountUtils.findAccountByName(accounts, accountName); +- if (account == null) { +- callback.run(); +- return; +- } +- SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- signinManager.signinAndEnableSync( +- mSigninAccessPoint, account, new SigninManager.SignInCallback() { +- @Override +- public void onSignInComplete() { +- UnifiedConsentServiceBridge.setUrlKeyedAnonymizedDataCollectionEnabled( +- Profile.getLastUsedRegularProfile(), true); +- if (!settingsClicked) { +- SyncService.get().setFirstSetupComplete( +- SyncFirstSetupCompleteSource.BASIC_FLOW); +- } +- closeAndMaybeOpenSyncSettings(settingsClicked); +- callback.run(); +- } +- +- @Override +- public void onSignInAborted() { +- callback.run(); +- } +- }); +- }); ++ // do nothing ++ callback.run(); + } + + @Override +@@ -282,10 +255,6 @@ public abstract class SyncConsentFragmentBase + : ProfileDataCache.createWithDefaultImageSizeAndNoBadge(requireContext()); + mProfileDataCache.addObserver(mProfileDataCacheObserver); + +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .addSignInStateObserver(this); +- + // By default this is set to true so that when system back button is pressed user action + // is recorded in onDestroy(). + mRecordUndoSignin = true; +@@ -296,9 +265,6 @@ public abstract class SyncConsentFragmentBase + @Override + public void onDestroy() { + super.onDestroy(); +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .removeSignInStateObserver(this); + mProfileDataCache.removeObserver(mProfileDataCacheObserver); + if (mConfirmSyncDataStateMachine != null) { + mConfirmSyncDataStateMachine.cancel(/* isBeingDestroyed = */ true); +@@ -537,21 +503,6 @@ public abstract class SyncConsentFragmentBase + + // Don't start sign-in if this fragment has been destroyed. + if (mDestroyed) return; +- +- SigninManager signinManager = +- IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- signinManager.runAfterOperationInProgress(() -> { +- if (wipeData) { +- signinManager.wipeSyncUserData(() -> { +- onSyncAccepted(mSelectedAccountName, settingsClicked, +- () -> mIsSigninInProgress = false); +- }); +- } else { +- onSyncAccepted(mSelectedAccountName, settingsClicked, +- () -> mIsSigninInProgress = false); +- } +- }); + } + + @Override +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/account_picker/WebSigninAccountPickerDelegate.java +@@ -28,7 +28,6 @@ public class WebSigninAccountPickerDelegate implements AccountPickerDelegate { + private final Tab mCurrentTab; + private final WebSigninBridge.Factory mWebSigninBridgeFactory; + private final String mContinueUrl; +- private final SigninManager mSigninManager; + private final IdentityManager mIdentityManager; + private @Nullable WebSigninBridge mWebSigninBridge; + +@@ -43,8 +42,6 @@ public class WebSigninAccountPickerDelegate implements AccountPickerDelegate { + mCurrentTab = currentTab; + mWebSigninBridgeFactory = webSigninBridgeFactory; + mContinueUrl = continueUrl; +- mSigninManager = IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); + mIdentityManager = IdentityServicesProvider.get().getIdentityManager( + Profile.getLastUsedRegularProfile()); + } +@@ -62,27 +59,7 @@ public class WebSigninAccountPickerDelegate implements AccountPickerDelegate { + // if user retries the sign-in from the error screen, we need to sign out the user + // first before signing in again. + destroyWebSigninBridge(); +- mSigninManager.signOut(SignoutReason.SIGNIN_RETRIGGERD_FROM_WEB_SIGNIN); + } +- AccountInfoServiceProvider.get().getAccountInfoByEmail(accountEmail).then(accountInfo -> { +- mWebSigninBridge = +- mWebSigninBridgeFactory.create(Profile.getLastUsedRegularProfile(), accountInfo, +- createWebSigninBridgeListener( +- mCurrentTab, mContinueUrl, onSignInErrorCallback)); +- mSigninManager.signin(AccountUtils.createAccountFromName(accountEmail), +- new SigninManager.SignInCallback() { +- @Override +- public void onSignInComplete() { +- // After the sign-in is finished in Chrome, we still need to wait for +- // WebSigninBridge to be called to redirect to the continue url. +- } +- +- @Override +- public void onSignInAborted() { +- WebSigninAccountPickerDelegate.this.destroyWebSigninBridge(); +- } +- }); +- }); + } + + @Override +diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java +--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java ++++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java +@@ -87,11 +87,7 @@ class SigninFirstRunMediator implements AccountsChangeObserver, ProfileDataCache + void onNativeAndPolicyLoaded(boolean hasPolicies) { + mModel.set(SigninFirstRunProperties.ARE_NATIVE_AND_POLICY_LOADED, true); + mModel.set(SigninFirstRunProperties.FRE_POLICY, hasPolicies ? new FrePolicy() : null); +- final boolean isSigninSupported = ExternalAuthUtils.getInstance().canUseGooglePlayServices() +- && !IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .isSigninDisabledByPolicy(); +- mModel.set(SigninFirstRunProperties.IS_SIGNIN_SUPPORTED, isSigninSupported); ++ mModel.set(SigninFirstRunProperties.IS_SIGNIN_SUPPORTED, false); + + if (!mPrivacyPreferencesManager.isUsageAndCrashReportingPermittedByPolicy()) { + // If metrics reporting is disabled by policy then there is at least one policy. +@@ -174,58 +170,12 @@ class SigninFirstRunMediator implements AccountsChangeObserver, ProfileDataCache + TextUtils.equals(mDefaultAccountName, mSelectedAccountName) + ? MobileFreProgress.WELCOME_SIGNIN_WITH_DEFAULT_ACCOUNT + : MobileFreProgress.WELCOME_SIGNIN_WITH_NON_DEFAULT_ACCOUNT); +- // If the user signs into an account on the FRE, goes to the sync consent page and presses +- // back to come back to the FRE, then there will already be an account signed in. +- @Nullable +- CoreAccountInfo signedInAccount = +- IdentityServicesProvider.get() +- .getIdentityManager(Profile.getLastUsedRegularProfile()) +- .getPrimaryAccountInfo(ConsentLevel.SIGNIN); +- if (signedInAccount != null && signedInAccount.getEmail().equals(mSelectedAccountName)) { +- mDelegate.advanceToNextPage(); +- return; +- } +- mModel.set(SigninFirstRunProperties.SHOW_SIGNIN_PROGRESS_SPINNER, true); +- final SigninManager signinManager = IdentityServicesProvider.get().getSigninManager( +- Profile.getLastUsedRegularProfile()); +- signinManager.onFirstRunCheckDone(); +- signinManager.signin( +- AccountUtils.createAccountFromName(mSelectedAccountName), new SignInCallback() { +- @Override +- public void onSignInComplete() { +- // Wait for sign-in to be complete before advancing to the next page. +- mDelegate.advanceToNextPage(); +- } +- +- @Override +- public void onSignInAborted() { +- // TODO(crbug/1248090): Handle the sign-in error here +- } +- }); + } + + /** + * Callback for the PropertyKey {@link SigninFirstRunProperties#ON_DISMISS_CLICKED}. + */ + private void onDismissClicked() { +- if (isContinueOrDismissClicked()) return; +- assert mModel.get(SigninFirstRunProperties.ARE_NATIVE_AND_POLICY_LOADED) +- : "The dismiss button shouldn't be visible before the native is not initialized!"; +- mDelegate.recordFreProgressHistogram(MobileFreProgress.WELCOME_DISMISS); +- mDelegate.acceptTermsOfService(); +- if (IdentityServicesProvider.get() +- .getIdentityManager(Profile.getLastUsedRegularProfile()) +- .hasPrimaryAccount(ConsentLevel.SIGNIN)) { +- mModel.set(SigninFirstRunProperties.SHOW_SIGNIN_PROGRESS_SPINNER, true); +- IdentityServicesProvider.get() +- .getSigninManager(Profile.getLastUsedRegularProfile()) +- .signOut(SignoutReason.ABORT_SIGNIN, +- () +- -> { mDelegate.advanceToNextPage(); }, +- /* forceWipeUserData= */ false); +- } else { +- mDelegate.advanceToNextPage(); +- } + } + + /** 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 -@@ -306,9 +306,6 @@ CHAR_LIMIT guidelines: +@@ -285,9 +285,6 @@ CHAR_LIMIT guidelines: Sign in to Chrome @@ -5891,7 +4195,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Sync and personalize across devices -@@ -418,21 +415,6 @@ CHAR_LIMIT guidelines: +@@ -397,21 +394,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. @@ -5913,151 +4217,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -diff --git a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java ---- a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java -+++ b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java -@@ -54,9 +54,6 @@ public interface AssistantStaticDependencies { - - AssistantSettingsUtil createSettingsUtil(); - -- @CalledByNative -- AssistantAccessTokenUtil createAccessTokenUtil(); -- - BrowserContextHandle getBrowserContext(); - - @CalledByNative -diff --git a/components/autofill_assistant/browser/android/dependencies_android.cc b/components/autofill_assistant/browser/android/dependencies_android.cc ---- a/components/autofill_assistant/browser/android/dependencies_android.cc -+++ b/components/autofill_assistant/browser/android/dependencies_android.cc -@@ -51,13 +51,6 @@ ScopedJavaGlobalRef DependenciesAndroid::CreateInfoPageUtil() const { - AttachCurrentThread(), jstatic_dependencies_)); - } - --ScopedJavaGlobalRef DependenciesAndroid::CreateAccessTokenUtil() -- const { -- return ScopedJavaGlobalRef( -- Java_AssistantStaticDependencies_createAccessTokenUtil( -- AttachCurrentThread(), jstatic_dependencies_)); --} -- - 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/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h ---- a/components/omnibox/browser/autocomplete_provider_client.h -+++ b/components/omnibox/browser/autocomplete_provider_client.h -@@ -52,10 +52,6 @@ namespace component_updater { - class ComponentUpdateService; - } - --namespace signin { --class IdentityManager; --} -- - namespace query_tiles { - class TileService; - } -@@ -125,9 +121,6 @@ class AutocompleteProviderClient : public OmniboxAction::Client { - virtual component_updater::ComponentUpdateService* - GetComponentUpdateService() = 0; - -- // Returns the signin::IdentityManager associated with the current profile. -- virtual signin::IdentityManager* GetIdentityManager() const = 0; -- - virtual bool IsOffTheRecord() const = 0; - virtual bool IsAlwaysIncognitoEnabled() const = 0; - virtual bool SearchSuggestEnabled() const = 0; -diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn ---- a/components/password_manager/core/browser/BUILD.gn -+++ b/components/password_manager/core/browser/BUILD.gn -@@ -174,15 +174,6 @@ static_library("browser") { - "password_notes_table.h", - "password_requirements_service.cc", - "password_requirements_service.h", -- "password_reuse_detection_manager.cc", -- "password_reuse_detection_manager.h", -- "password_reuse_detector.cc", -- "password_reuse_detector.h", -- "password_reuse_detector_consumer.cc", -- "password_reuse_detector_consumer.h", -- "password_reuse_manager.h", -- "password_reuse_manager_impl.cc", -- "password_reuse_manager_impl.h", - "password_save_manager.h", - "password_save_manager_impl.cc", - "password_save_manager_impl.h", 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 @@ -6128,176 +4287,6 @@ diff --git a/components/password_manager/core/browser/password_form_manager.cc b } bool PasswordFormManager::IsNewLogin() const { -diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc ---- a/components/password_manager/core/browser/password_manager.cc -+++ b/components/password_manager/core/browser/password_manager.cc -@@ -995,7 +995,6 @@ void PasswordManager::OnLoginSuccessful() { - if (!client_->IsSavingAndFillingEnabled(submitted_form->url)) - return; - -- client_->GetStoreResultFilter()->ReportFormLoginSuccess(*submitted_manager); - // Check for leaks only if there are no muted credentials. - if (!HasMutedCredentials( - submitted_manager->GetInsecureCredentials(), -@@ -1019,22 +1018,6 @@ void PasswordManager::OnLoginSuccessful() { - - MaybeSavePasswordHash(submitted_manager); - -- // TODO(https://crbug.com/831123): Implement checking whether to save with -- // PasswordFormManager. -- // Check whether the filter allows saving this credential. In practice, this -- // prevents saving the password of the syncing account. However, if the -- // password is already saved, then *updating* it is still allowed - better -- // than keeping an outdated password around. -- if (!submitted_manager->IsPasswordUpdate() && -- !client_->GetStoreResultFilter()->ShouldSave( -- *submitted_manager->GetSubmittedForm())) { -- RecordProvisionalSaveFailure( -- PasswordManagerMetricsRecorder::SYNC_CREDENTIAL, -- submitted_manager->GetURL()); -- ResetSubmittedManager(); -- return; -- } -- - submitted_manager->GetMetricsRecorder()->LogSubmitPassed(); - - UMA_HISTOGRAM_BOOLEAN( -@@ -1083,54 +1066,6 @@ void PasswordManager::MaybeSavePasswordHash( - std::string username = base::UTF16ToUTF8(submitted_form->username_value); - if (username.empty()) - return; -- -- password_manager::PasswordReuseManager* reuse_manager = -- client_->GetPasswordReuseManager(); -- // May be null in tests. -- if (!reuse_manager) -- return; -- -- bool should_save_enterprise_pw = -- client_->GetStoreResultFilter()->ShouldSaveEnterprisePasswordHash( -- *submitted_form); -- bool should_save_gaia_pw = -- client_->GetStoreResultFilter()->ShouldSaveGaiaPasswordHash( -- *submitted_form); -- -- if (!should_save_enterprise_pw && !should_save_gaia_pw) -- return; -- -- if (password_manager_util::IsLoggingActive(client_)) { -- BrowserSavePasswordProgressLogger logger(client_->GetLogManager()); -- logger.LogMessage(Logger::STRING_SAVE_PASSWORD_HASH); -- } -- -- // Canonicalizes username if it is an email. -- if (username.find('@') != std::string::npos) -- username = gaia::CanonicalizeEmail(username); -- bool is_password_change = !submitted_form->new_password_element.empty(); -- const std::u16string password = is_password_change -- ? submitted_form->new_password_value -- : submitted_form->password_value; -- -- if (should_save_enterprise_pw) { -- reuse_manager->SaveEnterprisePasswordHash(username, password); -- return; -- } -- -- DCHECK(should_save_gaia_pw); -- bool is_sync_account_email = -- client_->GetStoreResultFilter()->IsSyncAccountEmail(username); -- GaiaPasswordHashChange event = -- is_sync_account_email -- ? (is_password_change -- ? GaiaPasswordHashChange::CHANGED_IN_CONTENT_AREA -- : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA) -- : (is_password_change -- ? GaiaPasswordHashChange::NOT_SYNC_PASSWORD_CHANGE -- : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA); -- reuse_manager->SaveGaiaPasswordHash(username, password, is_sync_account_email, -- event); - } - - void PasswordManager::ProcessAutofillPredictions( -@@ -1345,23 +1280,6 @@ void PasswordManager::ShowManualFallbackForSaving( - ShouldBlockPasswordForSameOriginButDifferentScheme(form_data.url)) { - return; - } -- -- if (!client_->GetStoreResultFilter()->ShouldSave( -- *form_manager->GetSubmittedForm())) { -- return; -- } -- -- // Show the fallback if a prompt or a confirmation bubble should be available. -- bool has_generated_password = form_manager->HasGeneratedPassword(); -- if (ShouldPromptUserToSavePassword(*form_manager) || has_generated_password) { -- bool is_update = form_manager->IsPasswordUpdate(); -- form_manager->GetMetricsRecorder()->RecordShowManualFallbackForSaving( -- has_generated_password, is_update); -- client_->ShowManualFallbackForSaving(form_manager->Clone(), -- has_generated_password, is_update); -- } else { -- HideManualFallbackForSaving(); -- } - } - - bool PasswordManager::NewFormsParsed(PasswordManagerDriver* driver, -diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h ---- a/components/password_manager/core/browser/password_manager_client.h -+++ b/components/password_manager/core/browser/password_manager_client.h -@@ -300,18 +300,12 @@ class PasswordManagerClient { - // Gets prefs associated with this embedder. - virtual PrefService* GetPrefs() const = 0; - -- // Gets the sync service associated with this client. -- virtual const syncer::SyncService* GetSyncService() const = 0; -- - // Returns the profile PasswordStore associated with this instance. - virtual PasswordStoreInterface* GetProfilePasswordStore() const = 0; - - // Returns the account PasswordStore associated with this instance. - virtual PasswordStoreInterface* GetAccountPasswordStore() const = 0; - -- // Returns the PasswordReuseManager associated with this instance. -- virtual PasswordReuseManager* GetPasswordReuseManager() const = 0; -- - // Returns the PasswordScriptsFetcher associated with this instance. - virtual PasswordScriptsFetcher* GetPasswordScriptsFetcher() = 0; - -@@ -367,9 +361,6 @@ class PasswordManagerClient { - // Returns last committed origin of the main frame. - virtual url::Origin GetLastCommittedOrigin() const = 0; - -- // Use this to filter credentials before handling them in password manager. -- virtual const CredentialsFilter* GetStoreResultFilter() const = 0; -- - // Returns a LogManager instance. - virtual const autofill::LogManager* GetLogManager() const; - -@@ -398,14 +389,6 @@ class PasswordManagerClient { - // The |username| is the user name of the reused password. The user name - // can be an email or a username for a non-GAIA or saved-password reuse. No - // validation has been done on it. -- virtual void CheckProtectedPasswordEntry( -- metrics_util::PasswordType reused_password_type, -- const std::string& username, -- const std::vector& matching_reused_credentials, -- bool password_field_exists) = 0; -- -- // Records a Chrome Sync event that GAIA password reuse was detected. -- virtual void LogPasswordReuseDetectedEvent() = 0; - - // If the feature is enabled send an event to the enterprise reporting - // connector server indicating that the user signed in to a website. -@@ -441,9 +424,6 @@ class PasswordManagerClient { - // Returns the favicon service used to retrieve icons for an origin. - virtual favicon::FaviconService* GetFaviconService(); - -- // Returns the identity manager for profile. -- virtual signin::IdentityManager* GetIdentityManager() = 0; -- - // Returns a pointer to the URLLoaderFactory owned by the storage partition of - // the current profile. - virtual scoped_refptr diff --git a/components/password_manager/core/browser/password_manager_client_helper.cc b/components/password_manager/core/browser/password_manager_client_helper.cc --- a/components/password_manager/core/browser/password_manager_client_helper.cc +++ b/components/password_manager/core/browser/password_manager_client_helper.cc diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index 65adbcfe..9e197ff6 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.photo_picker.DecoderService; -@@ -450,10 +449,6 @@ public class ProcessInitializationHandler { +@@ -448,10 +447,6 @@ public class ProcessInitializationHandler { deferredStartupHandler.addDeferredTask( () -> OfflineMeasurementsBackgroundTask.clearPersistedDataFromPrefs()); deferredStartupHandler.addDeferredTask(() -> QueryTileUtils.isQueryTilesEnabledOnNTP()); @@ -139,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileKey; -@@ -101,8 +100,7 @@ import java.util.List; +@@ -102,8 +101,7 @@ import java.util.List; */ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvider, TemplateUrlServiceObserver, @@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. private static final String TAG = "NewTabPage"; // Key for the scroll position data that may be stored in a navigation entry. -@@ -132,7 +130,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -133,7 +131,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide protected boolean mSearchProviderHasLogo; protected OmniboxStub mOmniboxStub; @@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. // The timestamp at which the constructor was called. protected final long mConstructedTimeNs; -@@ -208,8 +205,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -209,8 +206,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide @Override public boolean isVoiceSearchEnabled() { @@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -218,21 +214,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -219,21 +215,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide if (VrModuleProvider.getDelegate().isInVr()) return; FeedReliabilityLogger feedReliabilityLogger = mFeedSurfaceProvider.getReliabilityLogger(); @@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -705,12 +686,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -709,12 +690,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger); } } @@ -202,7 +202,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -721,11 +696,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -725,11 +700,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide } } @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. /** Adds an observer to be notified on most visited tile clicks. */ public void addMostVisitedTileClickObserver(MostVisitedTileClickObserver observer) { mMostVisitedTileClickObservers.addObserver(observer); -@@ -745,9 +715,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -749,9 +719,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide RecordUserAction.record("MobileNTPShown"); mJankTracker.startTrackingScenario(JankScenario.NEW_TAB_PAGE); SuggestionsMetrics.recordSurfaceVisible(); @@ -224,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } /** Records UMA for the NTP being hidden and the time spent on it. */ -@@ -756,7 +723,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -760,7 +727,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide RecordHistogram.recordMediumTimesHistogram("NewTabPage.TimeSpent", (System.nanoTime() - mLastShownTimeNs) / TimeUtils.NANOSECONDS_PER_MILLISECOND); SuggestionsMetrics.recordSurfaceHidden(); @@ -232,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } /** -@@ -855,9 +821,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide +@@ -859,9 +825,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide } mFeedSurfaceProvider.destroy(); mTab.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager); diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 71ac4ab9..1170e4c6 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -83,7 +83,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja 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 -@@ -877,6 +877,7 @@ chrome_java_sources = [ +@@ -884,6 +884,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -1090,7 +1090,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd return content::GetReducedUserAgent( base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseMobileUserAgent), -@@ -553,6 +560,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service) { +@@ -563,6 +570,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service) { policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled); ua_options.force_major_to_minor = GetMajorToMinorFromPrefs(pref_service); } diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index d448bdf9..e5e95c85 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -7,13 +7,14 @@ Allow toggling automatic updates License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../android/java/res/layout/fre_tosanduma.xml | 4 +- + .../firstrun/ChildAccountStatusSupplier.java | 14 +- .../browser/firstrun/FirstRunActivity.java | 40 +---- - .../firstrun/FirstRunActivityBase.java | 17 -- + .../firstrun/FirstRunActivityBase.java | 11 +- .../firstrun/FirstRunFlowSequencer.java | 57 ++---- .../browser/firstrun/FirstRunUtils.java | 13 +- .../firstrun/ToSAndUMAFirstRunFragment.java | 163 +++++------------- .../strings/android_chrome_strings.grd | 27 ++- - 7 files changed, 87 insertions(+), 234 deletions(-) + 8 files changed, 89 insertions(+), 240 deletions(-) diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml @@ -32,6 +33,38 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j android:paddingStart="@dimen/fre_tos_checkbox_padding" android:textAppearance="@style/TextAppearance.TextMedium.Primary" /> +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java +@@ -12,8 +12,6 @@ import org.chromium.base.Callback; + import org.chromium.base.metrics.RecordHistogram; + import org.chromium.base.supplier.OneshotSupplier; + import org.chromium.base.supplier.OneshotSupplierImpl; +-import org.chromium.components.signin.AccountManagerFacade; +-import org.chromium.components.signin.AccountUtils; + + /** + * Fetches the child account status to be used by other FRE components. +@@ -40,18 +38,8 @@ public class ChildAccountStatusSupplier implements OneshotSupplier { + * {@link ChildAccountStatusSupplier} will ignore app restrictions and rely solely on + * {@link AccountManagerFacade}. + */ +- public ChildAccountStatusSupplier(AccountManagerFacade accountManagerFacade, +- @Nullable FirstRunAppRestrictionInfo appRestrictionInfo) { ++ public ChildAccountStatusSupplier() { + mChildAccountStatusStartTime = SystemClock.elapsedRealtime(); +- +- if (appRestrictionInfo != null) { +- appRestrictionInfo.getHasAppRestriction(this::onAppRestrictionDetected); +- } +- +- accountManagerFacade.getAccounts().then(accounts -> { +- AccountUtils.checkChildAccountStatus(accountManagerFacade, accounts, +- (isChild, account) -> onChildAccountStatusReady(isChild)); +- }); + } + + @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java @@ -134,16 +167,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java -@@ -58,8 +58,6 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { - private final long mStartTime; - private long mNativeInitializedTime; +@@ -24,8 +24,6 @@ import org.chromium.chrome.browser.metrics.UmaUtils; + import org.chromium.chrome.browser.policy.PolicyServiceFactory; + import org.chromium.chrome.browser.profiles.ProfileManagerUtils; + import org.chromium.components.policy.PolicyService; +-import org.chromium.components.signin.AccountManagerFacade; +-import org.chromium.components.signin.AccountManagerFacadeProvider; -- private ChildAccountStatusSupplier mChildAccountStatusSupplier; -- - public FirstRunActivityBase() { - mFirstRunAppRestrictionInfo = FirstRunAppRestrictionInfo.takeMaybeInitialized(); - mPolicyServiceSupplier = new OneshotSupplierImpl<>(); -@@ -83,14 +81,6 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { + /** Base class for First Run Experience. */ + public abstract class FirstRunActivityBase extends AsyncInitializationActivity { +@@ -83,14 +81,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { @Override @CallSuper public void triggerLayoutInflation() { @@ -155,23 +188,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR - mChildAccountStatusSupplier = - new ChildAccountStatusSupplier(accountManagerFacade, null); - } ++ mChildAccountStatusSupplier = new ChildAccountStatusSupplier(); } // Activity: -@@ -196,13 +186,6 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity { - return mPolicyLoadListener; - } - -- /** -- * Returns the supplier that supplies child account status. -- */ -- public OneshotSupplier getChildAccountStatusSupplier() { -- return mChildAccountStatusSupplier; -- } -- - /** - * If the first run activity was triggered by a custom tab, notify app associated with - * custom tab whether first run was completed. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java @@ -230,7 +250,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR } /** @return true if first use hints should be skipped. */ -@@ -146,12 +117,8 @@ public abstract class FirstRunFlowSequencer { +@@ -148,12 +119,8 @@ public abstract class FirstRunFlowSequencer { * method. */ void start() { @@ -245,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR } @VisibleForTesting -@@ -177,7 +144,6 @@ public abstract class FirstRunFlowSequencer { +@@ -185,7 +152,6 @@ public abstract class FirstRunFlowSequencer { mIsFlowKnown = true; Bundle freProperties = new Bundle(); @@ -253,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR onFlowIsKnown(freProperties); } -@@ -188,8 +154,8 @@ public abstract class FirstRunFlowSequencer { +@@ -196,8 +162,8 @@ public abstract class FirstRunFlowSequencer { * @param freProperties Resulting FRE properties bundle. */ public void updateFirstRunProperties(Bundle freProperties) { @@ -264,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR freProperties.putBoolean( FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE, shouldShowSearchEnginePage()); } -@@ -248,6 +214,7 @@ public abstract class FirstRunFlowSequencer { +@@ -256,6 +222,7 @@ public abstract class FirstRunFlowSequencer { || FirstRunStatus.getLightweightFirstRunFlowComplete())) { return false; } @@ -272,7 +292,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR return true; } -@@ -295,15 +262,21 @@ public abstract class FirstRunFlowSequencer { +@@ -303,15 +270,21 @@ public abstract class FirstRunFlowSequencer { freIntent = VrModuleProvider.getIntentDelegate().setupVrFreIntent(caller, freIntent); // We cannot access Chrome right now, e.g. because the VR module is not installed.