| 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 0c7569405732c0775b89b40a7e644a9b4a1ec533..a337a8f0c8edc059e247f9e7952ec94f73665d2f 100644
|
| --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
|
| @@ -295,72 +295,6 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
|
| profile_->GetPrefs()->ClearPref(prefs::kSyncManaged);
|
| }
|
|
|
| -TEST_F(ProfileSyncServiceStartupTest, ClearServerData) {
|
| - DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
|
| - EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| -
|
| - TokenServiceFactory::GetForProfile(profile_.get())->IssueAuthTokenForTest(
|
| - GaiaConstants::kSyncService, "sync_token");
|
| - profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "test_user");
|
| - service_->Initialize();
|
| - Mock::VerifyAndClearExpectations(data_type_manager);
|
| -
|
| - // Success can overwrite failure, failure cannot overwrite success. We want
|
| - // this behavior because once clear has succeeded, sync gets disabled, and
|
| - // we don't care about any subsequent failures (e.g. timeouts)
|
| - service_->ResetClearServerDataState();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_NOT_STARTED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| - service_->OnClearServerDataFailed();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_FAILED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| - service_->OnClearServerDataSucceeded();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_SUCCEEDED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - service_->OnClearServerDataFailed();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_SUCCEEDED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - // Now test the timeout states
|
| - service_->ResetClearServerDataState();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_NOT_STARTED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| - service_->OnClearServerDataTimeout();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_FAILED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| - service_->OnClearServerDataSucceeded();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_SUCCEEDED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - service_->OnClearServerDataFailed();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_SUCCEEDED ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - // Test the pending state, doesn't matter what state
|
| - // the back end syncmgr returns
|
| - EXPECT_CALL(*data_type_manager, state()).
|
| - WillOnce(Return(DataTypeManager::STOPPED));
|
| - service_->ResetClearServerDataState();
|
| - service_->ClearServerData();
|
| - EXPECT_TRUE(ProfileSyncService::CLEAR_CLEARING ==
|
| - service_->GetClearServerDataState());
|
| -
|
| - // Stop the timer and reset the state
|
| - EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
|
| - service_->OnClearServerDataSucceeded();
|
| - service_->ResetClearServerDataState();
|
| -}
|
| -
|
| TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
|
| DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
|
| DataTypeManager::ConfigureStatus status = DataTypeManager::ABORTED;
|
|
|