This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/screens/chrome_user_selection_screen.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/screens/chrome_user_selection_screen.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_types.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "policy/policy_constants.h"
 
 namespace chromeos {
 
 ChromeUserSelectionScreen::ChromeUserSelectionScreen(
     const std::string& display_type)
     : UserSelectionScreen(display_type),
       handler_initialized_(false),
       weak_factory_(this) {
   device_local_account_policy_service_ = g_browser_process->platform_part()->
       browser_policy_connector_chromeos()->GetDeviceLocalAccountPolicyService();
   device_local_account_policy_service_->AddObserver(this);
 }
 
 ChromeUserSelectionScreen::~ChromeUserSelectionScreen() {
   device_local_account_policy_service_->RemoveObserver(this);
 }
 
 void ChromeUserSelectionScreen::Init(const user_manager::UserList& users,
                                      bool show_guest) {
   UserSelectionScreen::Init(users, show_guest);
 
   // Retrieve the current policy for all users.
   for (user_manager::UserList::const_iterator it = users.begin();
        it != users.end(); ++it) {
     if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT)
-      OnPolicyUpdated((*it)->GetUserID());
+      OnPolicyUpdated((*it)->GetUserID().GetUserEmail());
   }
 }
 
 void ChromeUserSelectionScreen::SendUserList() {
   UserSelectionScreen::SendUserList();
   handler_initialized_ = true;
 }
 
 void ChromeUserSelectionScreen::OnPolicyUpdated(const std::string& user_id) {
   policy::DeviceLocalAccountPolicyBroker* broker =
@@ skipping 72 matching lines @@
     SetPublicSessionLocales(user_id, new_recommended_locales);
 
   if (new_recommended_locales.empty())
     public_session_recommended_locales_.erase(user_id);
   else
     recommended_locales = new_recommended_locales;
 }
 
 void ChromeUserSelectionScreen::SetPublicSessionDisplayName(
     const std::string& user_id) {
-  const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(user_id);
+  const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
+      AccountId::FromUserEmail(user_id));
   if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT)
     return;
 
   view_->SetPublicSessionDisplayName(user_id,
                                      base::UTF16ToUTF8(user->GetDisplayName()));
 }
 
 void ChromeUserSelectionScreen::SetPublicSessionLocales(
     const std::string& user_id,
     const std::vector<std::string>& recommended_locales) {
@@ skipping 18 matching lines @@
   // advanced form (two or more recommended locales).
   const bool two_or_more_recommended_locales = recommended_locales.size() >= 2;
 
   // Notify the UI.
   view_->SetPublicSessionLocales(user_id, available_locales.Pass(),
                                  default_locale,
                                  two_or_more_recommended_locales);
 }
 
 }  // namespace chromeos