chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.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/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.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/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java ('k') | sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java

diff --git a/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java

index 24c142d5f018403969cb9e0ec9b81a14159d3683..f16d3a821238bdb2d32f734d462e5bd30fdde1b6 100644

--- a/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java

+++ b/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java

@@ -61,8 +61,7 @@ public class SyncTest extends ChromeShellTestBase {

MockSyncContentResolverDelegate syncContentResolverDelegate =

new MockSyncContentResolverDelegate();

syncContentResolverDelegate.setMasterSyncAutomatically(true);

- AndroidSyncSettings.overrideAndroidSyncSettingsForTests(

- mContext, syncContentResolverDelegate);

+ AndroidSyncSettings.overrideForTests(mContext, syncContentResolverDelegate);

// This call initializes the ChromeSigninController to use our test context.

ChromeSigninController.get(mContext);

startChromeBrowserProcessSync(getInstrumentation().getTargetContext());

@@ -177,11 +176,11 @@ public class SyncTest extends ChromeShellTestBase {

AccountManagerHelper.createAccountFromName(SyncTestUtil.DEFAULT_TEST_ACCOUNT);

// Disabling Android sync should turn Chrome sync engine off.

- AndroidSyncSettings.get(mContext).disableChromeSync(account);

+ AndroidSyncSettings.get(mContext).disableChromeSync();

SyncTestUtil.verifySyncIsDisabled(mContext, account);

// Enabling Android sync should turn Chrome sync engine on.

- AndroidSyncSettings.get(mContext).enableChromeSync(account);

+ AndroidSyncSettings.get(mContext).enableChromeSync();

SyncTestUtil.ensureSyncInitialized(mContext);

SyncTestUtil.verifySignedInWithAccount(mContext, account);

}