This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/device_status_collector.cc

 // Copyright (c) 2012 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/policy/device_status_collector.h"
 
 #include <stdint.h>
 #include <cstdio>
 #include <limits>
 #include <sstream>
@@ skipping 198 matching lines @@
 // Returns the DeviceLocalAccount associated with the current kiosk session.
 // Returns null if there is no active kiosk session, or if that kiosk
 // session has been removed from policy since the session started, in which
 // case we won't report its status).
 scoped_ptr<policy::DeviceLocalAccount>
 GetCurrentKioskDeviceLocalAccount(chromeos::CrosSettings* settings) {
   if (!user_manager::UserManager::Get()->IsLoggedInAsKioskApp())
     return scoped_ptr<policy::DeviceLocalAccount>();
   const user_manager::User* const user =
       user_manager::UserManager::Get()->GetActiveUser();
-  const std::string user_id = user->GetUserID();
   const std::vector<policy::DeviceLocalAccount> accounts =
       policy::GetDeviceLocalAccounts(settings);
 
   for (const auto& device_local_account : accounts) {
-    if (device_local_account.user_id == user_id) {
+    if (AccountId::FromUserEmail(device_local_account.user_id) ==
+        user->GetAccountId()) {
       return make_scoped_ptr(
           new policy::DeviceLocalAccount(device_local_account)).Pass();
     }
   }
   LOG(WARNING) << "Kiosk app not found in list of device-local accounts";
   return scoped_ptr<policy::DeviceLocalAccount>();
 }
 
 }  // namespace
 
@@ skipping 811 matching lines @@
   ScheduleGeolocationUpdateRequest();
 }
 
 void DeviceStatusCollector::ReceiveVolumeInfo(
     const std::vector<em::VolumeInfo>& info) {
   if (report_hardware_status_)
     volume_info_ = info;
 }
 
 }  // namespace policy