Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/device_status_collector.cc

Index: chrome/browser/chromeos/policy/device_status_collector.cc
diff --git a/chrome/browser/chromeos/policy/device_status_collector.cc b/chrome/browser/chromeos/policy/device_status_collector.cc
index fc12d3dd260649c67a7fde35cef6714ad36284cc..f857846048eb57d56bf3871aadf0e28bfff70a15 100644
--- a/chrome/browser/chromeos/policy/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector.cc
@@ -216,12 +216,12 @@
     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 (AccountId::FromUserEmail(device_local_account.user_id) ==
-        user->GetAccountId()) {
+    if (device_local_account.user_id == user_id) {
       return make_scoped_ptr(
           new policy::DeviceLocalAccount(device_local_account)).Pass();
     }