| 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 aadfa7a14802f30158cbff7ceab2926507aba4fa..b362909c871f72eb6756010bf72869abf3b05062 100644
|
| --- a/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| +++ b/chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc
|
| @@ -203,8 +203,8 @@ class SyncSetupHandlerTest : public testing::Test {
|
| ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
|
| profile_.get(), 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())
|
| @@ -870,7 +870,7 @@ TEST_F(SyncSetupHandlerTest, ShowSetupCustomPassphraseRequired) {
|
| EXPECT_CALL(*mock_pss_, IsUsingSecondaryPassphrase())
|
| .WillRepeatedly(Return(true));
|
| EXPECT_CALL(*mock_pss_, GetPassphraseType())
|
| - .WillRepeatedly(Return(syncer::CUSTOM_PASSPHRASE));
|
| + .WillRepeatedly(Return(syncer::PassphraseType::CUSTOM_PASSPHRASE));
|
| SetupInitializedProfileSyncService();
|
| SetDefaultExpectationsForConfigPage();
|
|
|
|
|