| 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 7c4816788a24fd2265638af1d5e282d13daeb1cc..bd934dc2d2558c9a9cedf3a6d71931261780367a 100644
|
| --- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc
|
| +++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
|
| @@ -205,8 +205,8 @@ class PeopleHandlerTest : public testing::Test {
|
| ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
|
| profile_, BuildMockProfileSyncService));
|
| EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error_));
|
| - ON_CALL(*mock_pss_, GetPassphraseType()).WillByDefault(
|
| - Return(syncer::IMPLICIT_PASSPHRASE));
|
| + ON_CALL(*mock_pss_, GetPassphraseType())
|
| + .WillByDefault(Return(syncer::PassphraseType::IMPLICIT_PASSPHRASE));
|
| ON_CALL(*mock_pss_, GetExplicitPassphraseTime()).WillByDefault(
|
| Return(base::Time()));
|
| ON_CALL(*mock_pss_, GetRegisteredDataTypes())
|
| @@ -831,7 +831,8 @@ TEST_F(PeopleHandlerTest, ShowSetupOldGaiaPassphraseRequired) {
|
| EXPECT_CALL(*mock_pss_, IsPassphraseRequired())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, GetPassphraseType())
|
| - .WillRepeatedly(Return(syncer::FROZEN_IMPLICIT_PASSPHRASE));
|
| + .WillRepeatedly(
|
| + Return(syncer::PassphraseType::FROZEN_IMPLICIT_PASSPHRASE));
|
| SetupInitializedProfileSyncService();
|
| SetDefaultExpectationsForConfigPage();
|
|
|
| @@ -847,7 +848,7 @@ TEST_F(PeopleHandlerTest, ShowSetupCustomPassphraseRequired) {
|
| EXPECT_CALL(*mock_pss_, IsPassphraseRequired())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, GetPassphraseType())
|
| - .WillRepeatedly(Return(syncer::CUSTOM_PASSPHRASE));
|
| + .WillRepeatedly(Return(syncer::PassphraseType::CUSTOM_PASSPHRASE));
|
| SetupInitializedProfileSyncService();
|
| SetDefaultExpectationsForConfigPage();
|
|
|
|
|