Android: Remove GetApplicationContext part 2

components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountManagerHelper.java

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.signin;
 
 import android.accounts.Account;
 import android.accounts.AuthenticatorDescription;
 import android.app.Activity;
 import android.content.Context;
@@ skipping 34 matching lines @@
      */
     @VisibleForTesting
     public static final String FEATURE_IS_CHILD_ACCOUNT_KEY = "service_uca";
 
     private static final Object sLock = new Object();
 
     private static AccountManagerHelper sAccountManagerHelper;
 
     private final AccountManagerDelegate mAccountManager;
 
-    private Context mApplicationContext;
-
     /**
      * A simple callback for getAuthToken.
      */
     public interface GetAuthTokenCallback {
         /**
          * Invoked on the UI thread if a token is provided by the AccountManager.
          *
          * @param token Auth token, guaranteed not to be null.
          */
         void tokenAvailable(String token);
 
         /**
          * Invoked on the UI thread if no token is available.
          *
          * @param isTransientError Indicates if the error is transient (network timeout or
          * unavailable, etc) or persistent (bad credentials, permission denied, etc).
          */
         void tokenUnavailable(boolean isTransientError);
     }
 
     /**
-     * @param context the Android context
      * @param accountManager the account manager to use as a backend service
      */
-    private AccountManagerHelper(Context context, AccountManagerDelegate accountManager) {
-        mApplicationContext = context.getApplicationContext();
+    private AccountManagerHelper(AccountManagerDelegate accountManager) {
         mAccountManager = accountManager;
     }
 
     /**
      * Initialize AccountManagerHelper with a custom AccountManagerDelegate.
      * Ensures that the singleton AccountManagerHelper hasn't been created yet.
      * This can be overriden in tests using the overrideAccountManagerHelperForTests method.
      *
-     * @param context the applicationContext is retrieved from the context used as an argument.
      * @param delegate the custom AccountManagerDelegate to use.
      */
-    public static void initializeAccountManagerHelper(
-            Context context, AccountManagerDelegate delegate) {
+    public static void initializeAccountManagerHelper(AccountManagerDelegate delegate) {
         synchronized (sLock) {
             assert sAccountManagerHelper == null;
-            sAccountManagerHelper = new AccountManagerHelper(context, delegate);
+            sAccountManagerHelper = new AccountManagerHelper(delegate);
         }
     }
 
     /**
      * A getter method for AccountManagerHelper singleton which also initializes it if not wasn't
      * already initialized.
      *
-     * @param context the applicationContext is retrieved from the context used as an argument.
      * @return a singleton instance of the AccountManagerHelper
      */
-    public static AccountManagerHelper get(Context context) {
+    public static AccountManagerHelper get() {
         synchronized (sLock) {
             if (sAccountManagerHelper == null) {
-                sAccountManagerHelper = new AccountManagerHelper(
-                        context, new SystemAccountManagerDelegate(context));
+                sAccountManagerHelper =
+                        new AccountManagerHelper(new SystemAccountManagerDelegate());
             }
         }
         return sAccountManagerHelper;
     }
 
     /**
      * Override AccountManagerHelper with a custom AccountManagerDelegate in tests.
      * Unlike initializeAccountManagerHelper, this will override the existing instance of
      * AccountManagerHelper if any. Only for use in Tests.
      *
      * @param context the applicationContext is retrieved from the context used as an argument.
      * @param delegate the custom AccountManagerDelegate to use.
      */
     @VisibleForTesting
     public static void overrideAccountManagerHelperForTests(
             Context context, AccountManagerDelegate delegate) {
         synchronized (sLock) {
-            sAccountManagerHelper = new AccountManagerHelper(context, delegate);
+            sAccountManagerHelper = new AccountManagerHelper(delegate);
         }
     }
 
     /**
      * Creates an Account object for the given name.
      */
     public static Account createAccountFromName(String name) {
         return new Account(name, GOOGLE_ACCOUNT_TYPE);
     }
 
@@ skipping 315 matching lines @@
         public void onConnectionTypeChanged(int connectionType) {
             assert mNumTries.get() < MAX_TRIES;
             if (NetworkChangeNotifier.isOnline()) {
                 // The network is back; stop listening and try again.
                 NetworkChangeNotifier.removeConnectionTypeObserver(this);
                 attempt();
             }
         }
     }
 }