Revert of Android: Remove GetApplicationContext part 2

chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.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.services;
 
 import android.content.Context;
 import android.util.Log;
 
 import org.chromium.base.ApplicationState;
@@ skipping 52 matching lines @@
     }
 
     private GoogleServicesManager(Context context) {
         try {
             TraceEvent.begin("GoogleServicesManager.GoogleServicesManager");
             ThreadUtils.assertOnUiThread();
             // We should store the application context, as we outlive any activity which may create
             // us.
             mContext = context.getApplicationContext();
 
-            mChromeSigninController = ChromeSigninController.get();
+            mChromeSigninController = ChromeSigninController.get(mContext);
             mSigninHelper = SigninHelper.get(mContext);
 
             // 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);
             if (!mChromeSigninController.isSignedIn() && signinManager.isSignedInOnNative()) {
                 Log.w(TAG, "Signed in state got out of sync, forcing native sign out");
@@ skipping 24 matching lines @@
         }
     }
 
     @Override
     public void onApplicationStateChange(int newState) {
         if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
             onMainActivityStart();
         }
     }
 }