Replace IdentityServicesProvider functions in history classes.

This CL replaces deprecated functions of IdentityServicesProvider with
the newer service getters with profile parameter. By this CL,
HistoryManager uses IdentityServicesProvider functions with the profile
generated regarding to isIncognito parameter from the constructor.

Bug: 1041781, 1075562
Change-Id: I04c0a14b5f9e912cda7fb34a581bea4d18023518
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2242078Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Commit-Queue: Side YILMAZ <sideyilmaz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780206}

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

@@ -88,7 +88,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
     private static Boolean sIsScrollToLoadDisabledForTests;
 
     private final Activity mActivity;
-    private final boolean mIsIncognito;
+    private final Profile mProfile;
     private final boolean mIsSeparateActivity;
     private final boolean mIsScrollToLoadDisabled;
     private final SelectableListLayout<HistoryItem> mSelectableListLayout;
@@ -120,7 +120,10 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
         mActivity = activity;
         mIsSeparateActivity = isSeparateActivity;
         mSnackbarManager = snackbarManager;
-        mIsIncognito = isIncognito;
+        // TODO(crbug.com/1060940) : Pass profile here instead of boolean, since the call maybe 
+        // from a non-primary OTR profile.
+        mProfile = isIncognito ? Profile.getLastUsedRegularProfile().getPrimaryOTRProfile()
+                               : Profile.getLastUsedRegularProfile();
         mIsScrollToLoadDisabled = ChromeAccessibilityUtil.get().isAccessibilityEnabled()
                 || ChromeAccessibilityUtil.isHardwareKeyboardAttached(
                         mActivity.getResources().getConfiguration());
@@ -195,7 +198,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
             }});
 
         // 9. Listen to changes in sign in state.
-        IdentityServicesProvider.get().getSigninManager().addSignInStateObserver(this);
+        IdentityServicesProvider.get().getSigninManager(mProfile).addSignInStateObserver(this);
 
         // 10. Create PrefChangeRegistrar to receive notifications on preference changes.
         mPrefChangeRegistrar = new PrefChangeRegistrar();
@@ -292,7 +295,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
         mHistoryAdapter.onDestroyed();
         mLargeIconBridge.destroy();
         mLargeIconBridge = null;
-        IdentityServicesProvider.get().getSigninManager().removeSignInStateObserver(this);
+        IdentityServicesProvider.get().getSigninManager(mProfile).removeSignInStateObserver(this);
         mPrefChangeRegistrar.destroy();
     }
 
@@ -353,7 +356,7 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
      * @return Whether the HistoryManager is displaying history for the incognito profile.
      */
     public boolean isIncognito() {
-        return mIsIncognito;
+        return mProfile.isOffTheRecord();
     }
 
     @VisibleForTesting

chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

@@ -566,9 +566,11 @@ public class HistoryActivityTest {
         final Account account =
                 mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            IdentityServicesProvider.get().getSigninManager().onFirstRunCheckDone();
-            IdentityServicesProvider.get().getSigninManager().addSignInStateObserver(mTestObserver);
-            IdentityServicesProvider.get().getSigninManager().signIn(
+            Profile profile = Profile.getLastUsedRegularProfile();
+            IdentityServicesProvider.get().getSigninManager(profile).onFirstRunCheckDone();
+            IdentityServicesProvider.get().getSigninManager(profile).addSignInStateObserver(
+                    mTestObserver);
+            IdentityServicesProvider.get().getSigninManager(profile).signIn(
                     SigninAccessPoint.UNKNOWN, account, null);
         });
 
@@ -624,8 +626,9 @@ public class HistoryActivityTest {
         int currentCallCount = mTestObserver.onSigninStateChangedCallback.getCallCount();
         TestThreadUtils.runOnUiThreadBlocking(
                 ()
-                        -> IdentityServicesProvider.get().getSigninManager().signOut(
-                                SignoutReason.SIGNOUT_TEST));
+                        -> IdentityServicesProvider.get()
+                                   .getSigninManager(Profile.getLastUsedRegularProfile())
+                                   .signOut(SignoutReason.SIGNOUT_TEST));
         mTestObserver.onSigninStateChangedCallback.waitForCallback(currentCallCount, 1);
         Assert.assertNull(mAccountManagerTestRule.getCurrentSignedInAccount());
 
@@ -633,7 +636,7 @@ public class HistoryActivityTest {
         TestThreadUtils.runOnUiThreadBlocking(
                 ()
                         -> IdentityServicesProvider.get()
-                                   .getSigninManager()
+                                   .getSigninManager(Profile.getLastUsedRegularProfile())
                                    .removeSignInStateObserver(mTestObserver));
     }
 }