Migrate getLastUsedRegularProfile from Profile -> ProfileManager.

Deprecated profile methods will be removed in a subsequent CL to avoid late breaking conflicts. Bug: 40254448 Change-Id: I6dddb9f9b78abe58a4f8c3f65b6dd7c1b7489595 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5304420 Reviewed-by: Andrew Grieve <[email protected]> Reviewed-by: Theresa Sullivan <[email protected]> Commit-Queue: Ted Choc <[email protected]> Cr-Commit-Position: refs/heads/main@{#1262058}
sunlin-link · Feb 17, 2024 · f486e3f · f486e3f
1 parent 6929fef
commit f486e3f
Show file tree

Hide file tree

Showing 299 changed files with 935 additions and 714 deletions.
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
@@ -260,7 +260,7 @@ class BanRule:
       ),
     ),
     BanRule(
-      'Profile.getLastUsedRegularProfile()',
+      'ProfileManager.getLastUsedRegularProfile()',
       (
        'Prefer passing in the Profile reference instead of relying on the '
        'static getLastUsedRegularProfile() call. Only top level entry points '

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
@@ -2800,7 +2800,7 @@ def testBannedJavaFunctions(self):
       MockFile('some/java/problematic/requestlayout.java',
                ['requestLayout();']),
       MockFile('some/java/problematic/lastprofile.java',
-               ['Profile.getLastUsedRegularProfile();']),
+               ['ProfileManager.getLastUsedRegularProfile();']),
       MockFile('some/java/problematic/getdrawable1.java',
                ['ResourcesCompat.getDrawable();']),
       MockFile('some/java/problematic/getdrawable2.java',

diff --git a/...g/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java b/...g/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java
@@ -12,7 +12,7 @@
 
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.keyboard_accessory.R;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
 import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
@@ -189,7 +189,7 @@ private static Tracker getTrackerFromProfile() {
         // incognito profile) instead of always using regular profile. It works correctly now,
         // but it is not safe.
         final Tracker tracker =
-                TrackerFactory.getTrackerForProfile(Profile.getLastUsedRegularProfile());
+                TrackerFactory.getTrackerForProfile(ProfileManager.getLastUsedRegularProfile());
         if (!tracker.isInitialized()) return null;
         return tracker;
     }

diff --git a/...nternal/java/src/org/chromium/chrome/browser/keyboard_accessory/helper/FaviconHelper.java b/...nternal/java/src/org/chromium/chrome/browser/keyboard_accessory/helper/FaviconHelper.java
@@ -12,7 +12,7 @@
 
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.keyboard_accessory.R;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
 import org.chromium.components.browser_ui.widget.RoundedIconGenerator;
 import org.chromium.components.favicon.LargeIconBridge;
@@ -74,7 +74,7 @@ public Drawable getDefaultIcon(String origin) {
      */
     public void fetchFavicon(String origin, Callback<Drawable> setIconCallback) {
         final LargeIconBridge mIconBridge =
-                new LargeIconBridge(Profile.getLastUsedRegularProfile());
+                new LargeIconBridge(ProfileManager.getLastUsedRegularProfile());
         final GURL gurlOrigin = new GURL(origin);
         if (!gurlOrigin.isValid()) return;
         mIconBridge.getLargeIconForUrl(

diff --git a/...java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinatorFactory.java b/...java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinatorFactory.java
@@ -17,6 +17,7 @@
 import org.chromium.chrome.browser.feed.ScrollableContainerDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
@@ -107,7 +108,7 @@ ExploreSurfaceCoordinator create(
             boolean isInNightMode,
             boolean isPlaceholderShown,
             @NewTabPageLaunchOrigin int launchOrigin) {
-        Profile profile = Profile.getLastUsedRegularProfile();
+        Profile profile = ProfileManager.getLastUsedRegularProfile();
 
         return new ExploreSurfaceCoordinator(
                 profile,

diff --git a/...va/src/org/chromium/chrome/features/start_surface/ExploreSurfaceFeedLifecycleManager.java b/...va/src/org/chromium/chrome/features/start_surface/ExploreSurfaceFeedLifecycleManager.java
@@ -11,7 +11,7 @@
 import org.chromium.chrome.browser.feed.FeedSurfaceCoordinator;
 import org.chromium.chrome.browser.feed.FeedSurfaceLifecycleManager;
 import org.chromium.chrome.browser.preferences.Pref;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.components.user_prefs.UserPrefs;
 
 /** Explore surface feed lifecycle manager. */
@@ -32,7 +32,7 @@ protected boolean canShow() {
     }
 
     private boolean shouldShowFeed() {
-        return UserPrefs.get(Profile.getLastUsedRegularProfile())
+        return UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
                 .getBoolean(Pref.ARTICLES_LIST_VISIBLE);
     }
 

diff --git a/..._surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/..._surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
@@ -54,6 +54,7 @@
 import org.chromium.chrome.browser.omnibox.OmniboxStub;
 import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesCoordinator;
 import org.chromium.chrome.browser.suggestions.tile.TileGroupDelegateImpl;
@@ -572,7 +573,7 @@ public void initWithNative() {
         mStartSurfaceMediator.initWithNative(
                 mIsStartSurfaceEnabled ? mOmniboxStubSupplier.get() : null,
                 mExploreSurfaceCoordinatorFactory,
-                UserPrefs.get(Profile.getLastUsedRegularProfile()),
+                UserPrefs.get(ProfileManager.getLastUsedRegularProfile()),
                 mSnackbarManager);
 
         if (mGridTabSwitcher != null) {
@@ -1340,7 +1341,7 @@ public void initializeMVTiles() {
             return;
         }
 
-        Profile profile = Profile.getLastUsedRegularProfile();
+        Profile profile = ProfileManager.getLastUsedRegularProfile();
         MostVisitedTileNavigationDelegate navigationDelegate =
                 new MostVisitedTileNavigationDelegate(mActivity, profile, mParentTabSupplier);
         mSuggestionsUiDelegate =

diff --git a/...urface/java/src/org/chromium/chrome/features/tasks/MostVisitedTileNavigationDelegate.java b/...urface/java/src/org/chromium/chrome/features/tasks/MostVisitedTileNavigationDelegate.java
@@ -11,6 +11,7 @@
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
@@ -86,7 +87,7 @@ public void navigateToSuggestionUrl(int windowOpenDisposition, String url, boole
     private void saveUrlForOffline(String url) {
         // TODO(crbug.com/1193816): Namespace shouldn't be NTP_SUGGESTIONS_NAMESPACE since it's
         // not on NTP.
-        RequestCoordinatorBridge.getForProfile(Profile.getLastUsedRegularProfile())
+        RequestCoordinatorBridge.getForProfile(ProfileManager.getLastUsedRegularProfile())
                 .savePageLater(
                         url,
                         OfflinePageBridge.NTP_SUGGESTIONS_NAMESPACE,

diff --git a/...es/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurfaceCoordinator.java b/...es/start_surface/java/src/org/chromium/chrome/features/tasks/TasksSurfaceCoordinator.java
@@ -31,6 +31,7 @@
 import org.chromium.chrome.browser.ntp.IncognitoCookieControlsManager;
 import org.chromium.chrome.browser.omnibox.OmniboxStub;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesCoordinator;
 import org.chromium.chrome.browser.suggestions.tile.TileGroupDelegateImpl;
 import org.chromium.chrome.browser.tab.Tab;
@@ -179,7 +180,7 @@ public TasksSurfaceCoordinator(
         View.OnClickListener incognitoLearnMoreClickListener =
                 v -> {
                     Profile profile =
-                            Profile.getLastUsedRegularProfile()
+                            ProfileManager.getLastUsedRegularProfile()
                                     .getPrimaryOTRProfile(/* createIfNeeded= */ true);
                     HelpAndFeedbackLauncherImpl.getForProfile(profile)
                             .show(
@@ -228,7 +229,7 @@ public void initializeMVTiles() {
             return;
         }
 
-        Profile profile = Profile.getLastUsedRegularProfile();
+        Profile profile = ProfileManager.getLastUsedRegularProfile();
         MostVisitedTileNavigationDelegate navigationDelegate =
                 new MostVisitedTileNavigationDelegate(mActivity, profile, mParentTabSupplier);
         mSuggestionsUiDelegate =

diff --git a/...android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksView.java b/...android/features/start_surface/java/src/org/chromium/chrome/features/tasks/TasksView.java
@@ -34,6 +34,7 @@
 import org.chromium.chrome.browser.ntp.search.SearchBoxCoordinator;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.features.start_surface.StartSurfaceConfiguration;
 import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.widget.CoordinatorLayoutForPointer;
@@ -471,7 +472,7 @@ void setStartSurfaceBackgroundColor(int backgroundColor) {
 
     boolean shouldShowTrackingProtectionNtp() {
         Profile profile =
-                Profile.getLastUsedRegularProfile()
+                ProfileManager.getLastUsedRegularProfile()
                         .getPrimaryOTRProfile(/* createIfNeeded= */ true);
         return (UserPrefs.get(profile).getBoolean(Pref.TRACKING_PROTECTION3PCD_ENABLED)
                 || ChromeFeatureList.isEnabled(ChromeFeatureList.TRACKING_PROTECTION_3PCD));

diff --git a/...urface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartFeedTest.java b/...urface/javatests/src/org/chromium/chrome/features/start_surface/InstantStartFeedTest.java
@@ -48,7 +48,7 @@
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.preferences.Pref;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.tasks.ReturnToChromeUtil;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
@@ -147,7 +147,7 @@ public void testCachedFeedVisibility() {
         // FEED_ARTICLES_LIST_VISIBLE should equal to ARTICLES_LIST_VISIBLE.
         CriteriaHelper.pollUiThread(
                 () ->
-                        UserPrefs.get(Profile.getLastUsedRegularProfile())
+                        UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
                                         .getBoolean(Pref.ARTICLES_LIST_VISIBLE)
                                 == ReturnToChromeUtil.getFeedArticlesVisibility());
 
@@ -158,7 +158,7 @@ public void testCachedFeedVisibility() {
         TestThreadUtils.runOnUiThreadBlocking(
                 () ->
                         Assert.assertEquals(
-                                UserPrefs.get(Profile.getLastUsedRegularProfile())
+                                UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
                                         .getBoolean(Pref.ARTICLES_LIST_VISIBLE),
                                 ReturnToChromeUtil.getFeedArticlesVisibility()));
 
@@ -169,7 +169,7 @@ public void testCachedFeedVisibility() {
         TestThreadUtils.runOnUiThreadBlocking(
                 () ->
                         Assert.assertEquals(
-                                UserPrefs.get(Profile.getLastUsedRegularProfile())
+                                UserPrefs.get(ProfileManager.getLastUsedRegularProfile())
                                         .getBoolean(Pref.ARTICLES_LIST_VISIBLE),
                                 ReturnToChromeUtil.getFeedArticlesVisibility()));
     }

diff --git a/...rt_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java b/...rt_surface/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceTest.java
@@ -85,7 +85,7 @@
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.layouts.LayoutTestUtils;
 import org.chromium.chrome.browser.layouts.LayoutType;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tasks.ReturnToChromeUtil;
@@ -913,7 +913,8 @@ public void test_UsesSpareTabForNavigationFromMVTiles() {
         // SpareTab should be created when the start surface is shown.
         CriteriaHelper.pollUiThread(
                 () -> {
-                    WarmupManager.getInstance().hasSpareTab(Profile.getLastUsedRegularProfile());
+                    WarmupManager.getInstance()
+                            .hasSpareTab(ProfileManager.getLastUsedRegularProfile());
                 });
 
         // The spareTab initializes a renderer process.
@@ -927,7 +928,7 @@ public void test_UsesSpareTabForNavigationFromMVTiles() {
         CriteriaHelper.pollUiThread(
                 () ->
                         !WarmupManager.getInstance()
-                                .hasSpareTab(Profile.getLastUsedRegularProfile()));
+                                .hasSpareTab(ProfileManager.getLastUsedRegularProfile()));
         Assert.assertEquals(
                 1,
                 RecordHistogram.getHistogramValueCountForTesting(
@@ -956,7 +957,8 @@ public void test_UsesSpareTabForNavigationFromSearchBox() {
         // SpareTab should be created when the start surface is shown.
         CriteriaHelper.pollUiThread(
                 () -> {
-                    WarmupManager.getInstance().hasSpareTab(Profile.getLastUsedRegularProfile());
+                    WarmupManager.getInstance()
+                            .hasSpareTab(ProfileManager.getLastUsedRegularProfile());
                 });
 
         // Navigate from StartSurface using search box.
@@ -972,7 +974,7 @@ public void test_UsesSpareTabForNavigationFromSearchBox() {
         CriteriaHelper.pollUiThread(
                 () ->
                         !WarmupManager.getInstance()
-                                .hasSpareTab(Profile.getLastUsedRegularProfile()));
+                                .hasSpareTab(ProfileManager.getLastUsedRegularProfile()));
         Assert.assertEquals(
                 1,
                 RecordHistogram.getHistogramValueCountForTesting(
@@ -999,7 +1001,8 @@ public void test_DoesntUseSpareTabForNavigationFromSingleTabSwitcher() {
         // SpareTab should be created when the start surface is shown.
         CriteriaHelper.pollUiThread(
                 () -> {
-                    WarmupManager.getInstance().hasSpareTab(Profile.getLastUsedRegularProfile());
+                    WarmupManager.getInstance()
+                            .hasSpareTab(ProfileManager.getLastUsedRegularProfile());
                 });
 
         // Navigate from StartSurface using carousel tab switcher.
@@ -1010,7 +1013,7 @@ public void test_DoesntUseSpareTabForNavigationFromSingleTabSwitcher() {
         CriteriaHelper.pollUiThread(
                 () ->
                         !WarmupManager.getInstance()
-                                .hasSpareTab(Profile.getLastUsedRegularProfile()));
+                                .hasSpareTab(ProfileManager.getLastUsedRegularProfile()));
         Assert.assertEquals(
                 1,
                 RecordHistogram.getHistogramValueCountForTesting(
@@ -1038,7 +1041,8 @@ public void test_SpareTabCreatesNewRendererProcessWithParamEnabled() {
         // SpareTab should be created when the start surface is shown.
         CriteriaHelper.pollUiThread(
                 () -> {
-                    WarmupManager.getInstance().hasSpareTab(Profile.getLastUsedRegularProfile());
+                    WarmupManager.getInstance()
+                            .hasSpareTab(ProfileManager.getLastUsedRegularProfile());
                 });
 
         // The renderer process count should be 1 as spareTab also initializes renderer when the
@@ -1067,7 +1071,8 @@ public void test_SpareTabNotUsedOnOtherSurface() {
         // SpareTab should be created when the start surface is shown.
         CriteriaHelper.pollUiThread(
                 () -> {
-                    WarmupManager.getInstance().hasSpareTab(Profile.getLastUsedRegularProfile());
+                    WarmupManager.getInstance()
+                            .hasSpareTab(ProfileManager.getLastUsedRegularProfile());
                 });
 
         // Navigate from start surface using link
@@ -1077,7 +1082,7 @@ public void test_SpareTabNotUsedOnOtherSurface() {
         CriteriaHelper.pollUiThread(
                 () ->
                         !WarmupManager.getInstance()
-                                .hasSpareTab(Profile.getLastUsedRegularProfile()));
+                                .hasSpareTab(ProfileManager.getLastUsedRegularProfile()));
         Assert.assertEquals(
                 1,
                 RecordHistogram.getHistogramValueCountForTesting(

diff --git a/...t/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinatorUnitTestRule.java b/...t/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinatorUnitTestRule.java
@@ -52,6 +52,7 @@
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProviderJni;
@@ -113,8 +114,8 @@ public MockTabModelFilterProvider(Activity activity) {
             List<TabModel> tabModels = new ArrayList<>();
             MockTabModelSelector selector =
                     new MockTabModelSelector(
-                            Profile.getLastUsedRegularProfile(),
-                            Profile.getLastUsedRegularProfile().getPrimaryOTRProfile(true),
+                            ProfileManager.getLastUsedRegularProfile(),
+                            ProfileManager.getLastUsedRegularProfile().getPrimaryOTRProfile(true),
                             0,
                             0,
                             null);
@@ -180,7 +181,7 @@ private void initJniMocks() {
         Mockito.when(profile.getPrimaryOTRProfile(Mockito.anyBoolean()))
                 .thenReturn(incognitoProfile);
         PrefService prefService = Mockito.mock(PrefService.class);
-        Profile.setLastUsedProfileForTesting(profile);
+        ProfileManager.setLastUsedProfileForTesting(profile);
 
         mSuggestionsDeps.getFactory().offlinePageBridge = new FakeOfflinePageBridge();
         mSuggestionsDeps.getFactory().mostVisitedSites = new FakeMostVisitedSites();

diff --git a/...ce/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java b/...ce/junit/src/org/chromium/chrome/features/start_surface/StartSurfaceMediatorUnitTest.java
@@ -101,6 +101,7 @@
 import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.tab.Tab;
@@ -216,7 +217,7 @@ public void setUp() {
 
         doReturn(false).when(mProfile).isOffTheRecord();
         mProfileSupplier.set(mProfile);
-        Profile.setLastUsedProfileForTesting(mProfile);
+        ProfileManager.setLastUsedProfileForTesting(mProfile);
         TemplateUrlServiceFactory.setInstanceForTesting(mTemplateUrlService);
 
         ArrayList<PropertyKey> allProperties =

diff --git a/...s/start_surface/junit/src/org/chromium/chrome/features/tasks/TasksViewBinderUnitTest.java b/...s/start_surface/junit/src/org/chromium/chrome/features/tasks/TasksViewBinderUnitTest.java
@@ -58,6 +58,7 @@
 import org.chromium.chrome.browser.ntp.IncognitoCookieControlsManager;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.prefs.PrefService;
 import org.chromium.components.user_prefs.UserPrefs;
@@ -103,7 +104,7 @@ public void setUp() throws Exception {
 
         mJniMocker.mock(UserPrefsJni.TEST_HOOKS, mUserPrefsJniMock);
         when(mProfile.getPrimaryOTRProfile(true)).thenReturn(mProfile);
-        Profile.setLastUsedProfileForTesting(mProfile);
+        ProfileManager.setLastUsedProfileForTesting(mProfile);
         when(mUserPrefsJniMock.get(mProfile)).thenReturn(mPrefService);
         createTasksView(R.layout.tasks_view_layout);
     }