Change AccountManagerHelper initialization

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

 // Copyright 2014 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.util;
 
 import android.accounts.Account;
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.speech.RecognizerIntent;
 import android.support.test.InstrumentationRegistry;
 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;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.signin.AccountManagerHelper;
@@ skipping 25 matching lines @@
     }
 
     @Before
     public void setUp() {
         // GetInstrumentation().getTargetContext() cannot be called in
         // constructor due to external dependencies.
         mAccountTestingContext = new AdvancedMockContext(
                 InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
-    @After
-    public void tearDown() {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-    }
-
     private static class IntentTestPackageManager extends MockPackageManager {
 
         private final String mAction;
 
         public IntentTestPackageManager(String recognizesAction) {
             super();
             mAction = recognizesAction;
         }
 
         @Override
@@ skipping 24 matching lines @@
         public IntentTestPackageManager getPackageManager() {
             return new IntentTestPackageManager(mAction);
         }
     }
 
     private static class FakeAuthenticationAccountManager extends FakeAccountManagerDelegate {
         private final String mAccountType;
 
         public FakeAuthenticationAccountManager(
                 Context localContext, String accountType, Account... accounts) {
-            super(localContext, accounts);
+            super(accounts);
             mAccountType = accountType;
         }
 
         @Override
         public Account[] getAccountsByType(String accountType) {
             if (accountType.equals(mAccountType)) {
                 // Calling function uses length of array to determine if
                 // accounts of the requested type are available, so return
                 // a non-empty array to indicate the account type is correct.
                 return new Account[] { AccountManagerHelper.createAccountFromName("Dummy") };
@@ skipping 22 matching lines @@
                             context,
                             useCachedResult);
                 }
             });
     }
 
     private void setUpAccount(final String accountType) {
         mAccountManager = new FakeAuthenticationAccountManager(
                 mAccountTestingContext, accountType, mTestAccount);
 
-        AccountManagerHelper.overrideAccountManagerHelperForTests(
-                mAccountTestingContext, mAccountManager);
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mAccountManager);
     }
 
     @Test
     @SmallTest
     @Feature({"FeatureUtilities", "Speech"})
     public void testSpeechFeatureAvailable() {
         final boolean doNotUseCachedResult = false;
         final boolean recognizesSpeech = isRecognitionIntentPresent(
                 mContextWithSpeech,
                 doNotUseCachedResult);
@@ skipping 82 matching lines @@
                 mAccountTestingContext);
 
         Assert.assertFalse(hasAccounts);
 
         boolean hasAuthenticator = FeatureUtilities.hasGoogleAccountAuthenticator(
                 mAccountTestingContext);
 
         Assert.assertFalse(hasAuthenticator);
     }
 }