This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/easy_unlock_auth_attempt.h"
 
 #include "base/macros.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 95 matching lines @@
   enum AuthState {
     STATE_NONE,
     STATE_ATTEMPTING_UNLOCK,
     STATE_UNLOCK_CANCELED,
     STATE_UNLOCK_DONE,
     STATE_ATTEMPTING_SIGNIN,
     STATE_SIGNIN_CANCELED,
     STATE_SIGNIN_DONE
   };
 
-  explicit TestLockHandler(const std::string& user_id)
-      : state_(STATE_NONE), auth_type_(USER_CLICK), user_id_(user_id) {}
+  explicit TestLockHandler(const AccountId& account_id)
+      : state_(STATE_NONE), auth_type_(USER_CLICK), account_id_(account_id) {}
 
   ~TestLockHandler() override {}
 
   void set_state(AuthState value) { state_ = value; }
   AuthState state() const { return state_; }
 
-  // Changes the user associated with the lock handler.
-  // Caller should make sure that |state_| is also appropriately updated.
-  void set_user_id(const std::string& value) { user_id_ = value; }
-
   // Sets the secret that is expected to be sent to |AttemptEasySignin|
   void set_expected_secret(const std::string& value) {
     expected_secret_ = value;
   }
 
   // Not using |SetAuthType| to make sure it's not called during tests.
   void set_auth_type(AuthType value) { auth_type_ = value; }
 
   // proximity_auth::ScreenlockBridge::LockHandler implementation:
   void ShowBannerMessage(const base::string16& message) override {
     ADD_FAILURE() << "Should not be reached.";
   }
 
   void ShowUserPodCustomIcon(
-      const std::string& user_email,
+      const AccountId& account_id,
       const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon)
       override {
     ADD_FAILURE() << "Should not be reached.";
   }
 
