Change AccountManagerHelper initialization

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java
index 583376ca89798e6f3ad68e8e03e7e16570a3f75d..7d80890535770857026f432ce120ce9fc5583cfc 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java
@@ -6,12 +6,9 @@ package org.chromium.chrome.test.util.browser.signin;
 
 import android.accounts.Account;
 import android.annotation.SuppressLint;
-import android.app.Instrumentation;
-import android.content.Context;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.init.ProcessInitializationHandler;
 import org.chromium.chrome.browser.signin.AccountIdProvider;
 import org.chromium.chrome.browser.signin.AccountTrackerService;
 import org.chromium.chrome.browser.signin.OAuth2TokenService;
@@ -31,8 +28,6 @@ public final class SigninTestUtil {
     private static final String DEFAULT_ACCOUNT = "test@gmail.com";
 
     @SuppressLint("StaticFieldLeak")
-    private static Context sContext;
-    @SuppressLint("StaticFieldLeak")
     private static FakeAccountManagerDelegate sAccountManager;
 
     /**
@@ -40,33 +35,18 @@ public final class SigninTestUtil {
      *
      * This must be called before native is loaded.
      */
-    public static void setUpAuthForTest(Instrumentation instrumentation) {
-        assert sContext == null;
-        sContext = instrumentation.getTargetContext();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                ProcessInitializationHandler.getInstance().initializePreNative();
-            }
-        });
-        sAccountManager = new FakeAccountManagerDelegate(sContext);
-        AccountManagerHelper.overrideAccountManagerHelperForTests(sContext, sAccountManager);
+    public static void setUpAuthForTest() {
+        sAccountManager = new FakeAccountManagerDelegate();
+        AccountManagerHelper.overrideAccountManagerHelperForTests(sAccountManager);
         overrideAccountIdProvider();
         resetSigninState();
     }
 
     /**
-     * Tears down the test authentication environment.
-     */
-    public static void tearDownAuthForTest() {
-        sContext = null;
-    }
-
-    /**
      * Returns the currently signed in account.
      */
     public static Account getCurrentAccount() {
-        assert sContext != null;
+        assert sAccountManager != null;
         return ChromeSigninController.get().getSignedInUser();
     }
 
@@ -107,7 +87,7 @@ public final class SigninTestUtil {
     }
 
     private static Account createTestAccount(String accountName) {
-        assert sContext != null;
+        assert sAccountManager != null;
         Account account = AccountManagerHelper.createAccountFromName(accountName);
         AccountHolder.Builder accountHolder = AccountHolder.builder(account).alwaysAccept(true);
         sAccountManager.addAccountHolderExplicitly(accountHolder.build());