Update strings to match the final spec.

chrome/browser/managed_mode/managed_user_service.cc

 // Copyright (c) 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/managed_mode/managed_user_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 158 matching lines @@
   registry->RegisterDictionaryPref(
       prefs::kManagedModeManualHosts,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kManagedModeManualURLs,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kDefaultManagedModeFilteringBehavior, ManagedModeURLFilter::ALLOW,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
-      prefs::kManagedUserCustodian, std::string(),
+      prefs::kManagedUserCustodianEmail, std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      prefs::kManagedUserCustodianName, std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool ManagedUserService::AreManagedUsersEnabled() {
   // Allow enabling by command line for now for easier development.
   return base::FieldTrialList::FindFullName(kManagedModeFinchName) ==
              kManagedModeFinchActive ||
          CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kEnableManagedUsers);
@@ skipping 21 matching lines @@
 
   return (*sites.begin())->category_id;
 }
 
 // static
 void ManagedUserService::GetCategoryNames(CategoryList* list) {
   ManagedModeSiteList::GetCategoryNames(list);
 }
 
 std::string ManagedUserService::GetCustodianEmailAddress() const {
-  return profile_->GetPrefs()->GetString(prefs::kManagedUserCustodian);
+  return profile_->GetPrefs()->GetString(prefs::kManagedUserCustodianEmail);
+}
+
+std::string ManagedUserService::GetCustodianName() const {
+  std::string name = profile_->GetPrefs()->GetString(
+      prefs::kManagedUserCustodianName);
+  return name.empty() ? GetCustodianEmailAddress() : name;
 }
 
 std::string ManagedUserService::GetDebugPolicyProviderName() const {
   // Save the string space in official builds.
 #ifdef NDEBUG
   NOTREACHED();
   return std::string();
 #else
   return "Managed User Service";
 #endif
@@ skipping 108 matching lines @@
 bool ManagedUserService::ExtensionManagementPolicyImpl(
     const std::string& extension_id,
     string16* error) const {
   if (!ProfileIsManaged())
     return true;
 
   if (elevated_for_testing_)
     return true;
 
   if (error)
-    *error = l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_MANAGED_MODE);
+    *error = l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_MANAGED_USER);
   return false;
 }
 
 ScopedVector<ManagedModeSiteList> ManagedUserService::GetActiveSiteLists() {
   ScopedVector<ManagedModeSiteList> site_lists;
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   // Can be NULL in unit tests.
   if (!extension_service)
     return site_lists.Pass();
@@ skipping 194 matching lines @@
   if (auth_error.state() != GoogleServiceAuthError::NONE) {
     LOG(ERROR) << "Managed user OAuth error: " << auth_error.ToString();
     DCHECK_EQ(std::string(), token);
     callback.Run(profile_, Profile::CREATE_STATUS_REMOTE_FAIL);
     return;
   }
 
   InitSync(token);
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(custodian_profile);
-  profile_->GetPrefs()->SetString(prefs::kManagedUserCustodian,
+  profile_->GetPrefs()->SetString(prefs::kManagedUserCustodianEmail,
                                   signin->GetAuthenticatedUsername());
   callback.Run(profile_, Profile::CREATE_STATUS_INITIALIZED);
 }
 
 void ManagedUserService::UpdateManualHosts() {
   const DictionaryValue* dict =
       profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualHosts);
   scoped_ptr<std::map<std::string, bool> > host_map(
       new std::map<std::string, bool>());
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
@@ skipping 10 matching lines @@
       profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs);
   scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>());
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     bool allow = false;
     bool result = it.value().GetAsBoolean(&allow);
     DCHECK(result);
     (*url_map)[GURL(it.key())] = allow;
   }
   url_filter_context_.SetManualURLs(url_map.Pass());
 }