Change AccountManagerHelper initialization

chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.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.invalidation;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.Bundle;
 
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.ActivityState;
@@ skipping 58 matching lines @@
     /**
      * The names of the preferred ModelTypes.
      */
     private Set<String> mAllTypes;
 
     /**
      * The names of the non-session preferred ModelTypes.
      */
     private Set<String> mNonSessionTypes;
 
+    @BeforeClass
+    public static void overrideAccountManagerHelper() {
+        AccountManagerHelper.overrideAccountManagerHelperForTests(
+                new SystemAccountManagerDelegate());
+    }
+
     @Before
     public void setUp() throws Exception {
         Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
         mShadowActivity = Shadows.shadowOf(activity);
         mContext = activity;
 
         RobolectricPackageManager packageManager =
                 (RobolectricPackageManager) mContext.getPackageManager();
         Bundle metaData = new Bundle();
         metaData.putString(
                 "ipc.invalidation.ticl.listener_service_class",
                 ChromeInvalidationClientService.class.getName());
         ApplicationInfo applicationInfo = new ApplicationInfo();
         applicationInfo.metaData = metaData;
         PackageInfo packageInfo = new PackageInfo();
         packageInfo.packageName = mContext.getPackageName();
         packageInfo.applicationInfo = applicationInfo;
         packageManager.addPackage(packageInfo);
 
         ContextUtils.initApplicationContextForTests(mContext.getApplicationContext());
 
-        AccountManagerHelper.overrideAccountManagerHelperForTests(
-                mContext, new SystemAccountManagerDelegate());
-
         ModelTypeHelper.setTestDelegate(new ModelTypeHelper.TestDelegate() {
             @Override
             public String toNotificationType(int modelType) {
                 return Integer.toString(modelType);
             }
         });
 
         ProfileSyncServiceStub profileSyncServiceStub = new ProfileSyncServiceStub();
         ProfileSyncService.overrideForTests(profileSyncServiceStub);
         profileSyncServiceStub.setPreferredDataTypes(
                 CollectionUtil.newHashSet(ModelType.BOOKMARKS, ModelType.SESSIONS));
         mAllTypes = CollectionUtil.newHashSet(
                 ModelTypeHelper.toNotificationType(ModelType.BOOKMARKS),
                 ModelTypeHelper.toNotificationType(ModelType.SESSIONS));
         mNonSessionTypes = CollectionUtil.newHashSet(ModelTypeHelper.toNotificationType(
                 ModelType.BOOKMARKS));
 
         // We don't want to use the system content resolver, so we override it.
         MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();
         // Android master sync can safely always be on.
         delegate.setMasterSyncAutomatically(true);
         AndroidSyncSettings.overrideForTests(mContext, delegate);
 
         ChromeSigninController.get().setSignedInAccountName("test@example.com");
         AndroidSyncSettings.updateAccount(mContext, ChromeSigninController.get().getSignedInUser());
         AndroidSyncSettings.enableChromeSync(mContext);
     }
 
-    @After
-    public void tearDown() {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-    }
-
     /**
      * Verify the intent sent by InvalidationController#stop().
      */
     @Test
     @Feature({"Sync"})
     public void testStop() throws Exception {
         InvalidationController controller = new InvalidationController(mContext, true);
         controller.stop();
         Intent intent = getOnlyIntent();
         validateIntentComponent(intent);
@@ skipping 345 matching lines @@
      * intent.
      */
     private static Set<String> getRegisterIntentRegisterTypes(Intent intent) {
         Set<String> registeredTypes = new HashSet<String>();
         registeredTypes.addAll(
                 intent.getStringArrayListExtra(InvalidationIntentProtocol.EXTRA_REGISTERED_TYPES));
         return registeredTypes;
     }
 
 }