chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java - Issue 879533004: Rewrite AndroidSyncSettings to be significantly simpler.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

Issue 879533004: Rewrite AndroidSyncSettings to be significantly simpler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@android-sync

Patch Set: Address comments and fix AccountManagementFragment. Created 5 years, 10 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

index 0692c3962472d702d3cd2aab49bf9e763d6b8576..585f1d372bc76dde288b66f345200115a5f3eef0 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

@@ -46,7 +46,7 @@ public class InvalidationControllerTest extends InstrumentationTestCase {

MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();

// Android master sync can safely always be on.

delegate.setMasterSyncAutomatically(true);

- AndroidSyncSettings.overrideAndroidSyncSettingsForTests(mContext, delegate);

+ AndroidSyncSettings.overrideForTests(mContext, delegate);

}

@SmallTest

@@ -119,9 +119,9 @@ public class InvalidationControllerTest extends InstrumentationTestCase {

chromeSigninController.setSignedInAccountName(account.name);

AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(mContext);

if (syncEnabled) {

- androidSyncSettings.enableChromeSync(account);

+ androidSyncSettings.enableChromeSync();

} else {

- androidSyncSettings.disableChromeSync(account);

+ androidSyncSettings.disableChromeSync();

}