Change AccountManagerHelper initialization

chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

 // Copyright 2017 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.history;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 106 matching lines @@
 
     private HistoryItem mItem1;
     private HistoryItem mItem2;
 
     public HistoryActivityTest() {
         super(HistoryActivity.class);
     }
 
     @Override
     public void setUp() throws Exception {
+        SigninTestUtil.setUpAuthForTest();
+
         super.setUp();
 
         mHistoryProvider = new StubbedHistoryProvider();
 
         Date today = new Date();
         long[] timestamps = {today.getTime()};
         mItem1 = StubbedHistoryProvider.createHistoryItem(0, timestamps);
         mItem2 = StubbedHistoryProvider.createHistoryItem(1, timestamps);
         mHistoryProvider.addItem(mItem1);
         mHistoryProvider.addItem(mItem2);
@@ skipping 376 matching lines @@
             @Override
             public Boolean call() throws Exception {
                 PrefServiceBridge.getInstance().setSupervisedUserId("ChildAccountSUID");
                 return Profile.getLastUsedProfile().isChild()
                         && !PrefServiceBridge.getInstance().canDeleteBrowsingHistory()
                         && !PrefServiceBridge.getInstance().isIncognitoModeEnabled();
             }
         }));
 
         // Sign in to account.
-        SigninTestUtil.setUpAuthForTest(getInstrumentation());
         final Account account = SigninTestUtil.addTestAccount();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 SigninManager.get(getActivity()).onFirstRunCheckDone();
                 SigninManager.get(getActivity()).addSignInStateObserver(mTestObserver);
                 SigninManager.get(getActivity()).signIn(account, null, null);
             }
         });
         mTestObserver.onSigninStateChangedCallback.waitForCallback(0, 1,
@@ skipping 22 matching lines @@
         mTestObserver.onSigninStateChangedCallback.waitForCallback(currentCallCount, 1);
         assertNull(SigninTestUtil.getCurrentAccount());
 
         // Remove observer
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 SigninManager.get(getActivity()).removeSignInStateObserver(mTestObserver);
             }
         });
-        SigninTestUtil.tearDownAuthForTest();
     }
 }