chrome/android/javatests_shell/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java - Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings.

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_shell/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and address nit. Created 5 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java ('k') | chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 585f1d372bc76dde288b66f345200115a5f3eef0..39fc1e601ca77703da947d6ad13c820da8f39edd 100644

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

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

@@ -117,11 +117,10 @@ public class InvalidationControllerTest extends InstrumentationTestCase {

Account account = AccountManagerHelper.createAccountFromName("test@gmail.com");

ChromeSigninController chromeSigninController = ChromeSigninController.get(mContext);

chromeSigninController.setSignedInAccountName(account.name);

- AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(mContext);

if (syncEnabled) {

- androidSyncSettings.enableChromeSync();

+ AndroidSyncSettings.enableChromeSync(mContext);

} else {

- androidSyncSettings.disableChromeSync();

+ AndroidSyncSettings.disableChromeSync(mContext);

}