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

chrome/browser/ui/webui/options/create_profile_handler.cc

 // Copyright 2013 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/options/create_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 75 matching lines @@
   profile_creation_start_time_ = base::TimeTicks::Now();
 
   base::string16 name;
   base::string16 icon;
   bool create_shortcut = false;
   if (args->GetString(0, &name) && args->GetString(1, &icon)) {
     base::TrimWhitespace(name, base::TRIM_ALL, &name);
     CHECK(!name.empty());
     args->GetBoolean(2, &create_shortcut);
   }
-  std::string supervised_user_id;
+  user_manager::UserID supervised_user_id = user_manager::UserID(std::string(), std::string());
 #if defined(ENABLE_SUPERVISED_USERS)
   if (!ProcessSupervisedCreateProfileArgs(args, &supervised_user_id))
     return;
 #endif
 
   ProfileMetrics::LogProfileAddNewUser(ProfileMetrics::ADD_NEW_USER_DIALOG);
 
   profile_path_being_created_ = ProfileManager::CreateMultiProfileAsync(
       name, icon,
       base::Bind(&CreateProfileHandler::OnProfileCreated,
                  weak_ptr_factory_.GetWeakPtr(),
                  create_shortcut,
                  helper::GetDesktopType(web_ui()),
                  supervised_user_id),
       supervised_user_id);
 }
 
 void CreateProfileHandler::OnProfileCreated(
     bool create_shortcut,
     chrome::HostDesktopType desktop_type,
-    const std::string& supervised_user_id,
+    const user_manager::UserID& supervised_user_id,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_CREATED)
     RecordProfileCreationMetrics(status);
 
   switch (status) {
     case Profile::CREATE_STATUS_LOCAL_FAIL: {
       ShowProfileCreationError(profile, GetProfileCreationErrorMessageLocal());
       break;
     }
@@ skipping 15 matching lines @@
     case Profile::MAX_CREATE_STATUS: {
       NOTREACHED();
       break;
     }
   }
 }
 
 void CreateProfileHandler::HandleProfileCreationSuccess(
     bool create_shortcut,
     chrome::HostDesktopType desktop_type,
-    const std::string& supervised_user_id,
+    const user_manager::UserID& supervised_user_id,
     Profile* profile) {
   switch (profile_creation_type_) {
     case NON_SUPERVISED_PROFILE_CREATION: {
       DCHECK(supervised_user_id.empty());
       CreateShortcutAndShowSuccess(create_shortcut, desktop_type, profile);
       break;
     }
 #if defined(ENABLE_SUPERVISED_USERS)
     case SUPERVISED_PROFILE_CREATION:
     case SUPERVISED_PROFILE_IMPORT:
@@ skipping 131 matching lines @@
       }
       break;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 #if defined(ENABLE_SUPERVISED_USERS)
 bool CreateProfileHandler::ProcessSupervisedCreateProfileArgs(
-    const base::ListValue* args, std::string* supervised_user_id) {
+    const base::ListValue* args, user_manager::UserID* supervised_user_id) {
   bool supervised_user = false;
   if (args->GetSize() >= 5) {
       bool success = args->GetBoolean(3, &supervised_user);
       DCHECK(success);
 
-      success = args->GetString(4, supervised_user_id);
+      std::string supervised_user_email;
+      success = args->GetString(4, &supervised_user_email);
       DCHECK(success);
+      *(supervised_user_id) = user_manager::UserID::FromUserEmail(supervised_user_email);
   }
 
   if (supervised_user) {
     if (!IsValidExistingSupervisedUserId(*supervised_user_id))
       return false;
 
     profile_creation_type_ = SUPERVISED_PROFILE_IMPORT;
     if (supervised_user_id->empty()) {
       profile_creation_type_ = SUPERVISED_PROFILE_CREATION;
       *supervised_user_id =
@@ skipping 48 matching lines @@
 
   // Cancelling registration means the callback passed into
   // RegisterAndInitSync() won't be called, so the cleanup must be done here.
   profile_path_being_created_.clear();
   helper::DeleteProfileAtPath(new_profile->GetPath(), web_ui());
 }
 
 void CreateProfileHandler::RegisterSupervisedUser(
     bool create_shortcut,
     chrome::HostDesktopType desktop_type,
-    const std::string& supervised_user_id,
+    const user_manager::UserID& supervised_user_id,
     Profile* new_profile) {
   DCHECK_EQ(profile_path_being_created_.value(),
             new_profile->GetPath().value());
 
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(new_profile);
 
   // Register the supervised user using the profile of the custodian.
   supervised_user_registration_utility_ =
       SupervisedUserRegistrationUtility::Create(Profile::FromWebUI(web_ui()));
@@ skipping 53 matching lines @@
     UMA_HISTOGRAM_ENUMERATION("Profile.SupervisedProfileImportError",
                               error_state,
                               GoogleServiceAuthError::NUM_STATES);
     UMA_HISTOGRAM_MEDIUM_TIMES(
         "Profile.SupervisedProfileTotalImportTime",
         base::TimeTicks::Now() - profile_creation_start_time_);
   }
 }
 
 bool CreateProfileHandler::IsValidExistingSupervisedUserId(
-    const std::string& existing_supervised_user_id) const {
+    const user_manager::UserID& existing_supervised_user_id) const {
   if (existing_supervised_user_id.empty())
     return true;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   const base::DictionaryValue* dict =
       SupervisedUserSyncServiceFactory::GetForProfile(profile)->
           GetSupervisedUsers();
-  if (!dict->HasKey(existing_supervised_user_id))
+  if (!dict->HasKey(existing_supervised_user_id.GetUserEmail()))
     return false;
 
   // Check if this supervised user already exists on this machine.
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (existing_supervised_user_id ==
             cache.GetSupervisedUserIdOfProfileAtIndex(i))
       return false;
   }
   return true;
 }
 #endif
 
 }  // namespace options