Chromium Code Reviews| Index: chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc |
| diff --git a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc |
| index b362909c871f72eb6756010bf72869abf3b05062..af0e7814c1fc43f57e2e7f68ee9039af308f1a10 100644 |
| --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc |
| +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc |
| @@ -199,7 +199,7 @@ class SyncSetupHandlerTest : public testing::Test { |
| if (!username.empty()) |
| mock_signin_->SetAuthenticatedAccountInfo(username, username); |
| - mock_pss_ = static_cast<ProfileSyncServiceMock*>( |
| + mock_pss_ = static_cast<browser_sync::ProfileSyncServiceMock*>( |
|
skym
2016/09/22 17:25:59
I would have expected you to do a using here since
maxbogue
2016/09/22 19:41:15
Done.
|
| ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
| profile_.get(), BuildMockProfileSyncService)); |
| EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_)); |
| @@ -286,7 +286,7 @@ class SyncSetupHandlerTest : public testing::Test { |
| content::TestBrowserThreadBundle thread_bundle_; |
| std::unique_ptr<Profile> profile_; |
| - ProfileSyncServiceMock* mock_pss_; |
| + browser_sync::ProfileSyncServiceMock* mock_pss_; |
| GoogleServiceAuthError error_; |
| SigninManagerBase* mock_signin_; |
| content::TestWebUI web_ui_; |
| @@ -440,7 +440,8 @@ TEST_F(SyncSetupHandlerTest, |
| // It's important to tell sync the user cancelled the setup flow before we |
| // tell it we're through with the setup progress. |
| testing::InSequence seq; |
| - EXPECT_CALL(*mock_pss_, RequestStop(ProfileSyncService::CLEAR_DATA)); |
| + EXPECT_CALL(*mock_pss_, |
| + RequestStop(browser_sync::ProfileSyncService::CLEAR_DATA)); |
| EXPECT_CALL(*mock_pss_, OnSetupInProgressHandleDestroyed()); |
| handler_->CloseSyncSetup(); |
| @@ -617,9 +618,9 @@ TEST_F(SyncSetupHandlerTest, SelectCustomEncryption) { |
| .WillRepeatedly(Return(false)); |
| SetupInitializedProfileSyncService(); |
| EXPECT_CALL(*mock_pss_, OnUserChoseDatatypes(_, _)); |
| - EXPECT_CALL(*mock_pss_, |
| - SetEncryptionPassphrase("custom_passphrase", |
| - ProfileSyncService::EXPLICIT)); |
| + EXPECT_CALL(*mock_pss_, SetEncryptionPassphrase( |
| + "custom_passphrase", |
| + browser_sync::ProfileSyncService::EXPLICIT)); |
| handler_->HandleConfigure(&list_args); |
| // We should navigate to "done" page since we finished configuring. |