This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.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/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 50 matching lines @@
   client_info.client_id = gaia_urls->oauth2_chrome_client_id();
   client_info.client_secret = gaia_urls->oauth2_chrome_client_secret();
 
   token_fetcher_.reset(
       new gaia::GaiaOAuthClient(g_browser_process->system_request_context()));
   token_fetcher_->GetTokensFromAuthCode(client_info, auth_code, kMaxGaiaRetries,
                                         this);
 }
 
 void BootstrapUserContextInitializer::StartCheckExistingKeys() {
-  const std::string& user_id = user_context_.GetUserID();
-
   // Use random key for the first time user.
-  if (!user_manager::UserManager::Get()->IsKnownUser(user_id)) {
+  if (!user_manager::UserManager::Get()->IsKnownUser(
+          user_context_.GetAccountId())) {
     CreateRandomKey();
     return;
   }
 
   EasyUnlockKeyManager* key_manager =
       UserSessionManager::GetInstance()->GetEasyUnlockKeyManager();
   key_manager->GetDeviceDataList(
-      UserContext(user_id),
+      UserContext(user_context_.GetAccountId()),
       base::Bind(&BootstrapUserContextInitializer::OnGetEasyUnlockData,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BootstrapUserContextInitializer::OnGetEasyUnlockData(
     bool success,
     const EasyUnlockDeviceKeyDataList& data_list) {
   // Existing user must have Smart lock keys to use bootstrap flow.
   if (!success || data_list.empty()) {
     LOG(ERROR) << "Unable to get Easy unlock key data.";
     Notify(false);
     return;
   }
 
   EasyUnlockService* service =
       EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
   service->AddObserver(this);
 
   static_cast<EasyUnlockServiceSignin*>(service)
-      ->SetCurrentUser(user_context_.GetUserID());
+      ->SetCurrentUser(user_context_.GetAccountId().GetUserEmail());
   OnScreenlockStateChanged(service->GetScreenlockState());
 }
 
 void BootstrapUserContextInitializer::OnEasyUnlockAuthenticated(
     EasyUnlockAuthAttempt::Type auth_attempt_type,
     bool success,
     const std::string& user_id,
     const std::string& key_secret,
     const std::string& key_label) {
   DCHECK_EQ(EasyUnlockAuthAttempt::TYPE_SIGNIN, auth_attempt_type);
@@ skipping 83 matching lines @@
   // TODO(xiyuan): Add timeout and hook up with error UI after
   //     http://crbug.com/471067.
   if (state != proximity_auth::ScreenlockState::AUTHENTICATED)
     return;
 
   EasyUnlockService* service =
       EasyUnlockService::Get(ProfileHelper::GetSigninProfile());
   service->RemoveObserver(this);
 
   service->AttemptAuth(
-      user_context_.GetUserID(),
+      user_context_.GetAccountId().GetUserEmail(),
       base::Bind(&BootstrapUserContextInitializer::OnEasyUnlockAuthenticated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos