Revert of 🌅 Refactor SigninHelper.

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
index ca0c015d1b2aff1f0535ebe1a50f943fcd154e73..f9cde7502dfcea71b8d0c1ec43a9fe101b1a02bf 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
@@ -23,7 +23,6 @@
     private MockAccountManager mAccountManager;
     private AdvancedMockContext mContext;
     private MockChangeEventChecker mEventChecker;
-    private SigninHelper mSigninHelper;
 
     @Override
     public void setUp() {
@@ -33,43 +32,41 @@
         // Mock out the account manager on the device.
         mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
         AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
-        SigninHelper.initializeForTests(mContext);
-        mSigninHelper = SigninHelper.get(mContext);
     }
 
     @SmallTest
     public void testAccountsChangedPref() {
         assertEquals("Should never return true before the pref has ever been set.",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
         assertEquals("Should never return true before the pref has ever been set.",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
 
         // Mark the pref as set.
-        mSigninHelper.markAccountsChangedPref();
+        SigninHelper.markAccountsChangedPref(mContext);
 
         assertEquals("Should return true first time after marking accounts changed",
-                true, mSigninHelper.checkAndClearAccountsChangedPref());
+                true, SigninHelper.checkAndClearAccountsChangedPref(mContext));
         assertEquals("Should only return true first time after marking accounts changed",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
         assertEquals("Should only return true first time after marking accounts changed",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
 
         // Mark the pref as set again.
-        mSigninHelper.markAccountsChangedPref();
+        SigninHelper.markAccountsChangedPref(mContext);
 
         assertEquals("Should return true first time after marking accounts changed",
-                true, mSigninHelper.checkAndClearAccountsChangedPref());
+                true, SigninHelper.checkAndClearAccountsChangedPref(mContext));
         assertEquals("Should only return true first time after marking accounts changed",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
         assertEquals("Should only return true first time after marking accounts changed",
-                false, mSigninHelper.checkAndClearAccountsChangedPref());
+                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
     }
 
     @SmallTest
     public void testSimpleAccountRename() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("A", "B");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals("B", getNewSignedInAccountName());
     }
 
@@ -78,7 +75,7 @@
     public void testNotSignedInAccountRename() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("B", "C");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals(null, getNewSignedInAccountName());
     }
 
@@ -86,10 +83,10 @@
     public void testSimpleAccountRenameTwice() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("A", "B");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals("B", getNewSignedInAccountName());
         mEventChecker.insertRenameEvent("B", "C");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals("C", getNewSignedInAccountName());
     }
 
@@ -98,7 +95,7 @@
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("B", "C");
         mEventChecker.insertRenameEvent("C", "D");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals(null, getNewSignedInAccountName());
     }
 
@@ -110,7 +107,7 @@
         mEventChecker.insertRenameEvent("Y", "X"); // Unrelated.
         mEventChecker.insertRenameEvent("B", "C");
         mEventChecker.insertRenameEvent("C", "D");
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals("D", getNewSignedInAccountName());
     }
 
@@ -126,7 +123,7 @@
         Account account = AccountManagerHelper.createAccountFromName("D");
         AccountHolder accountHolder = AccountHolder.create().account(account).build();
         mAccountManager.addAccountHolderExplicitly(accountHolder);
-        mSigninHelper.updateAccountRenameData(mEventChecker);
+        SigninHelper.updateAccountRenameData(mContext, mEventChecker);
         assertEquals("D", getNewSignedInAccountName());
     }
 
@@ -139,6 +136,6 @@
     }
 
     private String getNewSignedInAccountName() {
-        return mSigninHelper.getNewSignedInAccountName();
+        return SigninHelper.getNewSignedInAccountName(mContext);
     }
 }