Rename "managed (mode|user)" to "supervised user" (part 2)

chrome/browser/supervised_user/supervised_user_shared_settings_service.cc

Index: chrome/browser/supervised_user/supervised_user_shared_settings_service.cc
diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc
similarity index 73%
rename from chrome/browser/managed_mode/managed_user_shared_settings_service.cc
rename to chrome/browser/supervised_user/supervised_user_shared_settings_service.cc
index 74c0b77d444a6c2ca1c7f9cf99c726e1aa2ecb3d..042654ad3834f47998bed1da9fa9ed27591acc05 100644
--- a/chrome/browser/managed_mode/managed_user_shared_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service.cc
@@ -2,7 +2,7 @@
 // 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_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -46,29 +46,29 @@ DictionaryValue* FindOrCreateDictionary(DictionaryValue* parent,
   return dict;
 }
 
-class ScopedManagedUserSharedSettingsUpdate {
+class ScopedSupervisedUserSharedSettingsUpdate {
  public:
-  ScopedManagedUserSharedSettingsUpdate(PrefService* prefs,
-                                        const std::string& mu_id)
-      : update_(prefs, prefs::kSupervisedUserSharedSettings), mu_id_(mu_id) {
-    DCHECK(!mu_id.empty());
+  ScopedSupervisedUserSharedSettingsUpdate(PrefService* prefs,
+                                           const std::string& su_id)
+      : update_(prefs, prefs::kSupervisedUserSharedSettings), su_id_(su_id) {
+    DCHECK(!su_id.empty());
 
     // A supervised user can only modify their own settings.
     std::string id = prefs->GetString(prefs::kSupervisedUserId);
-    DCHECK(id.empty() || id == mu_id);
+    DCHECK(id.empty() || id == su_id);
   }
 
   DictionaryValue* Get() {
-    return FindOrCreateDictionary(update_.Get(), mu_id_);
+    return FindOrCreateDictionary(update_.Get(), su_id_);
   }
 
  private:
   DictionaryPrefUpdate update_;
-  std::string mu_id_;
+  std::string su_id_;
 };
 
 SyncData CreateSyncDataForValue(
-    const std::string& mu_id,
+    const std::string& su_id,
     const std::string& key,
     const Value& dict_value) {
   const DictionaryValue* dict = NULL;
@@ -82,25 +82,25 @@ SyncData CreateSyncDataForValue(
   bool acknowledged = false;
   dict->GetBoolean(kAcknowledged, &acknowledged);
 
-  return ManagedUserSharedSettingsService::CreateSyncDataForSetting(
-      mu_id, key, *value, acknowledged);
+  return SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
+      su_id, key, *value, acknowledged);
 }
 
 }  // namespace
 
 
-ManagedUserSharedSettingsService::ManagedUserSharedSettingsService(
+SupervisedUserSharedSettingsService::SupervisedUserSharedSettingsService(
     PrefService* prefs)
     : prefs_(prefs) {}
 
-ManagedUserSharedSettingsService::~ManagedUserSharedSettingsService() {}
+SupervisedUserSharedSettingsService::~SupervisedUserSharedSettingsService() {}
 
-void ManagedUserSharedSettingsService::SetValueInternal(
-    const std::string& mu_id,
+void SupervisedUserSharedSettingsService::SetValueInternal(
+    const std::string& su_id,
     const std::string& key,
     const Value& value,
     bool acknowledged) {
-  ScopedManagedUserSharedSettingsUpdate update(prefs_, mu_id);
+  ScopedSupervisedUserSharedSettingsUpdate update(prefs_, su_id);
   DictionaryValue* update_dict = update.Get();
 
   DictionaryValue* dict = NULL;
@@ -115,7 +115,7 @@ void ManagedUserSharedSettingsService::SetValueInternal(
   if (!sync_processor_)
     return;
 
-  SyncData data = CreateSyncDataForSetting(mu_id, key, value, acknowledged);
+  SyncData data = CreateSyncDataForSetting(su_id, key, value, acknowledged);
   SyncChange::SyncChangeType change_type =
       has_key ? SyncChange::ACTION_UPDATE : SyncChange::ACTION_ADD;
   SyncChangeList changes;
@@ -124,13 +124,13 @@ void ManagedUserSharedSettingsService::SetValueInternal(
   DCHECK(!error.IsSet()) << error.ToString();
 }
 
-const Value* ManagedUserSharedSettingsService::GetValue(
-    const std::string& mu_id,
+const Value* SupervisedUserSharedSettingsService::GetValue(
+    const std::string& su_id,
     const std::string& key) {
   const DictionaryValue* data =
       prefs_->GetDictionary(prefs::kSupervisedUserSharedSettings);
   const DictionaryValue* dict = NULL;
-  if (!data->GetDictionaryWithoutPathExpansion(mu_id, &dict))
+  if (!data->GetDictionaryWithoutPathExpansion(su_id, &dict))
     return NULL;
 
   const DictionaryValue* settings = NULL;
@@ -144,21 +144,22 @@ const Value* ManagedUserSharedSettingsService::GetValue(
   return value;
 }
 
-void ManagedUserSharedSettingsService::SetValue(
-    const std::string& mu_id,
+void SupervisedUserSharedSettingsService::SetValue(
+    const std::string& su_id,
     const std::string& key,
     const Value& value) {
-  SetValueInternal(mu_id, key, value, true);
+  SetValueInternal(su_id, key, value, true);
 }
 
-scoped_ptr<ManagedUserSharedSettingsService::ChangeCallbackList::Subscription>
-ManagedUserSharedSettingsService::Subscribe(
-    const ManagedUserSharedSettingsService::ChangeCallback& cb) {
+scoped_ptr<
+    SupervisedUserSharedSettingsService::ChangeCallbackList::Subscription>
+SupervisedUserSharedSettingsService::Subscribe(
+    const SupervisedUserSharedSettingsService::ChangeCallback& cb) {
   return callbacks_.Add(cb);
 }
 
 // static
-void ManagedUserSharedSettingsService::RegisterProfilePrefs(
+void SupervisedUserSharedSettingsService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kSupervisedUserSharedSettings,
@@ -166,27 +167,27 @@ void ManagedUserSharedSettingsService::RegisterProfilePrefs(
 }
 
 // static
-SyncData ManagedUserSharedSettingsService::CreateSyncDataForSetting(
-    const std::string& mu_id,
+SyncData SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
+    const std::string& su_id,
     const std::string& key,
     const Value& value,
     bool acknowledged) {
   std::string json_value;
   base::JSONWriter::Write(&value, &json_value);
   ::sync_pb::EntitySpecifics specifics;
-  specifics.mutable_managed_user_shared_setting()->set_mu_id(mu_id);
+  specifics.mutable_managed_user_shared_setting()->set_mu_id(su_id);
   specifics.mutable_managed_user_shared_setting()->set_key(key);
   specifics.mutable_managed_user_shared_setting()->set_value(json_value);
   specifics.mutable_managed_user_shared_setting()->set_acknowledged(
       acknowledged);
-  std::string title = mu_id + ":" + key;
+  std::string title = su_id + ":" + key;
   return SyncData::CreateLocalData(title, title, specifics);
 }
 
-void ManagedUserSharedSettingsService::Shutdown() {}
+void SupervisedUserSharedSettingsService::Shutdown() {}
 
 syncer::SyncMergeResult
-ManagedUserSharedSettingsService::MergeDataAndStartSyncing(
+SupervisedUserSharedSettingsService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
@@ -206,24 +207,24 @@ ManagedUserSharedSettingsService::MergeDataAndStartSyncing(
        ++it) {
     DCHECK_EQ(SUPERVISED_USER_SHARED_SETTINGS, it->GetDataType());
     const ::sync_pb::ManagedUserSharedSettingSpecifics&
-        managed_user_shared_setting =
+        supervised_user_shared_setting =
             it->GetSpecifics().managed_user_shared_setting();
     scoped_ptr<Value> value(
-        base::JSONReader::Read(managed_user_shared_setting.value()));
-    const std::string& mu_id = managed_user_shared_setting.mu_id();
-    ScopedManagedUserSharedSettingsUpdate update(prefs_, mu_id);
-    const std::string& key = managed_user_shared_setting.key();
+        base::JSONReader::Read(supervised_user_shared_setting.value()));
+    const std::string& su_id = supervised_user_shared_setting.mu_id();
+    ScopedSupervisedUserSharedSettingsUpdate update(prefs_, su_id);
+    const std::string& key = supervised_user_shared_setting.key();
     DictionaryValue* dict = FindOrCreateDictionary(update.Get(), key);
     dict->SetWithoutPathExpansion(kValue, value.release());
 
     // Every setting we get from the server should have the acknowledged flag
     // set.
-    DCHECK(managed_user_shared_setting.acknowledged());
+    DCHECK(supervised_user_shared_setting.acknowledged());
     dict->SetBooleanWithoutPathExpansion(
-        kAcknowledged, managed_user_shared_setting.acknowledged());
-    callbacks_.Notify(mu_id, key);
+        kAcknowledged, supervised_user_shared_setting.acknowledged());
+    callbacks_.Notify(su_id, key);
 
-    seen_keys[mu_id].insert(key);
+    seen_keys[su_id].insert(key);
   }
 
   // Iterate over all settings that we have locally, which includes settings
@@ -262,13 +263,13 @@ ManagedUserSharedSettingsService::MergeDataAndStartSyncing(
   return result;
 }
 
-void ManagedUserSharedSettingsService::StopSyncing(syncer::ModelType type) {
+void SupervisedUserSharedSettingsService::StopSyncing(syncer::ModelType type) {
   DCHECK_EQ(SUPERVISED_USER_SHARED_SETTINGS, type);
   sync_processor_.reset();
   error_handler_.reset();
 }
 
-syncer::SyncDataList ManagedUserSharedSettingsService::GetAllSyncData(
+syncer::SyncDataList SupervisedUserSharedSettingsService::GetAllSyncData(
     syncer::ModelType type) const {
   DCHECK_EQ(SUPERVISED_USER_SHARED_SETTINGS, type);
   SyncDataList data;
@@ -286,7 +287,7 @@ syncer::SyncDataList ManagedUserSharedSettingsService::GetAllSyncData(
   return data;
 }
 
-syncer::SyncError ManagedUserSharedSettingsService::ProcessSyncChanges(
+syncer::SyncError SupervisedUserSharedSettingsService::ProcessSyncChanges(
     const tracked_objects::Location& from_here,
     const syncer::SyncChangeList& change_list) {
   for (SyncChangeList::const_iterator it = change_list.begin();
@@ -295,11 +296,11 @@ syncer::SyncError ManagedUserSharedSettingsService::ProcessSyncChanges(
     SyncData data = it->sync_data();
     DCHECK_EQ(SUPERVISED_USER_SHARED_SETTINGS, data.GetDataType());
     const ::sync_pb::ManagedUserSharedSettingSpecifics&
-        managed_user_shared_setting =
+        supervised_user_shared_setting =
             data.GetSpecifics().managed_user_shared_setting();
-    const std::string& key = managed_user_shared_setting.key();
-    const std::string& mu_id = managed_user_shared_setting.mu_id();
-    ScopedManagedUserSharedSettingsUpdate update(prefs_, mu_id);
+    const std::string& key = supervised_user_shared_setting.key();
+    const std::string& su_id = supervised_user_shared_setting.mu_id();
+    ScopedSupervisedUserSharedSettingsUpdate update(prefs_, su_id);
     DictionaryValue* update_dict = update.Get();
     DictionaryValue* dict = NULL;
     bool has_key = update_dict->GetDictionaryWithoutPathExpansion(key, &dict);
@@ -308,10 +309,11 @@ syncer::SyncError ManagedUserSharedSettingsService::ProcessSyncChanges(
       case SyncChange::ACTION_UPDATE: {
         // Every setting we get from the server should have the acknowledged
         // flag set.
-        DCHECK(managed_user_shared_setting.acknowledged());
+        DCHECK(supervised_user_shared_setting.acknowledged());
 
         if (has_key) {
-          // If the managed user already exists, it should be an update action.
+          // If the supervised user already exists, it should be an update
+          // action.
           DCHECK_EQ(SyncChange::ACTION_UPDATE, it->change_type());
         } else {
           // Otherwise, it should be an add action.
@@ -320,10 +322,10 @@ syncer::SyncError ManagedUserSharedSettingsService::ProcessSyncChanges(
           update_dict->SetWithoutPathExpansion(key, dict);
         }
         scoped_ptr<Value> value(
-            base::JSONReader::Read(managed_user_shared_setting.value()));
+            base::JSONReader::Read(supervised_user_shared_setting.value()));
         dict->SetWithoutPathExpansion(kValue, value.release());
         dict->SetBooleanWithoutPathExpansion(
-            kAcknowledged, managed_user_shared_setting.acknowledged());
+            kAcknowledged, supervised_user_shared_setting.acknowledged());
         break;
       }
       case SyncChange::ACTION_DELETE: {
@@ -338,7 +340,7 @@ syncer::SyncError ManagedUserSharedSettingsService::ProcessSyncChanges(
         break;
       }
     }
-    callbacks_.Notify(mu_id, key);
+    callbacks_.Notify(su_id, key);
   }
 
   SyncError error;