Change AccountManagerHelper initialization

chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java

 // Copyright 2013 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.browser.signin;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
@@ skipping 52 matching lines @@
     @Before
     public void setUp() throws Exception {
         mapAccountNamesToIds();
         ApplicationData.clearAppData(
                 InstrumentationRegistry.getInstrumentation().getTargetContext());
 
         // loadNativeLibraryAndInitBrowserProcess will access AccountManagerHelper, so it should
         // be initialized beforehand.
         mContext = new AdvancedMockContext(
                 InstrumentationRegistry.getInstrumentation().getTargetContext());
-        mAccountManager = new FakeAccountManagerDelegate(mContext);
-        AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
+        mAccountManager = new FakeAccountManagerDelegate();
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mAccountManager);
 
         mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();
 
         // Make sure there is no account signed in yet.
         mChromeSigninController = ChromeSigninController.get();
         mChromeSigninController.setSignedInAccountName(null);
 
         // Seed test accounts to AccountTrackerService.
         seedAccountTrackerService(mContext);
 
         // Get a reference to the service.
         mOAuth2TokenService = getOAuth2TokenServiceOnUiThread();
 
         // Set up observer.
         mObserver = new TestObserver();
         addObserver(mObserver);
     }
 
     @After
     public void tearDown() throws Exception {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mChromeSigninController.setSignedInAccountName(null);
                 mOAuth2TokenService.validateAccounts(false);
             }
         });
-        AccountManagerHelper.resetAccountManagerHelperForTests();
     }
 
     private void mapAccountNamesToIds() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 AccountIdProvider.setInstanceForTest(new AccountIdProvider() {
                     @Override
                     public String getAccountId(String accountName) {
                         return "gaia-id-" + accountName;
@@ skipping 442 matching lines @@
 
         public int getLoadedCallCount() {
             return mLoadedCallCount;
         }
 
         public Account getLastAccount() {
             return mLastAccount;
         }
     }
 }