Revert of Android: Remove GetApplicationContext part 2

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.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.test.util.browser.signin;
 
 import android.accounts.Account;
 import android.app.Instrumentation;
 import android.content.Context;
 
@@ skipping 39 matching lines @@
         AccountManagerHelper.overrideAccountManagerHelperForTests(sContext, sAccountManager);
         overrideAccountIdProvider();
         resetSigninState();
     }
 
     /**
      * Returns the currently signed in account.
      */
     public static Account getCurrentAccount() {
         assert sContext != null;
-        return ChromeSigninController.get().getSignedInUser();
+        return ChromeSigninController.get(sContext).getSignedInUser();
     }
 
     /**
      * Add an account with the default name.
      */
     public static Account addTestAccount() {
         return addTestAccount(DEFAULT_ACCOUNT);
     }
 
     /**
      * Add an account with a given name.
      */
     public static Account addTestAccount(String name) {
         Account account = createTestAccount(name);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                AccountTrackerService.get().invalidateAccountSeedStatus(true);
+                AccountTrackerService.get(sContext).invalidateAccountSeedStatus(true);
             }
         });
         return account;
     }
 
     /**
      * Add and sign in an account with the default name.
      */
     public static Account addAndSignInTestAccount() {
         Account account = createTestAccount(DEFAULT_ACCOUNT);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                ChromeSigninController.get().setSignedInAccountName(DEFAULT_ACCOUNT);
-                AccountTrackerService.get().invalidateAccountSeedStatus(true);
+                ChromeSigninController.get(sContext).setSignedInAccountName(DEFAULT_ACCOUNT);
+                AccountTrackerService.get(sContext).invalidateAccountSeedStatus(true);
             }
         });
         return account;
     }
 
     private static Account createTestAccount(String accountName) {
         assert sContext != null;
         Account account = AccountManagerHelper.createAccountFromName(accountName);
         AccountHolder.Builder accountHolder = AccountHolder.builder(account).alwaysAccept(true);
         sAccountManager.addAccountHolderExplicitly(accountHolder.build());
         return account;
     }
 
     private static void overrideAccountIdProvider() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 AccountIdProvider.setInstanceForTest(new AccountIdProvider() {
                     @Override
-                    public String getAccountId(String accountName) {
+                    public String getAccountId(Context ctx, String accountName) {
                         return "gaia-id-" + accountName;
                     }
 
                     @Override
-                    public boolean canBeUsed() {
+                    public boolean canBeUsed(Context ctx) {
                         return true;
                     }
                 });
             }
         });
     }
 
     /**
      * Should be called at setUp and tearDown so that the signin state is not leaked across tests.
      * The setUp call is implicit inside the constructor.
      */
     public static void resetSigninState() {
         // Clear cached signed account name and accounts list.
-        ChromeSigninController.get().setSignedInAccountName(null);
+        ChromeSigninController.get(sContext).setSignedInAccountName(null);
         ContextUtils.getAppSharedPreferences()
                 .edit()
                 .putStringSet(OAuth2TokenService.STORED_ACCOUNTS_KEY, new HashSet<String>())
                 .apply();
     }
 
     private SigninTestUtil() {}
 }