Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3803)

Unified Diff: chrome/browser/sync/sync_ui_util_unittest.cc

Issue 1155443009: [Sync] Rename SyncActive to IsSyncActive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More non-android cases. 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
Index: chrome/browser/sync/sync_ui_util_unittest.cc
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index 86be6757862deb58393d4fac85edc63736f1ba42..84323e2d3b0b83e3ea8f9f9401a518a4bcd490b7 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -230,7 +230,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
case STATUS_CASE_AUTHENTICATING: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(true));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
browser_sync::SyncBackendHost::Status status;
@@ -245,7 +245,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
case STATUS_CASE_AUTH_ERROR: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(true));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
browser_sync::SyncBackendHost::Status status;
@@ -262,7 +262,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
case STATUS_CASE_PROTOCOL_ERROR: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(true));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
syncer::SyncProtocolError protocolError;
@@ -279,7 +279,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
case STATUS_CASE_PASSPHRASE_ERROR: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(true));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(true));
browser_sync::SyncBackendHost::Status status;
EXPECT_CALL(service, QueryDetailedSyncStatus(_))
.WillRepeatedly(DoAll(SetArgPointee<0>(status),
@@ -295,7 +295,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
case STATUS_CASE_SYNCED: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(true));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(true));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
browser_sync::SyncBackendHost::Status status;
@@ -312,7 +312,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, IsManaged()).WillRepeatedly(Return(true));
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillRepeatedly(Return(false));
- EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(false));
+ EXPECT_CALL(service, IsSyncActive()).WillRepeatedly(Return(false));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(false));
browser_sync::SyncBackendHost::Status status;
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698