This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index d3e613d487fd267afeb624f7cb45a999b8f9e1db..cb1957e233cb14c8eb1aa1551012a4edc723a62d 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -71,7 +71,8 @@ base::DictionaryValue* CreateUserInfo(const std::string& username,
   user_dict->SetString("name", display_email);
   user_dict->SetString("email", display_name);
 
-  bool is_owner = user_manager::UserManager::Get()->GetOwnerEmail() == username;
+  bool is_owner =

[achuithb, 2015/10/23 00:08:51]

const

[Alexander Alekseev, 2015/10/23 09:11:23]

Done.

+      user_manager::UserManager::Get()->GetOwnerId().GetUserEmail() == username;
   user_dict->SetBoolean("owner", is_owner);
   return user_dict;
 }
@@ -89,7 +90,8 @@ base::Value* CreateUsersWhitelist(const base::Value *pref_value) {
     std::string email;
     if ((*i)->GetAsString(&email)) {
       // Translate email to the display email.
-      std::string display_email = user_manager->GetUserDisplayEmail(email);
+      std::string display_email =

[achuithb, 2015/10/23 00:08:51]

const

[Alexander Alekseev, 2015/10/23 09:11:23]

Done.

+          user_manager->GetUserDisplayEmail(AccountId::FromUserEmail(email));
       // TODO(ivankr): fetch display name for existing users.
       user_list->Append(CreateUserInfo(email, display_email, std::string()));
     }
@@ -361,10 +363,11 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues(
     // Managed machines have no "owner".
     localized_strings->SetString("controlledSettingOwner", base::string16());
   } else {
-    localized_strings->SetString("controlledSettingOwner",
+    localized_strings->SetString(
+        "controlledSettingOwner",
         l10n_util::GetStringFUTF16(
             IDS_OPTIONS_CONTROLLED_SETTING_OWNER,
-            base::ASCIIToUTF16(user_manager->GetOwnerEmail())));
+            base::ASCIIToUTF16(user_manager->GetOwnerId().GetUserEmail())));
   }
 }