Replace IdentityServicesProvider functions in history classes.

Fix for crrev.com/c/2242078 that is reverted here(crrev.com/c/2259150),
because of crbug.com/1098208.

This CL replaces deprecated functions of IdentityServicesProvider with
the newer service getters with profile parameter. Since
HistoryManager runs only in regular mode, this CL always pass
regular profile to IdentityServicesProvider. The code behaviour stays
same as today.

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

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

@@ -196,7 +196,9 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
             }});
 
         // 9. Listen to changes in sign in state.
-        IdentityServicesProvider.get().getSigninManager().addSignInStateObserver(this);
+        IdentityServicesProvider.get()
+                .getSigninManager(Profile.getLastUsedRegularProfile())
+                .addSignInStateObserver(this);
 
         // 10. Create PrefChangeRegistrar to receive notifications on preference changes.
         mPrefChangeRegistrar = new PrefChangeRegistrar();
@@ -293,7 +295,9 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
         mHistoryAdapter.onDestroyed();
         mLargeIconBridge.destroy();
         mLargeIconBridge = null;
-        IdentityServicesProvider.get().getSigninManager().removeSignInStateObserver(this);
+        IdentityServicesProvider.get()
+                .getSigninManager(Profile.getLastUsedRegularProfile())
+                .removeSignInStateObserver(this);
         mPrefChangeRegistrar.destroy();
     }
 

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));
     }
 }