Change AccountManagerHelper initialization

components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java

Index: components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
diff --git a/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java b/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
index eac0a59d1907390e42ac5def952664f49eef6854..b595bdadc4a1a553ef6d9c13b762c76359992f53 100644
--- a/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
+++ b/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
@@ -119,8 +119,8 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
     }
 
     private void setupTestAccounts(Context context) {
-        mAccountManager = new FakeAccountManagerDelegate(context);
-        AccountManagerHelper.overrideAccountManagerHelperForTests(context, mAccountManager);
+        mAccountManager = new FakeAccountManagerDelegate();
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mAccountManager);
         mAccount = setupTestAccount("account@example.com");
         mAlternateAccount = setupTestAccount("alternate@example.com");
     }
@@ -133,12 +133,6 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
         return account;
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-        super.tearDown();
-    }
-
     private void enableChromeSyncOnUiThread() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override