🌅 Refactor SigninHelper.

chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java b/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
index 9c0ce2d88e850d638e8f9ac042392b47d234552c..dffb825988c5bb19047ab66272a485e56aa5224d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
@@ -24,8 +24,8 @@ import org.chromium.sync.signin.ChromeSigninController;
  * - sets up the Android status bar notification controller.
  * - start Tango service if sync setup is completed.
  * <p/>
- * It is intended to be an application level object and is not tied to any particulary
- * activity, although re-verifies some settings whe browser is launched.
+ * It is intended to be an application level object and is not tied to any particularly
+ * activity, although re-verifies some settings when browser is launched.
  * <p/>
  * The object must be created on the main thread.
  * <p/>
@@ -40,7 +40,7 @@ public class GoogleServicesManager implements ApplicationStateListener {
     private static GoogleServicesManager sGoogleServicesManager;
 
     @VisibleForTesting
-    protected final Context mContext;
+    protected final Context mAppContext;

[maxbogue, 2016/04/06 01:44:39]

I don't really think mAppContext is necessary vs mContext; almost every
singleton stores the app context as mContext. If that's explicitly the issue
you're working on though this is fine.

[Peter Wen, 2016/04/06 12:42:22]

Agreed, I'll be making this distinction throughout our codebase as Android is
changing things so that the difference between knowing it's an app context vs
it's possibly an activity means I/O jank or not. Unfortunate, but as a result
we'll also be certain when it's our app context. :)

 
     private final ChromeSigninController mChromeSigninController;
 
@@ -68,17 +68,17 @@ public class GoogleServicesManager implements ApplicationStateListener {
             ThreadUtils.assertOnUiThread();
             // We should store the application context, as we outlive any activity which may create
             // us.
-            mContext = context.getApplicationContext();
+            mAppContext = context.getApplicationContext();
 
-            mChromeSigninController = ChromeSigninController.get(mContext);
-            mSigninHelper = SigninHelper.get(mContext);
+            mChromeSigninController = ChromeSigninController.get(mAppContext);
+            mSigninHelper = SigninHelper.get(mAppContext);
 
             // The sign out flow starts by clearing the signed in user in the ChromeSigninController
             // on the Java side, and then performs a sign out on the native side. If there is a
             // crash on the native side then the signin state may get out of sync. Make sure that
             // the native side is signed out if the Java side doesn't have a currently signed in
             // user.
-            SigninManager signinManager = SigninManager.get(mContext);
+            SigninManager signinManager = SigninManager.get(mAppContext);
             if (!mChromeSigninController.isSignedIn() && signinManager.isSignedInOnNative()) {
                 Log.w(TAG, "Signed in state got out of sync, forcing native sign out");
                 signinManager.signOut();
@@ -101,7 +101,7 @@ public class GoogleServicesManager implements ApplicationStateListener {
     public void onMainActivityStart() {
         try {
             TraceEvent.begin("GoogleServicesManager.onMainActivityStart");
-            boolean accountsChanged = SigninHelper.checkAndClearAccountsChangedPref(mContext);
+            boolean accountsChanged = mSigninHelper.checkAndClearAccountsChangedPref();
             mSigninHelper.validateAccountSettings(accountsChanged);
         } finally {
             TraceEvent.end("GoogleServicesManager.onMainActivityStart");