| Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| index 55563b954a37e916570b9d74f3058ef788ec163c..79265398167dd63f000d8359542838c34b1036d0 100644
|
| --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| @@ -276,7 +276,7 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
|
|
|
| // Simulate the UI telling sync it has finished setting up.
|
| sync_->SetSetupInProgress(false);
|
| - EXPECT_TRUE(sync_->SyncActive());
|
| + EXPECT_TRUE(sync_->IsSyncActive());
|
| }
|
|
|
| // TODO(pavely): Reenable test once android is switched to oauth2.
|
| @@ -313,7 +313,7 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartNoCredentials) {
|
| sync_->SetSetupInProgress(false);
|
| // ProfileSyncService should try to start by requesting access token.
|
| // This request should fail as login token was not issued.
|
| - EXPECT_FALSE(sync_->SyncActive());
|
| + EXPECT_FALSE(sync_->IsSyncActive());
|
| EXPECT_EQ(GoogleServiceAuthError::USER_NOT_SIGNED_UP,
|
| sync_->GetAuthError().state());
|
| }
|
| @@ -334,7 +334,7 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartInvalidCredentials) {
|
|
|
| EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| sync_->Initialize();
|
| - EXPECT_FALSE(sync_->SyncActive());
|
| + EXPECT_FALSE(sync_->IsSyncActive());
|
| Mock::VerifyAndClearExpectations(data_type_manager);
|
|
|
| // Update the credentials, unstalling the backend.
|
| @@ -351,7 +351,7 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartInvalidCredentials) {
|
| sync_->SetSetupInProgress(false);
|
|
|
| // Verify we successfully finish startup and configuration.
|
| - EXPECT_TRUE(sync_->SyncActive());
|
| + EXPECT_TRUE(sync_->IsSyncActive());
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -370,11 +370,11 @@ TEST_F(ProfileSyncServiceStartupCrosTest, MAYBE_StartCrosNoCredentials) {
|
|
|
| sync_->Initialize();
|
| // Sync should not start because there are no tokens yet.
|
| - EXPECT_FALSE(sync_->SyncActive());
|
| + EXPECT_FALSE(sync_->IsSyncActive());
|
| sync_->SetSetupInProgress(false);
|
|
|
| // Sync should not start because there are still no tokens.
|
| - EXPECT_FALSE(sync_->SyncActive());
|
| + EXPECT_FALSE(sync_->IsSyncActive());
|
| }
|
|
|
| TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
|
| @@ -391,7 +391,7 @@ TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
|
| AccountTrackerServiceFactory::GetForProfile(profile_)
|
| ->PickAccountIdForAccount("12345", kEmail));
|
| sync_->Initialize();
|
| - EXPECT_TRUE(sync_->SyncActive());
|
| + EXPECT_TRUE(sync_->IsSyncActive());
|
| }
|
|
|
| #if defined(OS_WIN)
|
| @@ -578,5 +578,5 @@ TEST_F(ProfileSyncServiceStartupTest, StartDownloadFailed) {
|
| sync_->SetSetupInProgress(true);
|
| IssueTestTokens(account_id);
|
| sync_->SetSetupInProgress(false);
|
| - EXPECT_FALSE(sync_->SyncActive());
|
| + EXPECT_FALSE(sync_->IsSyncActive());
|
| }
|
|
|