chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java - Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.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/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java » ('j') | sync/android/java/src/org/chromium/sync/SyncConstants.java » ('J')
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 3d862848f2e6220c923fde7eab067ac63a710355..0692c3962472d702d3cd2aab49bf9e763d6b8576 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

@@ -16,10 +16,10 @@ import org.chromium.base.ApplicationStatus;

import org.chromium.base.CollectionUtil;

import org.chromium.base.test.util.Feature;

import org.chromium.components.invalidation.InvalidationClientService;

+import org.chromium.sync.AndroidSyncSettings;

import org.chromium.sync.internal_api.pub.base.ModelType;

import org.chromium.sync.notifier.InvalidationIntentProtocol;

import org.chromium.sync.notifier.InvalidationPreferences;

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

import org.chromium.sync.signin.AccountManagerHelper;

import org.chromium.sync.signin.ChromeSigninController;

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

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

MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();

// Android master sync can safely always be on.

delegate.setMasterSyncAutomatically(true);

- SyncStatusHelper.overrideSyncStatusHelperForTests(mContext, delegate);

+ AndroidSyncSettings.overrideAndroidSyncSettingsForTests(mContext, delegate);

}

@SmallTest

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

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

ChromeSigninController chromeSigninController = ChromeSigninController.get(mContext);

chromeSigninController.setSignedInAccountName(account.name);

- SyncStatusHelper syncStatusHelper = SyncStatusHelper.get(mContext);

+ AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(mContext);

if (syncEnabled) {

- syncStatusHelper.enableAndroidSync(account);

+ androidSyncSettings.enableChromeSync(account);

} else {

- syncStatusHelper.disableAndroidSync(account);

+ androidSyncSettings.disableChromeSync(account);

}