ChromeOS: This CL fixes bug in UserManager::GetKnownUserAccountId .

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"
@@ skipping 59 matching lines @@
   CheckForPublicSessionLocalePolicyChange(broker);
 }
 
 void ChromeUserSelectionScreen::OnDeviceLocalAccountsChanged() {
   // Nothing to do here. When the list of device-local accounts changes, the
   // entire UI is reloaded.
 }
 
 void ChromeUserSelectionScreen::CheckForPublicSessionDisplayNameChange(
     policy::DeviceLocalAccountPolicyBroker* broker) {
-  const AccountId& account_id = GetAccountIdOfKnownUser(broker->user_id());
+  const AccountId& account_id =
+      user_manager::UserManager::GetKnownUserAccountId(broker->user_id(),
+                                                       std::string());
   DCHECK(account_id.is_valid());
   const std::string& display_name = broker->GetDisplayName();
   if (display_name == public_session_display_names_[account_id])
     return;
 
   public_session_display_names_[account_id] = display_name;
 
   if (!handler_initialized_)
     return;
 
   if (!display_name.empty()) {
     // If a new display name was set by policy, notify the UI about it.
     view_->SetPublicSessionDisplayName(account_id, display_name);
     return;
   }
 
   // When no display name is set by policy, the |User|, owned by |UserManager|,
   // decides what display name to use. However, the order in which |UserManager|
   // and |this| are informed of the display name change is undefined. Post a
   // task that will update the UI after the UserManager is guaranteed to have
   // been informed of the change.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ChromeUserSelectionScreen::SetPublicSessionDisplayName,
                  weak_factory_.GetWeakPtr(), account_id));
 }
 
 void ChromeUserSelectionScreen::CheckForPublicSessionLocalePolicyChange(
     policy::DeviceLocalAccountPolicyBroker* broker) {
-  const AccountId& account_id = GetAccountIdOfKnownUser(broker->user_id());
+  const AccountId& account_id =
+      user_manager::UserManager::GetKnownUserAccountId(broker->user_id(),
+                                                       std::string());
   DCHECK(account_id.is_valid());
   const policy::PolicyMap::Entry* entry =
       broker->core()->store()->policy_map().Get(policy::key::kSessionLocales);
 
   // Parse the list of recommended locales set by policy.
   std::vector<std::string> new_recommended_locales;
   base::ListValue const* list = NULL;
   if (entry &&
       entry->level == policy::POLICY_LEVEL_RECOMMENDED &&
       entry->value &&
@@ skipping 57 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(account_id, available_locales.Pass(),
                                  default_locale,
                                  two_or_more_recommended_locales);
 }
 
 }  // namespace chromeos