Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: chrome/browser/ui/webui/settings/people_handler_unittest.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Self-review. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/settings/people_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
index bd934dc2d2558c9a9cedf3a6d71931261780367a..3e51977ddb89ea6cf95a78c4b77197d2e59dfa03 100644
--- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
@@ -201,7 +201,7 @@ class PeopleHandlerTest : 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 Again, unittest, using?
maxbogue 2016/09/22 19:41:15 Done.
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile_, BuildMockProfileSyncService));
EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_));
@@ -304,7 +304,7 @@ class PeopleHandlerTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<TestingProfileManager> profile_manager_;
Profile* profile_;
- ProfileSyncServiceMock* mock_pss_;
+ browser_sync::ProfileSyncServiceMock* mock_pss_;
GoogleServiceAuthError error_;
SigninManagerBase* mock_signin_;
content::TestWebUI web_ui_;
@@ -443,7 +443,8 @@ TEST_F(PeopleHandlerTest,
// 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();
@@ -587,9 +588,9 @@ TEST_F(PeopleHandlerTest, SetNewCustomPassphrase) {
EXPECT_CALL(*mock_pss_, IsUsingSecondaryPassphrase())
.WillRepeatedly(Return(false));
SetupInitializedProfileSyncService();
- EXPECT_CALL(*mock_pss_,
- SetEncryptionPassphrase("custom_passphrase",
- ProfileSyncService::EXPLICIT));
+ EXPECT_CALL(*mock_pss_, SetEncryptionPassphrase(
+ "custom_passphrase",
+ browser_sync::ProfileSyncService::EXPLICIT));
handler_->HandleSetEncryption(&list_args);
ExpectPageStatusResponse(PeopleHandler::kConfigurePageStatus);

Powered by Google App Engine
This is Rietveld 408576698