Index: chrome/browser/sync/profile_sync_service_password_unittest.cc |
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc |
index 5597cdb415c0eaab0cdb66706a3577e192eccfe3..715c588f4f38cd925facc95c7340a34fe0b828c7 100644 |
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc |
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc |
@@ -87,14 +87,14 @@ class PasswordTestProfileSyncService : public TestProfileSyncService { |
Profile* profile, |
SigninManager* signin, |
bool synchronous_backend_initialization, |
- const base::Closure& initial_condition_setup_cb, |
+ const base::Callback<void(syncer::UserShare*)>& initial_setup_cb, |
const base::Closure& passphrase_accept_cb) |
: TestProfileSyncService(factory, |
profile, |
signin, |
ProfileSyncService::AUTO_START, |
synchronous_backend_initialization, |
- initial_condition_setup_cb), |
+ initial_setup_cb), |
callback_(passphrase_accept_cb) {} |
virtual ~PasswordTestProfileSyncService() {} |
@@ -167,8 +167,9 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest { |
done.TimedWait(TestTimeouts::action_timeout()); |
} |
- void StartSyncService(const base::Closure& root_callback, |
- const base::Closure& node_callback) { |
+ void StartSyncService( |
+ const base::Callback<void(syncer::UserShare*)>& root_callback, |
+ const base::Closure& node_callback) { |
if (!service_.get()) { |
SigninManager* signin = SigninManagerFactory::GetForProfile(&profile_); |
signin->SetAuthenticatedUsername("test_user"); |
@@ -277,7 +278,8 @@ void AddPasswordEntriesCallback(ProfileSyncServicePasswordTest* test, |
} |
TEST_F(ProfileSyncServicePasswordTest, FailModelAssociation) { |
- StartSyncService(base::Closure(), base::Closure()); |
+ StartSyncService(TestProfileSyncService::NullCallback(), |
+ base::Closure()); |
EXPECT_TRUE(service_->HasUnrecoverableError()); |
} |