Adding infrastructure for possibility of changing manager names for the supervised accounts.

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 0ce61d9b7103276d47b63fd1f4ee4a83eed14e43..20975d49bd6243eb24453bcd98ce7f1694207c76 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -281,28 +281,31 @@ void SupervisedUserService::GetCategoryNames(CategoryList* list) {
 }
 
 std::string SupervisedUserService::GetCustodianEmailAddress() const {
+  std::string custodian_email = profile_->GetPrefs()->GetString(
+      prefs::kSupervisedUserCustodianEmail);
 #if defined(OS_CHROMEOS)
-  return chromeos::ChromeUserManager::Get()
-      ->GetSupervisedUserManager()
-      ->GetManagerDisplayEmail(
-          user_manager::UserManager::Get()->GetActiveUser()->email());
-#else
-  return profile_->GetPrefs()->GetString(prefs::kSupervisedUserCustodianEmail);
+  if (custodian_email.empty()) {
+    custodian_email = chromeos::ChromeUserManager::Get()
+        ->GetSupervisedUserManager()
+        ->GetManagerDisplayEmail(
+            user_manager::UserManager::Get()->GetActiveUser()->email());
+  }
 #endif
+  return custodian_email;
 }
 
 std::string SupervisedUserService::GetCustodianName() const {
-#if defined(OS_CHROMEOS)
-  return base::UTF16ToUTF8(
-      chromeos::ChromeUserManager::Get()
-          ->GetSupervisedUserManager()
-          ->GetManagerDisplayName(
-              user_manager::UserManager::Get()->GetActiveUser()->email()));
-#else
   std::string name = profile_->GetPrefs()->GetString(
       prefs::kSupervisedUserCustodianName);
-  return name.empty() ? GetCustodianEmailAddress() : name;
+#if defined(OS_CHROMEOS)

[Daniel Erat, 2014/10/07 16:16:00]

do you actually need this? GetCustodianEmailAddress() above looks like it does
the same thing -- if you delete this block, won't it just get called instead? or
is there a case where the kSupervisedUserCustodianEmail pref differs from the
email address you'd get from UserManager?

[Marc Treib, 2014/10/08 07:51:19]

Not quite: above we call GetManagerDisplayEmail, here it's GetManagerDisplayName

+  if (name.empty()) {
+    name = base::UTF16ToUTF8(chromeos::ChromeUserManager::Get()

[Daniel Erat, 2014/10/07 16:16:00]

why does this call base::UTF16ToUTF8() while GetCustodianEmailAddress() doesn't?
what's the actual encoding that's used for this pref's value?

[Marc Treib, 2014/10/08 07:51:19]

GetManagerDisplayName returns a base::string16, while GetManagerDisplayEmail
returns an std::string

+        ->GetSupervisedUserManager()
+        ->GetManagerDisplayName(
+            user_manager::UserManager::Get()->GetActiveUser()->email()));
+  }
 #endif
+  return name.empty() ? GetCustodianEmailAddress() : name;
 }
 
 void SupervisedUserService::AddNavigationBlockedCallback(