Use the display name on ChromeOS instead of the profile name.

chrome/browser/supervised_user/supervised_user_service.cc

Index: chrome/browser/supervised_user/supervised_user_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 07deebfba15aee56a31d1c919ecfbb712686accc..2f1abe99c78a5105d41a4549ddc7c0b16f14dbfd 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -620,7 +620,7 @@ void SupervisedUserService::SetActive(bool active) {
           settings_service,
           SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
               profile_),
-          pref_service->GetString(prefs::kProfileName),
+          GetSupervisedUserName(),
           pref_service->GetString(prefs::kSupervisedUserId)));
     }
 
@@ -764,3 +764,16 @@ void SupervisedUserService::OnBrowserSetLastActive(Browser* browser) {
 
   is_profile_active_ = profile_became_active;
 }
+
+std::string SupervisedUserService::GetSupervisedUserName() const {
+#if defined(OS_CHROMEOS)
+  // The active user can be NULL in unit tests.
+  if (chromeos::UserManager::Get()->GetActiveUser()) {
+    return UTF16ToUTF8(chromeos::UserManager::Get()->GetUserDisplayName(
+        chromeos::UserManager::Get()->GetActiveUser()->GetUserID()));
+  }
+  return "";

[Nikita (slow), 2014/08/01 11:27:17]

nit: std::string()

[Adrian Kuegel, 2014/08/01 11:43:01]

Done.

+#else
+  return profile_->GetPrefs()->GetString(prefs::kProfileName);
+#endif
+}