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

components/proximity_auth/unlock_manager.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 "components/proximity_auth/unlock_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 219 matching lines @@
 void UnlockManager::OnScreenDidLock(
     ScreenlockBridge::LockHandler::ScreenType screen_type) {
   OnScreenLockedOrUnlocked(true);
 }
 
 void UnlockManager::OnScreenDidUnlock(
     ScreenlockBridge::LockHandler::ScreenType screen_type) {
   OnScreenLockedOrUnlocked(false);
 }
 
-void UnlockManager::OnFocusedUserChanged(const std::string& user_id) {}
+void UnlockManager::OnFocusedUserChanged(const AccountId& account_id) {}
 
 void UnlockManager::OnScreenLockedOrUnlocked(bool is_locked) {
   // TODO(tengs): Chrome will only start connecting to the phone when
   // the screen is locked, for privacy reasons. We should reinvestigate
   // this behaviour if we want automatic locking.
   if (is_locked && bluetooth_adapter_ && bluetooth_adapter_->IsPowered() &&
       life_cycle_ &&
       life_cycle_->GetState() ==
           RemoteDeviceLifeCycle::State::FINDING_CONNECTION) {
     SetWakingUpState(true);
@@ skipping 235 matching lines @@
 
 Messenger* UnlockManager::GetMessenger() {
   // TODO(tengs): We should use a weak pointer to hold the Messenger instance
   // instead.
   if (!life_cycle_)
     return nullptr;
   return life_cycle_->GetMessenger();
 }
 
 }  // namespace proximity_auth