[Signin][Android] Remove redundant Context field from SigninManager

SigninManager should always use application context, thus there's no
need to pass it to the ctor and ContextUtils.getApplicationContext can
be used instead.

Bug: 1007415
Change-Id: I8688889d52c71658183c7a4d32d36b7cf1378811
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1823197
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Pâris Meuleman <pmeuleman@chromium.org>
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700349}

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
-import android.content.Context;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.Nullable;
@@ -169,7 +168,6 @@ public class SigninManager
      * This is not final, as destroy() updates this.
      */
     private long mNativeSigninManagerAndroid;
-    private final Context mContext;
     private final AccountTrackerService mAccountTrackerService;
     private final IdentityManager mIdentityManager;
     private final IdentityMutator mIdentityMutator;
@@ -204,7 +202,6 @@ public class SigninManager
     /**
      * Called by native to create an instance of SigninManager.
      * @param nativeSigninManagerAndroid A pointer to native's SigninManagerAndroid.
-     * @return
      */
     @CalledByNative
     private static SigninManager create(long nativeSigninManagerAndroid,
@@ -214,18 +211,16 @@ public class SigninManager
         assert accountTrackerService != null;
         assert identityManager != null;
         assert identityMutator != null;
-        return new SigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
-                accountTrackerService, identityManager, identityMutator, AndroidSyncSettings.get());
+        return new SigninManager(nativeSigninManagerAndroid, accountTrackerService, identityManager,
+                identityMutator, AndroidSyncSettings.get());
     }
 
     @VisibleForTesting
-    SigninManager(Context context, long nativeSigninManagerAndroid,
-            AccountTrackerService accountTrackerService, IdentityManager identityManager,
-            IdentityMutator identityMutator, AndroidSyncSettings androidSyncSettings) {
+    SigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
+            IdentityManager identityManager, IdentityMutator identityMutator,
+            AndroidSyncSettings androidSyncSettings) {
         ThreadUtils.assertOnUiThread();
-        assert context != null;
         assert androidSyncSettings != null;
-        mContext = context;
         mNativeSigninManagerAndroid = nativeSigninManagerAndroid;
         mAccountTrackerService = accountTrackerService;
         mIdentityManager = identityManager;
@@ -306,7 +301,7 @@ public class SigninManager
      *         Google Play Services installed.
      */
     public boolean isSigninSupported() {
-        return !ApiCompatibilityUtils.isDemoUser() && isGooglePlayServicesPresent(mContext)
+        return !ApiCompatibilityUtils.isDemoUser() && isGooglePlayServicesPresent()
                 && !SigninManagerJni.get().isMobileIdentityConsistencyEnabled();
     }
 
@@ -674,8 +669,9 @@ public class SigninManager
         return SigninManagerJni.get().extractDomainName(email);
     }
 
-    private boolean isGooglePlayServicesPresent(Context context) {
-        return !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(context);
+    private boolean isGooglePlayServicesPresent() {
+        return !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(
+                ContextUtils.getApplicationContext());
     }
 
     private void fetchAndApplyCloudPolicy(CoreAccountInfo account, final Runnable callback) {

chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java

@@ -30,7 +30,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.annotation.Config;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.test.BaseRobolectricTestRunner;
@@ -82,9 +81,8 @@ public class SigninManagerTest {
 
         AndroidSyncSettings androidSyncSettings = mock(AndroidSyncSettings.class);
 
-        mSigninManager = new SigninManager(ContextUtils.getApplicationContext(),
-                0 /* nativeSigninManagerAndroid */, mAccountTrackerService, mIdentityManager,
-                mIdentityMutator, androidSyncSettings);
+        mSigninManager = new SigninManager(0 /* nativeSigninManagerAndroid */,
+                mAccountTrackerService, mIdentityManager, mIdentityMutator, androidSyncSettings);
 
         mAccount = new CoreAccountInfo(new CoreAccountId("gaia-id-user"),
                 AccountManagerFacade.createAccountFromName("user@domain.com"), "gaia-id-user");