Reland of Reimplement AccountManagerHelper singleton instance creation

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
index 1bd21923a8ab11a152f37babff4e9e4494fee4ac..f481eb1da65c495d5b21745a79ff02f188330898 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
@@ -52,6 +52,8 @@ public class ClearBrowsingDataPreferencesTest
 
     @Override
     protected void setUp() throws Exception {
+        SigninTestUtil.setUpAuthForTest(getInstrumentation());
+
         super.setUp();
         mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
     }
@@ -60,6 +62,8 @@ public class ClearBrowsingDataPreferencesTest
     protected void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
         super.tearDown();
+
+        SigninTestUtil.tearDownAuthForTest();
     }
 
     public ClearBrowsingDataPreferencesTest() {
@@ -68,7 +72,6 @@ public class ClearBrowsingDataPreferencesTest
 
     @Override
     public void startMainActivity() throws InterruptedException {
-        SigninTestUtil.setUpAuthForTest(getInstrumentation());
         startMainActivityOnBlankPage();
     }