-  void HideUserPodCustomIcon(const std::string& user_email) override {
+  void HideUserPodCustomIcon(const AccountId& account_id) override {
     ADD_FAILURE() << "Should not be reached.";
   }
 
   void EnableInput() override {
     ASSERT_EQ(STATE_ATTEMPTING_UNLOCK, state_);
     state_ = STATE_UNLOCK_CANCELED;
   }
 
-  void SetAuthType(const std::string& user_email,
+  void SetAuthType(const AccountId& account_id,
                    AuthType auth_type,
                    const base::string16& auth_value) override {
     ADD_FAILURE() << "Should not be reached.";
   }
 
-  AuthType GetAuthType(const std::string& user_email) const override {
+  AuthType GetAuthType(const AccountId& account_id) const override {
     return auth_type_;
   }
 
   ScreenType GetScreenType() const override {
     // Return an arbitrary value; this is not used by the test code.
     return LOCK_SCREEN;
   }
 
-  void Unlock(const std::string& user_email) override {
-    ASSERT_EQ(user_id_, user_email);
+  void Unlock(const AccountId& account_id) override {
+    ASSERT_TRUE(account_id_ == account_id)
+        << "account_id_=" << account_id_.Serialize()
+        << " != " << account_id.Serialize();
     ASSERT_EQ(STATE_ATTEMPTING_UNLOCK, state_);
     state_ = STATE_UNLOCK_DONE;
   }
 
-  void AttemptEasySignin(const std::string& user_email,
+  void AttemptEasySignin(const AccountId& account_id,
                          const std::string& secret,
                          const std::string& key_label) override {
 #if defined(OS_CHROMEOS)
-    ASSERT_EQ(user_id_, user_email);
+    ASSERT_TRUE(account_id_ == account_id)
+        << "account_id_=" << account_id_.Serialize()
+        << " != " << account_id.Serialize();
 
     ASSERT_EQ(STATE_ATTEMPTING_SIGNIN, state_);
     if (secret.empty()) {
       state_ = STATE_SIGNIN_CANCELED;
     } else {
       ASSERT_EQ(expected_secret_, secret);
       ASSERT_EQ(chromeos::EasyUnlockKeyManager::GetKeyLabel(0u), key_label);
       state_ = STATE_SIGNIN_DONE;
     }
 #else  // if !defined(OS_CHROMEOS)
     ADD_FAILURE() << "Should not be reached.";
 #endif
   }
 
  private:
   AuthState state_;
   AuthType auth_type_;
-  std::string user_id_;
+  AccountId account_id_;

[achuithb, 2015/12/04 10:12:53]

const

[Alexander Alekseev, 2015/12/04 12:44:06]

Done.

   std::string expected_secret_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLockHandler);
 };
 
 class EasyUnlockAuthAttemptUnlockTest : public testing::Test {
  public:
   EasyUnlockAuthAttemptUnlockTest() {}
   ~EasyUnlockAuthAttemptUnlockTest() override {}
 
   void SetUp() override {
     app_manager_.reset(new FakeAppManager());
-    auth_attempt_.reset(new EasyUnlockAuthAttempt(
-        app_manager_.get(), kTestUser1, EasyUnlockAuthAttempt::TYPE_UNLOCK,
-        EasyUnlockAuthAttempt::FinalizedCallback()));
+    auth_attempt_.reset(
+        new EasyUnlockAuthAttempt(app_manager_.get(), test_account_id1_,
+                                  EasyUnlockAuthAttempt::TYPE_UNLOCK,
+                                  EasyUnlockAuthAttempt::FinalizedCallback()));
   }
 
   void TearDown() override {
     proximity_auth::ScreenlockBridge::Get()->SetLockHandler(NULL);
     auth_attempt_.reset();
   }
 
  protected:
   void InitScreenLock() {
-    lock_handler_.reset(new TestLockHandler(kTestUser1));
+    lock_handler_.reset(new TestLockHandler(test_account_id1_));
     lock_handler_->set_state(TestLockHandler::STATE_ATTEMPTING_UNLOCK);
     proximity_auth::ScreenlockBridge::Get()->SetLockHandler(
         lock_handler_.get());
   }
 
   scoped_ptr<EasyUnlockAuthAttempt> auth_attempt_;
   scoped_ptr<FakeAppManager> app_manager_;
   scoped_ptr<TestLockHandler> lock_handler_;
 
+  const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
+  const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockAuthAttemptUnlockTest);
 };
 
 TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenNotLocked) {
   ASSERT_FALSE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
 
   EXPECT_FALSE(auth_attempt_->Start());
   EXPECT_EQ(0u, app_manager_->auth_attempt_count());
 }
@@ skipping 44 matching lines @@
 TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeUnlockFailure) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
-  auth_attempt_->FinalizeUnlock(kTestUser1, false);
+  auth_attempt_->FinalizeUnlock(test_account_id1_, false);
 
   EXPECT_EQ(TestLockHandler::STATE_UNLOCK_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeSigninCalled) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   // Wrapped secret and key should be irrelevant in this case.
