This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/auth/chrome_login_performer.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/auth/chrome_login_performer.h"
 
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_user_login_flow.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "components/signin/core/account_id/account_id.h"
 
 namespace chromeos {
 
 ChromeLoginPerformer::ChromeLoginPerformer(Delegate* delegate)
     : LoginPerformer(base::ThreadTaskRunnerHandle::Get(), delegate),
       weak_factory_(this) {}
 
 ChromeLoginPerformer::~ChromeLoginPerformer() {
 }
 
@@ skipping 91 matching lines @@
 }
 
 bool ChromeLoginPerformer::AreSupervisedUsersAllowed() {
   return user_manager::UserManager::Get()->AreSupervisedUsersAllowed();
 }
 
 bool ChromeLoginPerformer::UseExtendedAuthenticatorForSupervisedUser(
     const UserContext& user_context) {
   SupervisedUserAuthentication* authentication =
       ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
-  return authentication->GetPasswordSchema(user_context.GetUserID()) ==
+  return authentication->GetPasswordSchema(
+             user_context.GetAccountId().GetUserEmail()) ==
          SupervisedUserAuthentication::SCHEMA_SALT_HASHED;
 }
 
 UserContext ChromeLoginPerformer::TransformSupervisedKey(
     const UserContext& context) {
   SupervisedUserAuthentication* authentication =
       ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   return authentication->TransformKey(context);
 }
 
 void ChromeLoginPerformer::SetupSupervisedUserFlow(const std::string& user_id) {
   SupervisedUserLoginFlow* new_flow = new SupervisedUserLoginFlow(user_id);
-  new_flow->SetHost(ChromeUserManager::Get()->GetUserFlow(user_id)->host());
-  ChromeUserManager::Get()->SetUserFlow(user_id, new_flow);
+  new_flow->SetHost(ChromeUserManager::Get()
+                        ->GetUserFlow(AccountId::FromUserEmail(user_id))
+                        ->host());
+  ChromeUserManager::Get()->SetUserFlow(AccountId::FromUserEmail(user_id),
+                                        new_flow);
 }
 
 void ChromeLoginPerformer::SetupEasyUnlockUserFlow(const std::string& user_id) {
-  ChromeUserManager::Get()->SetUserFlow(user_id,
+  ChromeUserManager::Get()->SetUserFlow(AccountId::FromUserEmail(user_id),
                                         new EasyUnlockUserLoginFlow(user_id));
 }
 
 bool ChromeLoginPerformer::CheckPolicyForUser(const std::string& user_id) {
   // Login is not allowed if policy could not be loaded for the account.
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::DeviceLocalAccountPolicyService* policy_service =
       connector->GetDeviceLocalAccountPolicyService();
   return policy_service && policy_service->IsPolicyAvailableForUser(user_id);
@@ skipping 14 matching lines @@
     const base::Closure& failure_callback,
     policy::WildcardLoginChecker::Result result) {
   if (result == policy::WildcardLoginChecker::RESULT_ALLOWED) {
     success_callback.Run();
   } else {
     failure_callback.Run();
   }
 }
 
 }  // namespace chromeos