Reland "Android: Remove GetApplicationContext part 2"

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

 // Copyright 2015 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.content.Context;
 import android.os.AsyncTask;
 
@@ skipping 103 matching lines @@
                 sInstance = new SigninHelper(context.getApplicationContext());
             }
         }
         return sInstance;
     }
 
     private SigninHelper(Context context) {
         mContext = context;
         mProfileSyncService = ProfileSyncService.get();
         mSigninManager = SigninManager.get(mContext);
-        mAccountTrackerService = AccountTrackerService.get(mContext);
+        mAccountTrackerService = AccountTrackerService.get();
         mOAuth2TokenService = OAuth2TokenService.getForProfile(Profile.getLastUsedProfile());
-        mChromeSigninController = ChromeSigninController.get(mContext);
+        mChromeSigninController = ChromeSigninController.get();
     }
 
     public void validateAccountSettings(boolean accountsChanged) {
         // Ensure System accounts have been seeded.
         mAccountTrackerService.checkAndSeedSystemAccounts();
         if (!accountsChanged) {
             mAccountTrackerService.validateSystemAccounts();
         }
 
         Account syncAccount = mChromeSigninController.getSignedInUser();
         if (syncAccount == null) {
             ChromePreferenceManager chromePreferenceManager = ChromePreferenceManager.getInstance();
             if (chromePreferenceManager.getShowSigninPromo()) return;
 
             // Never shows a signin promo if user has manually disconnected.
             String lastSyncAccountName =
                     PrefServiceBridge.getInstance().getSyncLastAccountName();
             if (lastSyncAccountName != null && !lastSyncAccountName.isEmpty()) return;
 
             if (!chromePreferenceManager.getSigninPromoShown()
-                    && AccountManagerHelper.get(mContext).getGoogleAccountNames().size() > 0) {
+                    && AccountManagerHelper.get().getGoogleAccountNames().size() > 0) {
                 chromePreferenceManager.setShowSigninPromo(true);
             }
 
             return;
         }
 
         String renamedAccount = getNewSignedInAccountName(mContext);
         if (accountsChanged && renamedAccount != null) {
-            handleAccountRename(ChromeSigninController.get(mContext).getSignedInAccountName(),
-                    renamedAccount);
+            handleAccountRename(
+                    ChromeSigninController.get().getSignedInAccountName(), renamedAccount);
             return;
         }
 
         // Always check for account deleted.
         if (!accountExists(mContext, syncAccount)) {
             // It is possible that Chrome got to this point without account
             // rename notification. Let us signout before doing a rename.
             // updateAccountRenameData(mContext, new SystemAccountChangeEventChecker());
             AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
                 @Override
@@ skipping 17 matching lines @@
                     }
                 }
             };
             task.execute();
             return;
         }
 
         if (accountsChanged) {
             // Account details have changed so inform the token service that credentials
             // should now be available.
-            mOAuth2TokenService.validateAccounts(mContext, false);
+            mOAuth2TokenService.validateAccounts(false);
         }
 
         if (mProfileSyncService != null && AndroidSyncSettings.isSyncEnabled(mContext)) {
             if (mProfileSyncService.isFirstSetupComplete()) {
                 if (accountsChanged) {
                     // Nudge the syncer to ensure it does a full sync.
                     InvalidationServiceFactory.getForProfile(Profile.getLastUsedProfile())
                                         .requestSyncFromNativeChromeForAllTypes();
                 }
             } else {
@@ skipping 42 matching lines @@
                 }
                 validateAccountSettings(true);
             }
 
             @Override
             public void onSignInAborted() {}
         });
     }
 
     private static boolean accountExists(Context context, Account account) {
-        Account[] accounts = AccountManagerHelper.get(context).getGoogleAccounts();
+        Account[] accounts = AccountManagerHelper.get().getGoogleAccounts();
         for (Account a : accounts) {
             if (a.equals(account)) {
                 return true;
             }
         }
         return false;
     }
 
     /**
      * Sets the ACCOUNTS_CHANGED_PREFS_KEY to true.
@@ skipping 23 matching lines @@
     private static String getLastKnownAccountName(Context context) {
         // This is the last known name of the currently signed in user.
         // It can be:
         //  1. The signed in account name known to the ChromeSigninController.
         //  2. A pending newly choosen name that is differed from the one known to
         //     ChromeSigninController but is stored in ACCOUNT_RENAMED_PREFS_KEY.
         String name = ContextUtils.getAppSharedPreferences().getString(
                 ACCOUNT_RENAMED_PREFS_KEY, null);
 
         // If there is no pending rename, take the name known to ChromeSigninController.
-        return name == null ? ChromeSigninController.get(context).getSignedInAccountName() : name;
+        return name == null ? ChromeSigninController.get().getSignedInAccountName() : name;
     }
 
     public static void updateAccountRenameData(Context context) {
         updateAccountRenameData(context, new SystemAccountChangeEventChecker());
     }
 
     @VisibleForTesting
     public static void updateAccountRenameData(Context context, AccountChangeEventChecker checker) {
         String curName = getLastKnownAccountName(context);
 
@@ skipping 59 matching lines @@
                 .getBoolean(ACCOUNTS_CHANGED_PREFS_KEY, false)) {
             // Clear the value in prefs.
             ContextUtils.getAppSharedPreferences()
                     .edit().putBoolean(ACCOUNTS_CHANGED_PREFS_KEY, false).apply();
             return true;
         } else {
             return false;
         }
     }
 }