Change AccountManagerHelper initialization

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

Index: components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java
diff --git a/components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java b/components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java
index f0acd3f0ffc3c1556de8a89be604e3580a0c937c..6ff68ff26edba780169cacfd80b4be329e762429 100644
--- a/components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java
+++ b/components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerHelperTest.java
@@ -5,7 +5,6 @@
 package org.chromium.components.signin.test;
 
 import android.accounts.Account;
-import android.content.Context;
 import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
 
@@ -25,18 +24,11 @@ public class AccountManagerHelperTest extends InstrumentationTestCase {
     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");