| Index: chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
|
| diff --git a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
|
| index 9affe469ea21d6fb0f66d4c5361d9b524945e8eb..003e8b9d73e953ffe605701bcc4c34e4053af81b 100644
|
| --- a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
|
| +++ b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
|
| @@ -117,7 +117,9 @@ class TestLockHandler : public proximity_auth::ScreenlockBridge::LockHandler {
|
| };
|
|
|
| explicit TestLockHandler(const AccountId& account_id)
|
| - : state_(STATE_NONE), auth_type_(USER_CLICK), account_id_(account_id) {}
|
| + : state_(STATE_NONE),
|
| + auth_type_(proximity_auth::mojom::AuthType::USER_CLICK),
|
| + account_id_(account_id) {}
|
|
|
| ~TestLockHandler() override {}
|
|
|
| @@ -130,7 +132,9 @@ class TestLockHandler : public proximity_auth::ScreenlockBridge::LockHandler {
|
| }
|
|
|
| // Not using |SetAuthType| to make sure it's not called during tests.
|
| - void set_auth_type(AuthType value) { auth_type_ = value; }
|
| + void set_auth_type(proximity_auth::mojom::AuthType value) {
|
| + auth_type_ = value;
|
| + }
|
|
|
| // proximity_auth::ScreenlockBridge::LockHandler implementation:
|
| void ShowBannerMessage(const base::string16& message) override {
|
| @@ -154,12 +158,13 @@ class TestLockHandler : public proximity_auth::ScreenlockBridge::LockHandler {
|
| }
|
|
|
| void SetAuthType(const AccountId& account_id,
|
| - AuthType auth_type,
|
| + proximity_auth::mojom::AuthType auth_type,
|
| const base::string16& auth_value) override {
|
| ADD_FAILURE() << "Should not be reached.";
|
| }
|
|
|
| - AuthType GetAuthType(const AccountId& account_id) const override {
|
| + proximity_auth::mojom::AuthType GetAuthType(
|
| + const AccountId& account_id) const override {
|
| return auth_type_;
|
| }
|
|
|
| @@ -199,7 +204,7 @@ class TestLockHandler : public proximity_auth::ScreenlockBridge::LockHandler {
|
|
|
| private:
|
| AuthState state_;
|
| - AuthType auth_type_;
|
| + proximity_auth::mojom::AuthType auth_type_;
|
| const AccountId account_id_;
|
| std::string expected_secret_;
|
|
|
| @@ -256,7 +261,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenAuthTypeIsPassword) {
|
| ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
|
|
|
| lock_handler_->set_auth_type(
|
| - proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
|
| + proximity_auth::mojom::AuthType::OFFLINE_PASSWORD);
|
|
|
| EXPECT_FALSE(auth_attempt_->Start());
|
|
|
| @@ -414,7 +419,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenAuthTypeIsPassword) {
|
| ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
|
|
|
| lock_handler_->set_auth_type(
|
| - proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
|
| + proximity_auth::mojom::AuthType::OFFLINE_PASSWORD);
|
|
|
| EXPECT_FALSE(auth_attempt_->Start());
|
|
|
|
|