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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/profile_sync_service_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
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/sync_startup_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index f4cb23af2cd8cc950911c7b8c713156ad19558cd..ebc9bd5ee89d285daf2b52eef57dd8b3de5c3f3e 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -347,7 +347,7 @@ TEST_F(ProfileSyncServiceTest, SuccessfulInitialization) {
ExpectSyncBackendHostCreation(1);
InitializeForNthSync();
EXPECT_FALSE(service()->IsManaged());
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode());
}
@@ -377,7 +377,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicyBeforeInit) {
CreateService(browser_sync::AUTO_START);
InitializeForNthSync();
EXPECT_TRUE(service()->IsManaged());
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
}
// Verify that disable by enterprise policy works even after the backend has
@@ -390,13 +390,13 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicyAfterInit) {
InitializeForNthSync();
EXPECT_FALSE(service()->IsManaged());
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
profile()->GetTestingPrefService()->SetManagedPref(
sync_driver::prefs::kSyncManaged, new base::FundamentalValue(true));
EXPECT_TRUE(service()->IsManaged());
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
}
// Exercies the ProfileSyncService's code paths related to getting shut down
@@ -407,7 +407,7 @@ TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
IssueTestTokens();
InitializeForNthSync();
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
ShutdownAndDeleteService();
}
@@ -423,13 +423,13 @@ TEST_F(ProfileSyncServiceTest, EarlyStopAndSuppress) {
// Because of supression, this should fail.
InitializeForNthSync();
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
// Remove suppression. This should be enough to allow init to happen.
ExpectDataTypeManagerCreation(1);
ExpectSyncBackendHostCreation(1);
service()->UnsuppressAndStart();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
}
@@ -442,14 +442,14 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
ExpectSyncBackendHostCreation(1);
InitializeForNthSync();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
testing::Mock::VerifyAndClearExpectations(components_factory());
service()->StopAndSuppress();
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
@@ -457,7 +457,7 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
ExpectSyncBackendHostCreation(1);
service()->UnsuppressAndStart();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
}
@@ -472,13 +472,13 @@ TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
IssueTestTokens();
InitializeForNthSync();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
SigninManagerFactory::GetForProfile(profile())->SignOut(
signin_metrics::SIGNOUT_TEST);
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
}
#endif // !defined(OS_CHROMEOS)
@@ -541,14 +541,14 @@ TEST_F(ProfileSyncServiceTest, BackupBeforeFirstSync) {
// At this time, backup is finished. Task is posted to start sync again.
EXPECT_EQ(ProfileSyncService::BACKUP, service()->backend_mode());
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
EXPECT_EQ(1u, delete_dir_param.size());
EXPECT_TRUE(delete_dir_param[0]);
// Pump loop to start sync.
PumpLoop();
EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode());
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_EQ(2u, delete_dir_param.size());
EXPECT_TRUE(delete_dir_param[0]);
}
@@ -566,14 +566,14 @@ TEST_F(ProfileSyncServiceTest, ResumeBackupIfAborted) {
// At this time, backup is finished. Task is posted to start sync again.
EXPECT_EQ(ProfileSyncService::BACKUP, service()->backend_mode());
- EXPECT_FALSE(service()->SyncActive());
+ EXPECT_FALSE(service()->IsSyncActive());
EXPECT_EQ(1u, delete_dir_param.size());
EXPECT_TRUE(delete_dir_param[0]);
// Pump loop to start sync.
PumpLoop();
EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode());
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_EQ(2u, delete_dir_param.size());
EXPECT_TRUE(delete_dir_param[0]);
}
@@ -586,7 +586,7 @@ TEST_F(ProfileSyncServiceTest, Rollback) {
ExpectSyncBackendHostCreationCollectDeleteDir(2, &delete_dir_param);
IssueTestTokens();
InitializeForNthSync();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode());
// First sync time should be recorded.
@@ -636,7 +636,7 @@ TEST_F(ProfileSyncServiceTest, ClearLastSyncedTimeOnSignOut) {
ExpectDataTypeManagerCreation(1);
ExpectSyncBackendHostCreation(1);
InitializeForNthSync();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_SYNC_TIME_JUST_NOW),
service()->GetLastSyncedTimeString());
@@ -667,7 +667,7 @@ TEST_F(ProfileSyncServiceTest, MemoryPressureRecording) {
ExpectSyncBackendHostCreation(1);
InitializeForNthSync();
- EXPECT_TRUE(service()->SyncActive());
+ EXPECT_TRUE(service()->IsSyncActive());
EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(
sync_driver::prefs::kSyncSuppressStart));
« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/sync_startup_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698