Change AccountManagerHelper initialization

components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java

 // Copyright 2012 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.components.signin.test;
 
 import android.accounts.Account;
-import android.content.Context;
 import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
 
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.FakeAccountManagerDelegate;
 import org.chromium.components.signin.test.util.SimpleFuture;
 
 /**
  * Test class for {@link AccountManagerHelper}.
  */
 public class AccountManagerHelperTest extends InstrumentationTestCase {
     private FakeAccountManagerDelegate mDelegate;
     private AccountManagerHelper mHelper;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
-        Context context = getInstrumentation().getTargetContext();
-        mDelegate = new FakeAccountManagerDelegate(context);
-        AccountManagerHelper.overrideAccountManagerHelperForTests(context, mDelegate);
+        mDelegate = new FakeAccountManagerDelegate();
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mDelegate);
         mHelper = AccountManagerHelper.get();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        AccountManagerHelper.resetAccountManagerHelperForTests();
-        super.tearDown();
-    }
-
     @SmallTest
     public void testCanonicalAccount() throws InterruptedException {
         addTestAccount("test@gmail.com", "password");
 
         assertTrue(hasAccountForName("test@gmail.com"));
         assertTrue(hasAccountForName("Test@gmail.com"));
         assertTrue(hasAccountForName("te.st@gmail.com"));
     }
 
     // If this test starts flaking, please re-open crbug.com/568636 and make sure there is some sort
@@ skipping 15 matching lines @@
         mDelegate.addAccountHolderExplicitly(accountHolder.build());
         return account;
     }
 
     private boolean hasAccountForName(String accountName) throws InterruptedException {
         SimpleFuture<Boolean> result = new SimpleFuture<Boolean>();
         mHelper.hasAccountForName(accountName, result.createCallback());
         return result.get();
     }
 }