Revert of Android: Remove GetApplicationContext part 2

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.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.signin;
 
 import android.app.Activity;
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 192 matching lines @@
 
         super.setUp();
 
         mContext = getInstrumentation().getTargetContext();
         final TestSignInAllowedObserver signinAllowedObserver = new TestSignInAllowedObserver();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 // This call initializes the ChromeSigninController to use our test context.
-                ChromeSigninController.get();
+                ChromeSigninController.get(mContext);
 
                 // Start observing the SigninManager.
                 mTestSignInObserver = new TestSignInObserver();
                 mSigninManager = SigninManager.get(mContext);
                 mSigninManager.addSignInStateObserver(mTestSignInObserver);
 
                 // Get these handles in the UI thread.
                 mPrefService = PrefServiceBridge.getInstance();
                 Profile profile = getActivity().getActivityTab().getProfile();
                 mBookmarks = new BookmarkBridge(profile);
@@ skipping 22 matching lines @@
 
     @Override
     protected void tearDown() throws Exception {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mBookmarks.removeObserver(mTestBookmarkModelObserver);
 
                 mSigninManager.removeSignInStateObserver(mTestSignInObserver);
 
-                if (ChromeSigninController.get().isSignedIn()) {
+                if (ChromeSigninController.get(mContext).isSignedIn()) {
                     mSigninManager.signOut(null, null);
                 }
 
                 mBookmarks.destroy();
             }
         });
         super.tearDown();
     }
 
     @Override
@@ skipping 38 matching lines @@
             public void run() {
                 // Verify that the profile data hasn't been wiped when signing out of a normal
                 // account. We check that by looking for the test bookmark from setUp().
                 assertEquals(1, mBookmarks.getChildCount(mBookmarks.getMobileFolderId()));
             }
         });
     }
 
     private void signInToSingleAccount() {
         // Verify that we aren't signed in yet.
-        assertFalse(ChromeSigninController.get().isSignedIn());
+        assertFalse(ChromeSigninController.get(mContext).isSignedIn());
 
         // Open the preferences UI.
         final Preferences prefActivity = startPreferences(null);
         getInstrumentation().waitForIdleSync();
 
         // Create a monitor to catch the AccountSigninActivity when it is created.
         ActivityMonitor monitor = getInstrumentation().addMonitor(
                 AccountSigninActivity.class.getName(), null, false);
 
         // Click sign in.
@@ skipping 24 matching lines @@
                 syncService.setFirstSetupComplete();
                 syncService.setSetupInProgress(false);
             }
         });
         prefActivity.finish();
 
         // Verify that signin succeeded.
         mTestSignInObserver.waitForSignInEvents(1);
         assertEquals(1, mTestSignInObserver.mSignInCount);
         assertEquals(0, mTestSignInObserver.mSignOutCount);
-        assertTrue(ChromeSigninController.get().isSignedIn());
+        assertTrue(ChromeSigninController.get(mContext).isSignedIn());
     }
 
     private void signOut() {
         // Verify that we are currently signed in.
-        assertTrue(ChromeSigninController.get().isSignedIn());
+        assertTrue(ChromeSigninController.get(mContext).isSignedIn());
 
         // Open the account preferences.
         final Preferences prefActivity =
                 startPreferences(AccountManagementFragment.class.getName());
         getInstrumentation().waitForIdleSync();
 
         // Click on the signout button.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 clickSignOut(prefActivity);
             }
         });
 
         // Accept the warning dialog.
         acceptAlertDialogWithTag(prefActivity, AccountManagementFragment.SIGN_OUT_DIALOG_TAG);
 
         // Verify that signout succeeded.
         mTestSignInObserver.waitForSignInEvents(2);
         assertEquals(1, mTestSignInObserver.mSignInCount);
         assertEquals(1, mTestSignInObserver.mSignOutCount);
-        assertFalse(ChromeSigninController.get().isSignedIn());
+        assertFalse(ChromeSigninController.get(mContext).isSignedIn());
 
         if (!prefActivity.isFinishing()) prefActivity.finish();
         getInstrumentation().waitForIdleSync();
     }
 
     private static MainPreferences getMainPreferences(Preferences prefActivity) {
         Fragment fragment = prefActivity.getFragmentForTest();
         assertNotNull(fragment);
         assertTrue(fragment instanceof MainPreferences);
         return (MainPreferences) fragment;
@@ skipping 24 matching lines @@
         getInstrumentation().waitForIdleSync();
         DialogFragment fragment = ActivityUtils.waitForFragment(activity, tag);
         AlertDialog dialog = (AlertDialog) fragment.getDialog();
         assertTrue(dialog != null);
         assertTrue(dialog.isShowing());
         Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
         assertNotNull("Could not find the accept button.", button);
         TestTouchUtils.performClickOnMainSync(getInstrumentation(), button);
     }
 }