Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java

Issue 2784353002: Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Fix tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java
index 339f3d3baf0c8848508ffc4fa309fc8ff70ad128..3edc918ba8b8394ad7dc1d2d5ace6363e5be8c5f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java
@@ -210,7 +210,7 @@ public class SigninTest extends ChromeTabbedActivityTestBase {
@Override
public void run() {
// This call initializes the ChromeSigninController to use our test context.
- ChromeSigninController.get(mContext);
+ ChromeSigninController.get();
// Start observing the SigninManager.
mTestSignInObserver = new TestSignInObserver();
@@ -253,7 +253,7 @@ public class SigninTest extends ChromeTabbedActivityTestBase {
mSigninManager.removeSignInStateObserver(mTestSignInObserver);
- if (ChromeSigninController.get(mContext).isSignedIn()) {
+ if (ChromeSigninController.get().isSignedIn()) {
mSigninManager.signOut(null, null);
}
@@ -312,7 +312,7 @@ public class SigninTest extends ChromeTabbedActivityTestBase {
private void signInToSingleAccount() {
// Verify that we aren't signed in yet.
- assertFalse(ChromeSigninController.get(mContext).isSignedIn());
+ assertFalse(ChromeSigninController.get().isSignedIn());
// Open the preferences UI.
final Preferences prefActivity = startPreferences(null);
@@ -357,12 +357,12 @@ public class SigninTest extends ChromeTabbedActivityTestBase {
mTestSignInObserver.waitForSignInEvents(1);
assertEquals(1, mTestSignInObserver.mSignInCount);
assertEquals(0, mTestSignInObserver.mSignOutCount);
- assertTrue(ChromeSigninController.get(mContext).isSignedIn());
+ assertTrue(ChromeSigninController.get().isSignedIn());
}
private void signOut() {
// Verify that we are currently signed in.
- assertTrue(ChromeSigninController.get(mContext).isSignedIn());
+ assertTrue(ChromeSigninController.get().isSignedIn());
// Open the account preferences.
final Preferences prefActivity =
@@ -384,7 +384,7 @@ public class SigninTest extends ChromeTabbedActivityTestBase {
mTestSignInObserver.waitForSignInEvents(2);
assertEquals(1, mTestSignInObserver.mSignInCount);
assertEquals(1, mTestSignInObserver.mSignOutCount);
- assertFalse(ChromeSigninController.get(mContext).isSignedIn());
+ assertFalse(ChromeSigninController.get().isSignedIn());
if (!prefActivity.isFinishing()) prefActivity.finish();
getInstrumentation().waitForIdleSync();

Powered by Google App Engine
This is Rietveld 408576698