Revert of Android: Remove GetApplicationContext part 2

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

 // Copyright 2012 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.Manifest;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.accounts.AuthenticatorDescription;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.SystemClock;
 
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.android.gms.auth.GoogleAuthUtil;
 import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.MainDex;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Default implementation of {@link AccountManagerDelegate} which delegates all calls to the
  * Android account manager.
  */
 @MainDex
 public class SystemAccountManagerDelegate implements AccountManagerDelegate {
     private final AccountManager mAccountManager;
+    private final Context mApplicationContext;
     private static final String TAG = "Auth";
 
-    public SystemAccountManagerDelegate() {
-        mAccountManager = AccountManager.get(ContextUtils.getApplicationContext());
+    public SystemAccountManagerDelegate(Context context) {
+        mApplicationContext = context.getApplicationContext();
+        mAccountManager = AccountManager.get(context.getApplicationContext());
     }
 
     @Override
     public Account[] getAccountsByType(String type) {
         if (!hasGetAccountsPermission()) {
             return new Account[] {};
         }
         long now = SystemClock.elapsedRealtime();
         Account[] accounts = mAccountManager.getAccountsByType(type);
         long elapsed = SystemClock.elapsedRealtime() - now;
         recordElapsedTimeHistogram("Signin.AndroidGetAccountsTime_AccountManager", elapsed);
         return accounts;
     }
 
     @Override
     public String getAuthToken(Account account, String authTokenScope) throws AuthException {
         assert !ThreadUtils.runningOnUiThread();
         assert AccountManagerHelper.GOOGLE_ACCOUNT_TYPE.equals(account.type);
         try {
             return GoogleAuthUtil.getTokenWithNotification(
-                    ContextUtils.getApplicationContext(), account, authTokenScope, null);
+                    mApplicationContext, account, authTokenScope, null);
         } catch (GoogleAuthException ex) {
             // This case includes a UserRecoverableNotifiedException, but most clients will have
             // their own retry mechanism anyway.
             // TODO(bauerb): Investigate integrating the callback with ConnectionRetry.
             throw new AuthException(false /* isTransientError */, ex);
         } catch (IOException ex) {
             throw new AuthException(true /* isTransientError */, ex);
         }
     }
 
     @Override
     public void invalidateAuthToken(String authToken) throws AuthException {
         try {
-            GoogleAuthUtil.clearToken(ContextUtils.getApplicationContext(), authToken);
+            GoogleAuthUtil.clearToken(mApplicationContext, authToken);
         } catch (GooglePlayServicesAvailabilityException ex) {
             throw new AuthException(false /* isTransientError */, ex);
         } catch (GoogleAuthException ex) {
             throw new AuthException(false /* isTransientError */, ex);
         } catch (IOException ex) {
             throw new AuthException(true /* isTransientError */, ex);
         }
     }
 
     @Override
@@ skipping 63 matching lines @@
                 }
             }
         };
         // Android 4.4 throws NullPointerException if null is passed
         Bundle emptyOptions = new Bundle();
         mAccountManager.updateCredentials(
                 account, "android", emptyOptions, activity, realCallback, null);
     }
 
     protected boolean hasGetAccountsPermission() {
-        return ApiCompatibilityUtils.checkPermission(ContextUtils.getApplicationContext(),
+        return ApiCompatibilityUtils.checkPermission(mApplicationContext,
                        Manifest.permission.GET_ACCOUNTS, Process.myPid(), Process.myUid())
                 == PackageManager.PERMISSION_GRANTED;
     }
 
     protected boolean hasManageAccountsPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             return true;
         }
-        return ApiCompatibilityUtils.checkPermission(ContextUtils.getApplicationContext(),
+        return ApiCompatibilityUtils.checkPermission(mApplicationContext,
                        "android.permission.MANAGE_ACCOUNTS", Process.myPid(), Process.myUid())
                 == PackageManager.PERMISSION_GRANTED;
     }
 }