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

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

Issue 2004523002: Revert of [sync] Sign user out of Chrome on dashboard stop and reset (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/SyncTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
index efebe05e6c98d61091d689db0b99bfa2d6b00d5e..60316efe96da2db2f42ff256435ff4f525f5cf7b 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -18,7 +18,6 @@
import org.chromium.chrome.browser.signin.AccountIdProvider;
import org.chromium.chrome.browser.signin.AccountTrackerService;
import org.chromium.chrome.browser.signin.SigninHelper;
-import org.chromium.chrome.browser.signin.SigninManager;
import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker;
import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
@@ -62,34 +61,6 @@
// Signing back in should re-enable sync.
signIn(account);
SyncTestUtil.verifySyncIsActiveForAccount(mContext, account);
- }
-
- @LargeTest
- @Feature({"Sync"})
- public void testStopAndClear() throws InterruptedException {
- Account account = setUpTestAccountAndSignInToSync();
- CriteriaHelper.pollUiThread(
- new Criteria("Timed out checking that isSignedInOnNative() == true") {
- @Override
- public boolean isSatisfied() {
- return SigninManager.get(mContext).isSignedInOnNative();
- }
- },
- SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
-
- clearServerData();
-
- // Clearing server data should turn off sync and sign out of chrome.
- SyncTestUtil.verifySyncIsSignedOut(mContext);
- assertFalse(ChromeSigninController.get(mContext).isSignedIn());
- CriteriaHelper.pollUiThread(
- new Criteria("Timed out checking that isSignedInOnNative() == false") {
- @Override
- public boolean isSatisfied() {
- return !SigninManager.get(mContext).isSignedInOnNative();
- }
- },
- SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
}
/*

Powered by Google App Engine
This is Rietveld 408576698