chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java - Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings.

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

Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gsm

Patch Set: Created 5 years, 11 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

« chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java ('k') | components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java » ('j') | sync/android/java/src/org/chromium/sync/SyncConstants.java » ('J')
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 9c6db59e9db9e1df4a430f147e6e11b323dc38a0..4386426595045072aa7ad0ae471ffdd23bbd1537 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

@@ -23,7 +23,7 @@ import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.JavaScriptUtils;

-import org.chromium.sync.notifier.SyncStatusHelper;

+import org.chromium.sync.AndroidSyncSettings;

import org.chromium.sync.signin.AccountManagerHelper;

import org.chromium.sync.signin.ChromeSigninController;

import org.chromium.sync.test.util.MockAccountManager;

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

MockSyncContentResolverDelegate syncContentResolverDelegate =

new MockSyncContentResolverDelegate();

syncContentResolverDelegate.setMasterSyncAutomatically(true);

- SyncStatusHelper.overrideSyncStatusHelperForTests(mContext, syncContentResolverDelegate);

+ AndroidSyncSettings.overrideAndroidSyncSettingsForTests(

+ mContext, syncContentResolverDelegate);

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

ChromeSigninController.get(mContext);

startChromeBrowserProcessSync(getInstrumentation().getTargetContext());

@@ -171,11 +172,11 @@ public class SyncTest extends ChromeShellTestBase {

AccountManagerHelper.createAccountFromName(SyncTestUtil.DEFAULT_TEST_ACCOUNT);

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

- SyncStatusHelper.get(mContext).disableAndroidSync(account);

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

SyncTestUtil.verifySyncIsDisabled(mContext, account);

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

- SyncStatusHelper.get(mContext).enableAndroidSync(account);

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

SyncTestUtil.ensureSyncInitialized(mContext);

SyncTestUtil.verifySignedInWithAccount(mContext, account);

}