Revert of Android: Remove GetApplicationContext part 2

chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java

 // Copyright 2017 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.history;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 178 matching lines @@
         assertEquals(0, mAdapter.getItemCount());
         assertEquals(2, mHistoryProvider.markItemForRemovalCallback.getCallCount());
         assertEquals(1, mHistoryProvider.removeItemsCallback.getCallCount());
         assertFalse(mHistoryManager.getSelectionDelegateForTests().isSelectionEnabled());
         assertEquals(View.GONE, mRecyclerView.getVisibility());
         assertEquals(View.VISIBLE, mHistoryManager.getEmptyViewForTests().getVisibility());
     }
 
     @SmallTest
     public void testPrivacyDisclaimers_SignedOut() {
-        ChromeSigninController signinController = ChromeSigninController.get();
+        ChromeSigninController signinController = ChromeSigninController.get(getActivity());
         signinController.setSignedInAccountName(null);
 
         assertEquals(View.GONE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());
         assertEquals(View.GONE, mAdapter.getSignedInSyncedViewForTests().getVisibility());
         assertEquals(View.GONE,
                 mAdapter.getOtherFormsOfBrowsingHistoryViewForTests().getVisibility());
     }
 
     @SmallTest
     public void testPrivacyDisclaimers_SignedIn() {
-        ChromeSigninController signinController = ChromeSigninController.get();
+        ChromeSigninController signinController = ChromeSigninController.get(getActivity());
         signinController.setSignedInAccountName("test@gmail.com");
 
         setHasOtherFormsOfBrowsingData(false, false);
 
         assertEquals(View.VISIBLE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());
         assertEquals(View.GONE, mAdapter.getSignedInSyncedViewForTests().getVisibility());
         assertEquals(View.GONE,
                 mAdapter.getOtherFormsOfBrowsingHistoryViewForTests().getVisibility());
 
         signinController.setSignedInAccountName(null);
     }
 
     @SmallTest
     public void testPrivacyDisclaimers_SignedInSynced() {
-        ChromeSigninController signinController = ChromeSigninController.get();
+        ChromeSigninController signinController = ChromeSigninController.get(getActivity());
         signinController.setSignedInAccountName("test@gmail.com");
 
         setHasOtherFormsOfBrowsingData(false, true);
 
         assertEquals(View.GONE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());
         assertEquals(View.VISIBLE, mAdapter.getSignedInSyncedViewForTests().getVisibility());
         assertEquals(View.GONE,
                 mAdapter.getOtherFormsOfBrowsingHistoryViewForTests().getVisibility());
 
         signinController.setSignedInAccountName(null);
     }
 
     @SmallTest
     public void testPrivacyDisclaimers_SignedInSyncedAndOtherForms() {
-        ChromeSigninController signinController = ChromeSigninController.get();
+        ChromeSigninController signinController = ChromeSigninController.get(getActivity());
         signinController.setSignedInAccountName("test@gmail.com");
 
         setHasOtherFormsOfBrowsingData(true, true);
 
         assertEquals(View.GONE, mAdapter.getSignedInNotSyncedViewForTests().getVisibility());
         assertEquals(View.VISIBLE, mAdapter.getSignedInSyncedViewForTests().getVisibility());
         assertEquals(View.VISIBLE,
                 mAdapter.getOtherFormsOfBrowsingHistoryViewForTests().getVisibility());
 
         signinController.setSignedInAccountName(null);
@@ skipping 305 matching lines @@
 
         // Remove observer
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 SigninManager.get(getActivity()).removeSignInStateObserver(mTestObserver);
             }
         });
     }
 }