| Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
|
| index c4a66ae6d95d5eb2d4b16f1d0661889f112675f9..afb8008696f3ad0a9c5df82befa1d4f2f28e0bdf 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
|
| @@ -385,7 +385,7 @@ class SyncSetupHandlerTest : public testing::TestWithParam<bool> {
|
| if (!mock_signin_->IsInitialized()) {
|
| profile_->GetPrefs()->SetString(
|
| prefs::kGoogleServicesUsername, kTestUser);
|
| - mock_signin_->Initialize(profile_.get());
|
| + mock_signin_->Initialize(profile_.get(), NULL);
|
| }
|
| EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
|
| .WillRepeatedly(Return(true));
|
| @@ -520,7 +520,7 @@ TEST_P(SyncSetupHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) {
|
| EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
|
| .WillRepeatedly(Return(true));
|
| profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, kTestUser);
|
| - mock_signin_->Initialize(profile_.get());
|
| + mock_signin_->Initialize(profile_.get(), NULL);
|
| EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted())
|
| @@ -550,7 +550,7 @@ TEST_P(SyncSetupHandlerTest,
|
| EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
|
| .WillRepeatedly(Return(true));
|
| profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, kTestUser);
|
| - mock_signin_->Initialize(profile_.get());
|
| + mock_signin_->Initialize(profile_.get(), NULL);
|
| EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted())
|
| @@ -608,7 +608,7 @@ TEST_P(SyncSetupHandlerTest,
|
| EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
|
| .WillRepeatedly(Return(true));
|
| profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, kTestUser);
|
| - mock_signin_->Initialize(profile_.get());
|
| + mock_signin_->Initialize(profile_.get(), NULL);
|
| EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted())
|
| @@ -639,7 +639,7 @@ TEST_P(SyncSetupHandlerTest,
|
| EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
|
| .WillRepeatedly(Return(true));
|
| profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, kTestUser);
|
| - mock_signin_->Initialize(profile_.get());
|
| + mock_signin_->Initialize(profile_.get(), NULL);
|
| EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, HasSyncSetupCompleted())
|
|
|