Revert of Android: Remove GetApplicationContext part 2

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

 // Copyright 2013 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.chrome.browser.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
@@ skipping 181 matching lines @@
         }
         return sSigninManager;
     }
 
     private SigninManager(Context context) {
         ThreadUtils.assertOnUiThread();
         mContext = context.getApplicationContext();
         mNativeSigninManagerAndroid = nativeInit();
         mSigninAllowedByPolicy = nativeIsSigninAllowedByPolicy(mNativeSigninManagerAndroid);
 
-        AccountTrackerService.get().addSystemAccountsSeededListener(this);
+        AccountTrackerService.get(mContext).addSystemAccountsSeededListener(this);
     }
 
     /**
     * Log the access point when the user see the view of choosing account to sign in.
     * @param accessPoint the enum value of AccessPoint defined in signin_metrics.h.
     */
     public static void logSigninStartAccessPoint(int accessPoint) {
         RecordHistogram.recordEnumeratedHistogram(
                 "Signin.SigninStartedAccessPoint", accessPoint, SigninAccessPoint.MAX);
         sSignInAccessPoint = accessPoint;
@@ skipping 16 matching lines @@
         if (isSignInAllowed()) {
             notifySignInAllowedChanged();
         }
     }
 
     /**
      * Returns true if signin can be started now.
      */
     public boolean isSignInAllowed() {
         return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
-                && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
+                && ChromeSigninController.get(mContext).getSignedInUser() == null
+                && isSigninSupported();
     }
 
     /**
      * Returns true if signin is disabled by policy.
      */
     public boolean isSigninDisabledByPolicy() {
         return !mSigninAllowedByPolicy;
     }
 
     /**
@@ skipping 109 matching lines @@
         notifySignInAllowedChanged();
 
         progressSignInFlowSeedSystemAccounts();
     }
 
     /**
      * Same as above but retrieves the Account object for the given accountName.
      */
     public void signIn(String accountName, @Nullable final Activity activity,
             @Nullable final SignInCallback callback) {
-        AccountManagerHelper.get().getAccountFromName(accountName, new Callback<Account>() {
+        AccountManagerHelper.get(mContext).getAccountFromName(accountName, new Callback<Account>() {
             @Override
             public void onResult(Account account) {
                 signIn(account, activity, callback);
             }
         });
     }
 
     private void progressSignInFlowSeedSystemAccounts() {
-        if (AccountTrackerService.get().checkAndSeedSystemAccounts()) {
+        if (AccountTrackerService.get(mContext).checkAndSeedSystemAccounts()) {
             progressSignInFlowCheckPolicy();
-        } else if (AccountIdProvider.getInstance().canBeUsed()) {
+        } else if (AccountIdProvider.getInstance().canBeUsed(mContext)) {
             mSignInState.blockedOnAccountSeeding = true;
         } else {
             Activity activity = mSignInState.activity;
             UserRecoverableErrorHandler errorHandler = activity != null
                     ? new UserRecoverableErrorHandler.ModalDialog(activity, !isForceSigninEnabled())
                     : new UserRecoverableErrorHandler.SystemNotification();
             ExternalAuthUtils.getInstance().canUseGooglePlayServices(mContext, errorHandler);
             Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
             abortSignIn();
         }
@@ skipping 54 matching lines @@
 
     private void finishSignIn() {
         // This method should be called at most once per sign-in flow.
         assert mSignInState != null;
 
         // Tell the native side that sign-in has completed.
         nativeOnSignInCompleted(mNativeSigninManagerAndroid, mSignInState.account.name);
 
         // Cache the signed-in account name. This must be done after the native call, otherwise
         // sync tries to start without being signed in natively and crashes.
-        ChromeSigninController.get().setSignedInAccountName(mSignInState.account.name);
+        ChromeSigninController.get(mContext).setSignedInAccountName(mSignInState.account.name);
         AndroidSyncSettings.updateAccount(mContext, mSignInState.account);
 
         if (mSignInState.callback != null) {
             mSignInState.callback.onSignInComplete();
         }
 
         // Trigger token requests via native.
         logInSignedInUser();
 
         if (mSignInState.isInteractive()) {
@@ skipping 59 matching lines @@
     public void signOut(Runnable callback, WipeDataHooks wipeDataHooks) {
         mSignOutInProgress = true;
         mSignOutCallback = callback;
 
         boolean wipeData = getManagementDomain() != null;
         Log.d(TAG, "Signing out, wipe data? " + wipeData);
 
         // Native signout must happen before resetting the account so data is deleted correctly.
         // http://crbug.com/589028
         nativeSignOut(mNativeSigninManagerAndroid);
-        ChromeSigninController.get().setSignedInAccountName(null);
+        ChromeSigninController.get(mContext).setSignedInAccountName(null);
         AndroidSyncSettings.updateAccount(mContext, null);
 
         if (wipeData) {
             wipeProfileData(wipeDataHooks);
         } else {
             onSignOutDone();
         }
 
-        AccountTrackerService.get().invalidateAccountSeedStatus(true);
+        AccountTrackerService.get(mContext).invalidateAccountSeedStatus(true);
     }
 
     /**
      * Returns the management domain if the signed in account is managed, otherwise returns null.
      */
     public String getManagementDomain() {
         return nativeGetManagementDomain(mNativeSigninManagerAndroid);
     }
 
     public void logInSignedInUser() {
@@ skipping 121 matching lines @@
     private native void nativeOnSignInCompleted(long nativeSigninManagerAndroid, String username);
     private native void nativeSignOut(long nativeSigninManagerAndroid);
     private native String nativeGetManagementDomain(long nativeSigninManagerAndroid);
     private native void nativeWipeProfileData(long nativeSigninManagerAndroid, WipeDataHooks hooks);
     private native void nativeClearLastSignedInUser(long nativeSigninManagerAndroid);
     private native void nativeLogInSignedInUser(long nativeSigninManagerAndroid);
     private native boolean nativeIsSignedInOnNative(long nativeSigninManagerAndroid);
     private native void nativeProhibitSignout(
             long nativeSigninManagerAndroid, boolean prohibitSignout);
 }