-  auth_attempt_->FinalizeSignin(kTestUser1, GetWrappedSecret(),
+  auth_attempt_->FinalizeSignin(test_account_id1_, GetWrappedSecret(),
                                 GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_UNLOCK_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptUnlockTest, UnlockSucceeds) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
-  auth_attempt_->FinalizeUnlock(kTestUser1, true);
+  auth_attempt_->FinalizeUnlock(test_account_id1_, true);
 
   ASSERT_EQ(TestLockHandler::STATE_UNLOCK_DONE, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeUnlockCalledForWrongUser) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
-  auth_attempt_->FinalizeUnlock(kTestUser2, true);
+  auth_attempt_->FinalizeUnlock(test_account_id2_, true);
 
   // If FinalizeUnlock is called for an incorrect user, it should be ignored
   // rather than cancelling the authentication.
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
 
   // When FinalizeUnlock is called for the correct user, it should work as
   // expected.
-  auth_attempt_->FinalizeUnlock(kTestUser1, true);
+  auth_attempt_->FinalizeUnlock(test_account_id1_, true);
 
   ASSERT_EQ(TestLockHandler::STATE_UNLOCK_DONE, lock_handler_->state());
 }
 
 #if defined(OS_CHROMEOS)
 class EasyUnlockAuthAttemptSigninTest : public testing::Test {
  public:
   EasyUnlockAuthAttemptSigninTest() {}
   ~EasyUnlockAuthAttemptSigninTest() override {}
 
   void SetUp() override {
     app_manager_.reset(new FakeAppManager());
-    auth_attempt_.reset(new EasyUnlockAuthAttempt(
-        app_manager_.get(), kTestUser1, EasyUnlockAuthAttempt::TYPE_SIGNIN,
-        EasyUnlockAuthAttempt::FinalizedCallback()));
+    auth_attempt_.reset(
+        new EasyUnlockAuthAttempt(app_manager_.get(), test_account_id1_,
+                                  EasyUnlockAuthAttempt::TYPE_SIGNIN,
+                                  EasyUnlockAuthAttempt::FinalizedCallback()));
   }
 
   void TearDown() override {
     proximity_auth::ScreenlockBridge::Get()->SetLockHandler(NULL);
     auth_attempt_.reset();
   }
 
  protected:
   void InitScreenLock() {
-    lock_handler_.reset(new TestLockHandler(kTestUser1));
+    lock_handler_.reset(new TestLockHandler(test_account_id1_));
     lock_handler_->set_state(TestLockHandler::STATE_ATTEMPTING_SIGNIN);
     proximity_auth::ScreenlockBridge::Get()->SetLockHandler(
         lock_handler_.get());
   }
 
   scoped_ptr<EasyUnlockAuthAttempt> auth_attempt_;
   scoped_ptr<FakeAppManager> app_manager_;
   scoped_ptr<TestLockHandler> lock_handler_;
 
+  const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
+  const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockAuthAttemptSigninTest);
 };
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenNotLocked) {
   ASSERT_FALSE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
 
   EXPECT_FALSE(auth_attempt_->Start());
   EXPECT_EQ(0u, app_manager_->auth_attempt_count());
 }
@@ skipping 44 matching lines @@
 TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpySecret) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeSignin(kTestUser1, "", GetSessionKey());
+  auth_attempt_->FinalizeSignin(test_account_id1_, "", GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpyKey) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeSignin(kTestUser1, GetWrappedSecret(), "");
+  auth_attempt_->FinalizeSignin(test_account_id1_, GetWrappedSecret(), "");
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, SigninSuccess) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   lock_handler_->set_expected_secret(GetSecret());
-  auth_attempt_->FinalizeSignin(kTestUser1, GetWrappedSecret(),
+  auth_attempt_->FinalizeSignin(test_account_id1_, GetWrappedSecret(),
                                 GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_DONE, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, WrongWrappedSecret) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeSignin(kTestUser1, "wrong_secret", GetSessionKey());
+  auth_attempt_->FinalizeSignin(test_account_id1_, "wrong_secret",
+                                GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, InvalidSessionKey) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeSignin(kTestUser1, GetWrappedSecret(), "invalid_key");
+  auth_attempt_->FinalizeSignin(test_account_id1_, GetWrappedSecret(),
+                                "invalid_key");
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeUnlockCalled) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeUnlock(kTestUser1, true);
+  auth_attempt_->FinalizeUnlock(test_account_id1_, true);
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_CANCELED, lock_handler_->state());
 }
 
 TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninCalledForWrongUser) {
   InitScreenLock();
   ASSERT_TRUE(proximity_auth::ScreenlockBridge::Get()->IsLocked());
   ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   ASSERT_TRUE(auth_attempt_->Start());
 
   ASSERT_EQ(1u, app_manager_->auth_attempt_count());
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
   lock_handler_->set_expected_secret(GetSecret());
 
-  auth_attempt_->FinalizeSignin(kTestUser2, GetWrappedSecret(),
+  auth_attempt_->FinalizeSignin(test_account_id2_, GetWrappedSecret(),
                                 GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
 
-  auth_attempt_->FinalizeSignin(kTestUser1, GetWrappedSecret(),
+  auth_attempt_->FinalizeSignin(test_account_id1_, GetWrappedSecret(),
                                 GetSessionKey());
 
   EXPECT_EQ(TestLockHandler::STATE_SIGNIN_DONE, lock_handler_->state());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace