Change AccountManagerHelper initialization

components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.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.components.sync;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.test.filters.SmallTest;
@@ skipping 101 matching lines @@
         mAuthority = AndroidSyncSettings.getContractAuthority(mContext);
         assertEquals(1, mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority));
 
         mSyncSettingsObserver = new MockSyncSettingsObserver();
         AndroidSyncSettings.registerObserver(mContext, mSyncSettingsObserver);
 
         super.setUp();
     }
 
     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");
     }
 
     private Account setupTestAccount(String accountName) {
         Account account = AccountManagerHelper.createAccountFromName(accountName);
         AccountHolder.Builder accountHolder =
                 AccountHolder.builder(account).password("password").alwaysAccept(true);
         mAccountManager.addAccountHolderExplicitly(accountHolder.build());
         return account;
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-        super.tearDown();
-    }
-
     private void enableChromeSyncOnUiThread() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 AndroidSyncSettings.enableChromeSync(mContext);
             }
         });
     }
 
     private void disableChromeSyncOnUiThread() {
@@ skipping 258 matching lines @@
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 0);
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
 
         // Ensure bug is fixed.
         AndroidSyncSettings.enableChromeSync(mContext);
         assertEquals(1, mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority));
         // Should still be enabled.
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
     }
 }