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

components/proximity_auth/screenlock_bridge.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 "components/proximity_auth/screenlock_bridge.h"
 
 #include "base/strings/string16.h"
 #include "components/proximity_auth/logging/logging.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 113 matching lines @@
     return;
 
   // TODO(isherman): If |lock_handler| is null, then |lock_handler_| might have
   // been freed. Cache the screen type rather than querying it below.
   LockHandler::ScreenType screen_type;
   if (lock_handler_)
     screen_type = lock_handler_->GetScreenType();
   else
     screen_type = lock_handler->GetScreenType();
 
-  focused_user_id_ = std::string();
+  focused_account_id_ = EmptyAccountId();
   lock_handler_ = lock_handler;
   if (lock_handler_)
     FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidLock(screen_type));
   else
     FOR_EACH_OBSERVER(Observer, observers_, OnScreenDidUnlock(screen_type));
 }
 
-void ScreenlockBridge::SetFocusedUser(const std::string& user_id) {
-  if (user_id == focused_user_id_)
+void ScreenlockBridge::SetFocusedUser(const AccountId& account_id) {
+  if (account_id == focused_account_id_)
     return;
-  PA_LOG(INFO) << "Focused user changed to " << user_id;
-  focused_user_id_ = user_id;
-  FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(user_id));
+  PA_LOG(INFO) << "Focused user changed to " << account_id.Serialize();
+  focused_account_id_ = account_id;
+  FOR_EACH_OBSERVER(Observer, observers_, OnFocusedUserChanged(account_id));
 }
 
 bool ScreenlockBridge::IsLocked() const {
   return lock_handler_ != nullptr;
 }
 
 void ScreenlockBridge::Lock() {
 #if defined(OS_CHROMEOS)
   chromeos::SessionManagerClient* session_manager =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager->RequestLockScreen();
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
-void ScreenlockBridge::Unlock(const std::string& user_email) {
+void ScreenlockBridge::Unlock(const AccountId& account_id) {
   if (lock_handler_)
-    lock_handler_->Unlock(user_email);
+    lock_handler_->Unlock(account_id);
 }
 
 void ScreenlockBridge::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ScreenlockBridge::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-ScreenlockBridge::ScreenlockBridge() : lock_handler_(nullptr) {
-}
+ScreenlockBridge::ScreenlockBridge()
+    : lock_handler_(nullptr), focused_account_id_(EmptyAccountId()) {}
 
 ScreenlockBridge::~ScreenlockBridge() {
 }
 
 }  // namespace proximity_auth