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

chrome/browser/ui/webui/options/supervised_user_import_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/options/supervised_user_import_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_factory.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "components/user_manager/user_id.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 scoped_ptr<base::ListValue> GetAvatarIcons() {
   scoped_ptr<base::ListValue> avatar_icons(new base::ListValue);
   for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {
     std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i);
     avatar_icons->Append(new base::StringValue(avatar_url));
@@ skipping 140 matching lines @@
   }
 }
 
 void SupervisedUserImportHandler::SendExistingSupervisedUsers(
     const base::DictionaryValue* dict) {
   DCHECK(dict);
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   // Collect the ids of local supervised user profiles.
-  std::set<std::string> supervised_user_ids;
+  std::set<user_manager::UserID> supervised_user_ids;
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (cache.ProfileIsLegacySupervisedAtIndex(i))
       supervised_user_ids.insert(cache.GetSupervisedUserIdOfProfileAtIndex(i));
   }
 
   base::ListValue supervised_users;
   Profile* profile = Profile::FromWebUI(web_ui());
   SupervisedUserSharedSettingsService* service =
       SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
   for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
@@ skipping 26 matching lines @@
 
     std::string supervised_user_icon =
         std::string(chrome::kChromeUIThemeURL) +
         "IDR_SUPERVISED_USER_PLACEHOLDER";
     std::string avatar_url =
         avatar_index == SupervisedUserSyncService::kNoAvatar ?
             supervised_user_icon :
             profiles::GetDefaultAvatarIconUrl(avatar_index);
     supervised_user->SetString("iconURL", avatar_url);
     bool on_current_device =
-        supervised_user_ids.find(it.key()) != supervised_user_ids.end();
+        supervised_user_ids.find(user_manager::UserID::FromUserEmail(it.key())) != supervised_user_ids.end();
     supervised_user->SetBoolean("onCurrentDevice", on_current_device);
 
     supervised_users.Append(supervised_user);
   }
 
   web_ui()->CallJavascriptFunction(
       "options.SupervisedUserListData.receiveExistingSupervisedUsers",
       supervised_users);
 }
 
@@ skipping 29 matching lines @@
     const std::string& key) {
   if (key == supervised_users::kChromeAvatarIndex)
     FetchSupervisedUsers();
 }
 
 void SupervisedUserImportHandler::OnErrorChanged() {
   FetchSupervisedUsers();
 }
 
 }  // namespace options