| 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 a6f692f2d3f7250d7b279389de7db3ccbd9d05c7..01d622a046c3793aebe36320a8f5d53d4583d0b7 100644
|
| --- a/chrome/browser/sync/profile_sync_service_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_unittest.cc
|
| @@ -104,7 +104,7 @@ class ProfileSyncServiceTest : public testing::Test {
|
| signin,
|
| ProfileSyncService::AUTO_START,
|
| true,
|
| - base::Closure()));
|
| + TestProfileSyncService::NullCallback()));
|
| if (!set_initial_sync_ended)
|
| service_->dont_set_initial_sync_ended_on_init();
|
| if (synchronous_sync_configuration)
|
| @@ -160,7 +160,7 @@ TEST_F(ProfileSyncServiceTest, InitialState) {
|
| signin,
|
| ProfileSyncService::MANUAL_START,
|
| true,
|
| - base::Closure()));
|
| + TestProfileSyncService::NullCallback()));
|
| EXPECT_TRUE(
|
| service_->sync_service_url().spec() ==
|
| ProfileSyncService::kSyncServerUrl ||
|
| @@ -179,7 +179,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicy) {
|
| signin,
|
| ProfileSyncService::MANUAL_START,
|
| true,
|
| - base::Closure()));
|
| + TestProfileSyncService::NullCallback()));
|
| service_->Initialize();
|
| EXPECT_TRUE(service_->IsManaged());
|
| }
|
| @@ -195,7 +195,7 @@ TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
|
| signin,
|
| ProfileSyncService::AUTO_START,
|
| true,
|
| - base::Closure()));
|
| + TestProfileSyncService::NullCallback()));
|
| EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).Times(0);
|
| EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)).
|
| Times(0);
|
| @@ -219,7 +219,7 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
|
| signin,
|
| ProfileSyncService::AUTO_START,
|
| true,
|
| - base::Closure()));
|
| + TestProfileSyncService::NullCallback()));
|
| // Register the bookmark data type.
|
| EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).
|
| WillRepeatedly(ReturnNewDataTypeManager());
|
|
|