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

chrome/browser/signin/easy_unlock_auth_attempt.cc

 // Copyright 2014 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/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
@@ skipping 31 matching lines @@
   std::string secret;
   if (!encryptor.Decrypt(wrapped_secret, &secret))
     return std::string();
 
   return secret;
 }
 
 void DefaultAuthAttemptFinalizedHandler(
     EasyUnlockAuthAttempt::Type auth_attempt_type,
     bool success,
-    const std::string& user_id,
+    const AccountId& account_id,
     const std::string& key_secret,
     const std::string& key_label) {
   if (!proximity_auth::ScreenlockBridge::Get()->IsLocked())
     return;
 
   switch (auth_attempt_type) {
     case EasyUnlockAuthAttempt::TYPE_UNLOCK:
       if (success) {
         proximity_auth::ScreenlockBridge::Get()->lock_handler()->Unlock(
-            user_id);
+            account_id);
       } else {
         proximity_auth::ScreenlockBridge::Get()->lock_handler()->EnableInput();
       }
       return;
     case EasyUnlockAuthAttempt::TYPE_SIGNIN:
       if (success) {
         proximity_auth::ScreenlockBridge::Get()
             ->lock_handler()
-            ->AttemptEasySignin(user_id, key_secret, key_label);
+            ->AttemptEasySignin(account_id, key_secret, key_label);
       } else {
         // Attempting signin with an empty secret is equivalent to canceling the
         // attempt.
         proximity_auth::ScreenlockBridge::Get()
             ->lock_handler()
-            ->AttemptEasySignin(user_id, std::string(), std::string());
+            ->AttemptEasySignin(account_id, std::string(), std::string());
       }
       return;
   }
 }
 
 }  // namespace
 
 EasyUnlockAuthAttempt::EasyUnlockAuthAttempt(
     EasyUnlockAppManager* app_manager,
-    const std::string& user_id,
+    const AccountId& account_id,
     Type type,
     const FinalizedCallback& finalized_callback)
     : app_manager_(app_manager),
       state_(STATE_IDLE),
-      user_id_(user_id),
+      account_id_(account_id),
       type_(type),
       finalized_callback_(finalized_callback) {
   if (finalized_callback_.is_null())
     finalized_callback_ = base::Bind(&DefaultAuthAttemptFinalizedHandler);
 }
 
 EasyUnlockAuthAttempt::~EasyUnlockAuthAttempt() {
   if (state_ == STATE_RUNNING)
-    Cancel(user_id_);
+    Cancel(account_id_);
 }
 
 bool EasyUnlockAuthAttempt::Start() {
   DCHECK_EQ(STATE_IDLE, state_);
 
   if (!proximity_auth::ScreenlockBridge::Get()->IsLocked())
     return false;
 
   proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type =
       proximity_auth::ScreenlockBridge::Get()->lock_handler()->GetAuthType(
-          user_id_);
+          account_id_);
 
   if (auth_type != proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK) {
-    Cancel(user_id_);
+    Cancel(account_id_);
     return false;
   }
 
   state_ = STATE_RUNNING;
 
   // We need this workaround for ProximityAuthSystem, since we don't load the
   // full background app anymore. The call to
   // |app_manager_->SendAuthAttemptEvent()| returns false, as there is no
   // observer registered for the |screenlock::OnAuthAttempted| event. As a
   // result, the auth attempt will always fail.
   // TODO(sacomoto): Clean this up when the background app is not needed
   // anymore.
   if (!app_manager_->SendAuthAttemptEvent() &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)) {
-    Cancel(user_id_);
+    Cancel(account_id_);
     return false;
   }
 
   return true;
 }
 
-void EasyUnlockAuthAttempt::FinalizeUnlock(const std::string& user_id,
+void EasyUnlockAuthAttempt::FinalizeUnlock(const AccountId& account_id,
                                            bool success) {
-  if (state_ != STATE_RUNNING || user_id != user_id_)
+  if (state_ != STATE_RUNNING || account_id != account_id_)
     return;
 
   if (!proximity_auth::ScreenlockBridge::Get()->IsLocked())
     return;
 
   if (type_ != TYPE_UNLOCK) {
-    Cancel(user_id_);
+    Cancel(account_id_);
     return;
   }
 
-  finalized_callback_.Run(type_, success, user_id, std::string(),
+  finalized_callback_.Run(type_, success, account_id, std::string(),
                           std::string());
   state_ = STATE_DONE;
 }
 
-void EasyUnlockAuthAttempt::FinalizeSignin(const std::string& user_id,
+void EasyUnlockAuthAttempt::FinalizeSignin(const AccountId& account_id,
                                            const std::string& wrapped_secret,
                                            const std::string& raw_session_key) {
-  if (state_ != STATE_RUNNING || user_id != user_id_)
+  if (state_ != STATE_RUNNING || account_id != account_id_)
     return;
 
   if (!proximity_auth::ScreenlockBridge::Get()->IsLocked())
     return;
 
   if (type_ != TYPE_SIGNIN) {
-    Cancel(user_id_);
+    Cancel(account_id_);
     return;
   }
 
   if (wrapped_secret.empty()) {
-    Cancel(user_id_);
+    Cancel(account_id_);
     return;
   }
 
   std::string unwrapped_secret = UnwrapSecret(wrapped_secret, raw_session_key);
 
   std::string key_label;
 #if defined(OS_CHROMEOS)
   key_label = chromeos::EasyUnlockKeyManager::GetKeyLabel(0u);
 #endif  // defined(OS_CHROMEOS)
 
   const bool kSuccess = true;
-  finalized_callback_.Run(type_, kSuccess, user_id, unwrapped_secret,
+  finalized_callback_.Run(type_, kSuccess, account_id, unwrapped_secret,
                           key_label);
   state_ = STATE_DONE;
 }
 
-void EasyUnlockAuthAttempt::Cancel(const std::string& user_id) {
+void EasyUnlockAuthAttempt::Cancel(const AccountId& account_id) {
   state_ = STATE_DONE;
 
   const bool kFailure = false;
-  finalized_callback_.Run(type_, kFailure, user_id, std::string(),
+  finalized_callback_.Run(type_, kFailure, account_id, std::string(),
                           std::string());
 }