We should use UserID object to identify users instead of username.

chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.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/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h"
 
 #include "ash/audio/sounds.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
@@ skipping 198 matching lines @@
                   HandleCurrentSupervisedUserPage);
 }
 
 void SupervisedUserCreationScreenHandler::PrepareToShow() {}
 
 void SupervisedUserCreationScreenHandler::Show() {
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   scoped_ptr<base::ListValue> users_list(new base::ListValue());
   const user_manager::UserList& users =
       ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation();
-  std::string owner;
-  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+  std::string owner_email;
+  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner_email);
+  const user_manager::UserID owner_id(user_manager::UserID::FromUserEmail(owner_email));
 
   for (user_manager::UserList::const_iterator it = users.begin();
        it != users.end();
        ++it) {
-    bool is_owner = ((*it)->email() == owner);
+    bool is_owner = ((*it)->GetUserID() == owner_id);
     base::DictionaryValue* user_dict = new base::DictionaryValue();
     UserSelectionScreen::FillUserDictionary(
         *it, is_owner, false, /* is_signin_to_add */
         proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
         NULL, /* public_session_recommended_locales */
         user_dict);
     users_list->Append(user_dict);
   }
   data->Set("managers", users_list.release());
   ShowScreen(OobeUI::kScreenSupervisedUserCreationFlow, data.get());
@@ skipping 50 matching lines @@
     HandleAbortLocalSupervisedUserCreation() {
   delegate_->AbortFlow();
 }
 
 void SupervisedUserCreationScreenHandler::
     HandleHideLocalSupervisedUserCreation() {
   delegate_->HideFlow();
 }
 
 void SupervisedUserCreationScreenHandler::HandleManagerSelected(
-    const std::string& manager_id) {
+    const std::string& manager_email) {
   if (!delegate_)
     return;
-  WallpaperManager::Get()->SetUserWallpaperNow(manager_id);
+  WallpaperManager::Get()->SetUserWallpaperNow(user_manager::UserID::FromUserEmail(manager_email));
 }
 
 void SupervisedUserCreationScreenHandler::HandleImportUserSelected(
-    const std::string& user_id) {
+    const std::string& user_email) {
   if (!delegate_)
     return;
 }
 
 void SupervisedUserCreationScreenHandler::HandleCheckSupervisedUserName(
     const base::string16& name) {
-  std::string user_id;
+  std::string user_email;
   if (NULL !=
       ChromeUserManager::Get()->GetSupervisedUserManager()->FindByDisplayName(
           base::CollapseWhitespace(name, true))) {
     CallJS("supervisedUserNameError", name,
            l10n_util::GetStringUTF16(
                IDS_CREATE_SUPERVISED_USER_CREATE_USERNAME_ALREADY_EXISTS));
   } else if (net::EscapeForHTML(name) != name) {
     CallJS("supervisedUserNameError", name,
            l10n_util::GetStringUTF16(
                IDS_CREATE_SUPERVISED_USER_CREATE_ILLEGAL_USERNAME));
   } else if (delegate_ && delegate_->FindUserByDisplayName(
-                 base::CollapseWhitespace(name, true), &user_id)) {
-    CallJS("supervisedUserSuggestImport", name, user_id);
+                 base::CollapseWhitespace(name, true), &user_email)) {
+    CallJS("supervisedUserSuggestImport", name, user_email);
   } else {
     CallJS("supervisedUserNameOk", name);
   }
 }
 
 void SupervisedUserCreationScreenHandler::HandleCreateSupervisedUser(
     const base::string16& new_raw_user_name,
     const std::string& new_user_password) {
   if (!delegate_)
     return;
@@ skipping 22 matching lines @@
     return;
   }
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
   delegate_->CreateSupervisedUser(new_user_name, new_user_password);
 }
 
 void SupervisedUserCreationScreenHandler::HandleImportSupervisedUser(
-    const std::string& user_id) {
+    const std::string& user_email) {
   if (!delegate_)
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
-  delegate_->ImportSupervisedUser(user_id);
+  delegate_->ImportSupervisedUser(user_manager::UserID::FromUserEmail(user_email));
 }
 
 void SupervisedUserCreationScreenHandler::
     HandleImportSupervisedUserWithPassword(
-        const std::string& user_id,
+        const std::string& user_email,
         const std::string& password) {
   if (!delegate_)
     return;
 
   ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
       IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_PROGRESS_MESSAGE));
 
-  delegate_->ImportSupervisedUserWithPassword(user_id, password);
+  delegate_->ImportSupervisedUserWithPassword(user_manager::UserID::FromUserEmail(user_email), password);
 }
 
 void SupervisedUserCreationScreenHandler::HandleAuthenticateManager(
     const std::string& raw_manager_username,
     const std::string& manager_password) {
   const std::string manager_username =
       gaia::SanitizeEmail(raw_manager_username);
-  delegate_->AuthenticateManager(manager_username, manager_password);
+  delegate_->AuthenticateManager(user_manager::UserID::FromUserEmail(manager_username), manager_password);
 }
 
 // TODO(antrim) : this is an explicit code duplications with UserImageScreen.
 // It should be removed by issue 251179.
 void SupervisedUserCreationScreenHandler::HandleGetImages() {
   base::ListValue image_urls;
   for (int i = user_manager::kFirstDefaultImageIndex;
        i < user_manager::kDefaultImagesCount;
        ++i) {
     scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
@@ skipping 50 matching lines @@
 void SupervisedUserCreationScreenHandler::SetCameraPresent(bool present) {
   CallJS("setCameraPresent", present);
 }
 
 void SupervisedUserCreationScreenHandler::ShowExistingSupervisedUsers(
     const base::ListValue* users) {
   CallJS("setExistingSupervisedUsers", *users);
 }
 
 }  // namespace chromeos