Translate device-local account IDs to user IDs

chrome/browser/chromeos/login/existing_user_controller.cc

Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 4c94f07627e99ed24fd7ed915313f5dbe1dd340c..372607e35c3d5ed0cf8a92f60809fbbdbf2412a7 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
@@ -898,10 +899,24 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
 }
 
 void ExistingUserController::ConfigurePublicSessionAutoLogin() {
-  if (!cros_settings_->GetString(
-          kAccountsPrefDeviceLocalAccountAutoLoginId,
-          &public_session_auto_login_username_)) {
-    public_session_auto_login_username_.clear();
+  std::string auto_login_account_id;
+  cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
+                            &auto_login_account_id);
+
+  const base::ListValue* device_local_accounts_list;
+  cros_settings_->GetList(kAccountsPrefDeviceLocalAccounts,
+                          &device_local_accounts_list);
+  const std::vector<policy::DeviceLocalAccount> device_local_accounts =
+      policy::DecodeDeviceLocalAccountsList(device_local_accounts_list);
+
+  public_session_auto_login_username_.clear();
+  for (std::vector<policy::DeviceLocalAccount>::const_iterator
+           it = device_local_accounts.begin();
+       it != device_local_accounts.end(); ++it) {
+    if (it->account_id == auto_login_account_id) {
+      public_session_auto_login_username_ = it->user_id;
+      break;
+    }
   }
 
   const User* user =