Change AccountManagerHelper initialization

chrome/android/javatests/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderTest.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.superviseduser;
 
 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.database.Cursor;
@@ skipping 37 matching lines @@
             new ChromeActivityTestRule<>(ChromeActivity.class);
 
     private static final String DEFAULT_ACCOUNT = "test@gmail.com";
     private static final String AUTHORITY_SUFFIX = ".SupervisedUserProvider";
     private ContentResolver mResolver;
     private String mAuthority;
     private Uri mUri;
 
     @Before
     public void setUp() throws Exception {
-        SigninTestUtil.setUpAuthForTest(InstrumentationRegistry.getInstrumentation());
+        SigninTestUtil.setUpAuthForTest();
 
         // In principle the SupervisedUserContentProvider should work whenever Chrome is installed
         // (even if it isn't running), but to test it we need to set up a dummy child, and to do
         // this within a test we need to start Chrome.
         mActivityTestRule.startMainActivityOnBlankPage();
         mResolver = InstrumentationRegistry.getInstrumentation()
                             .getTargetContext()
                             .getContentResolver();
         Assert.assertNotNull(mResolver);
         mAuthority =
                 InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageName()
                 + AUTHORITY_SUFFIX;
         mUri = new Uri.Builder()
                        .scheme(ContentResolver.SCHEME_CONTENT)
                        .authority(mAuthority)
                        .path("authorized")
                        .build();
         SigninTestUtil.resetSigninState();
     }
 
     @After
     public void tearDown() throws Exception {
         SigninTestUtil.resetSigninState();
-        SigninTestUtil.tearDownAuthForTest();
     }
 
     @Test
     @SmallTest
     public void testSupervisedUserDisabled() throws RemoteException, ExecutionException {
         ContentProviderClient client = mResolver.acquireContentProviderClient(mAuthority);
         Assert.assertNotNull(client);
         Cursor cursor = client.query(mUri, null, "url = 'http://google.com'", null, null);
         Assert.assertNull(cursor);
     }
@@ skipping 38 matching lines @@
         ContentProviderClient client = mResolver.acquireContentProviderClient(mAuthority);
         Assert.assertNotNull(client);
         SupervisedUserContentProvider.enableContentProviderForTesting();
         // setFilter for testing sets a default filter that blocks by default.
         mResolver.call(mUri, "setFilterForTesting", null, null);
         Cursor cursor = client.query(mUri, null, "url = 'http://www.google.com'", null, null);
         Assert.assertNotNull(cursor);
         Assert.assertEquals(WebRestrictionsContentProvider.BLOCKED, cursor.getInt(0));
     }
 }