Change AccountManagerHelper initialization

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.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.chrome.browser.signin;
 
 import android.app.Activity;
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 201 matching lines @@
     private Context mContext;
     private SigninManager mSigninManager;
     private PrefServiceBridge mPrefService;
     private BookmarkBridge mBookmarks;
     private TestBookmarkModelObserver mTestBookmarkModelObserver;
     private TestSignInObserver mTestSignInObserver;
 
     @Before
     public void setUp() throws Exception {
         // Mock out the account manager on the device.
-        SigninTestUtil.setUpAuthForTest(InstrumentationRegistry.getInstrumentation());
+        SigninTestUtil.setUpAuthForTest();
 
         mActivityTestRule.startMainActivityOnBlankPage();
         mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
         final TestSignInAllowedObserver signinAllowedObserver = new TestSignInAllowedObserver();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 // This call initializes the ChromeSigninController to use our test context.
                 ChromeSigninController.get();
@@ skipping 39 matching lines @@
 
                 mSigninManager.removeSignInStateObserver(mTestSignInObserver);
 
                 if (ChromeSigninController.get().isSignedIn()) {
                     mSigninManager.signOut(null, null);
                 }
 
                 mBookmarks.destroy();
             }
         });
-        SigninTestUtil.tearDownAuthForTest();
     }
 
     @Test
     @MediumTest
     @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
     public void testConsumerSignin() {
         SigninTestUtil.addTestAccount();
         signInToSingleAccount();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ skipping 147 matching lines @@
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
         DialogFragment fragment = ActivityUtils.waitForFragment(activity, tag);
         AlertDialog dialog = (AlertDialog) fragment.getDialog();
         Assert.assertTrue(dialog != null);
         Assert.assertTrue(dialog.isShowing());
         Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
         Assert.assertNotNull("Could not find the accept button.", button);
         TestTouchUtils.performClickOnMainSync(InstrumentationRegistry.getInstrumentation(), button);
     }
 }