Change AccountManagerHelper initialization

chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java
index fdf6d6f4c28eec697670d18937679b453fbf93ad..62f3e6070e479e09a3e1795163505da453f6b8a2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/util/FeatureUtilitiesTest.java
@@ -15,7 +15,6 @@ import android.support.test.filters.SmallTest;
 import android.test.mock.MockContext;
 import android.test.mock.MockPackageManager;
 
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -61,11 +60,6 @@ public class FeatureUtilitiesTest {
                 InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
-    @After
-    public void tearDown() {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-    }
-
     private static class IntentTestPackageManager extends MockPackageManager {
 
         private final String mAction;
@@ -110,7 +104,7 @@ public class FeatureUtilitiesTest {
 
         public FakeAuthenticationAccountManager(
                 Context localContext, String accountType, Account... accounts) {
-            super(localContext, accounts);
+            super(accounts);
             mAccountType = accountType;
         }
 
@@ -153,8 +147,7 @@ public class FeatureUtilitiesTest {
         mAccountManager = new FakeAuthenticationAccountManager(
                 mAccountTestingContext, accountType, mTestAccount);
 
-        AccountManagerHelper.overrideAccountManagerHelperForTests(
-                mAccountTestingContext, mAccountManager);
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mAccountManager);
     }
 
     @Test