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

Unified Diff: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java

Issue 2019363002: Revert of [Sync] Clean up Android test code a bit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@signin-test
Patch Set: Created 4 years, 7 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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
index 6b1ebcb66b1709d2394337ae0033b5981dccab6b..b9f9ba4c0c47943107cd092d697f43add5dc1313 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java
@@ -62,7 +62,7 @@
@MediumTest
@Feature({"Sync"})
public void testGetsKey() throws Throwable {
- Account account = setUpTestAccountAndSignIn();
+ Account account = setUpTestAccountAndSignInToSync();
assertEquals(0, mListener.callCount());
encryptWithPassphrase(PASSPHRASE);
waitForCallCount(1);
@@ -76,12 +76,12 @@
@MediumTest
@Feature({"Sync"})
public void testClearData() throws Throwable {
- setUpTestAccountAndSignIn();
+ setUpTestAccountAndSignInToSync();
assertEquals(0, mListener.callCount());
encryptWithPassphrase(PASSPHRASE);
waitForCallCount(1);
clearServerData();
- setUpTestAccountAndSignIn();
+ setUpTestAccountAndSignInToSync();
encryptWithPassphrase(PASSPHRASE);
waitForCallCount(2);
}

Powered by Google App Engine
This is Rietveld 408576698