This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/bootstrap_user_flow.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/chromeos/login/easy_unlock/bootstrap_user_flow.h"
 
 #include "base/bind.h"
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/easy_unlock_service_regular.h"
 #include "components/proximity_auth/screenlock_bridge.h"
+#include "components/signin/core/account_id/account_id.h"
 
 namespace chromeos {
 
 BootstrapUserFlow::BootstrapUserFlow(const UserContext& user_context,
                                      bool is_new_account)
-    : ExtendedUserFlow(user_context.GetUserID()),
+    : ExtendedUserFlow(user_context.GetAccountId().GetUserEmail()),
       user_context_(user_context),
       is_new_account_(is_new_account),
       finished_(false),
       user_profile_(nullptr),
       weak_ptr_factory_(this) {
   ChromeUserManager::Get()->GetBootstrapManager()->AddPendingBootstrap(
-      user_context_.GetUserID());
+      user_context_.GetAccountId().GetUserEmail());
 }
 
 BootstrapUserFlow::~BootstrapUserFlow() {
 }
 
 void BootstrapUserFlow::StartAutoPairing() {
   DCHECK(user_profile_);
 
   VLOG(2) << "BootstrapUserFlow StartAutoPairing";
 
@@ skipping 63 matching lines @@
 
 void BootstrapUserFlow::OnBootstrapRandomKeyRemoved() {
   Finish();
 }
 
 void BootstrapUserFlow::Finish() {
   VLOG(2) << "BootstrapUserFlow::Finish";
   finished_ = true;
 
   ChromeUserManager::Get()->GetBootstrapManager()->FinishPendingBootstrap(
-      user_context_.GetUserID());
+      user_context_.GetAccountId().GetUserEmail());
   UserSessionManager::GetInstance()->DoBrowserLaunch(user_profile_, host());
 
   user_profile_ = nullptr;
   UnregisterFlowSoon();
 }
 
 bool BootstrapUserFlow::CanLockScreen() {
   return false;
 }
 
@@ skipping 48 matching lines @@
 
 void BootstrapUserFlow::OnAuthenticationFailure(
     ExtendedAuthenticator::AuthState state) {
   // TODO(xiyuan): Show error UI.
   LOG(ERROR) << "Bootstrapped failed because authenticator falure"
              << ", state=" << state;
   chrome::AttemptUserExit();
 }
 
 }  // namespace chromeos