Rename managed user pref store to supervised user pref store.

base/prefs/pref_value_store.cc

 // Copyright (c) 2012 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 "base/prefs/pref_value_store.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_notifier.h"
 #include "base/prefs/pref_observer.h"
 
@@ skipping 29 matching lines @@
     const std::string& key) {
   pref_value_store_->OnPrefValueChanged(type_, key);
 }
 
 void PrefValueStore::PrefStoreKeeper::OnInitializationCompleted(
     bool succeeded) {
   pref_value_store_->OnInitializationCompleted(type_, succeeded);
 }
 
 PrefValueStore::PrefValueStore(PrefStore* managed_prefs,
-                               PrefStore* managed_user_prefs,
+                               PrefStore* supervised_user_prefs,
                                PrefStore* extension_prefs,
                                PrefStore* command_line_prefs,
                                PrefStore* user_prefs,
                                PrefStore* recommended_prefs,
                                PrefStore* default_prefs,
                                PrefNotifier* pref_notifier)
     : pref_notifier_(pref_notifier),
       initialization_failed_(false) {
   InitPrefStore(MANAGED_STORE, managed_prefs);
-  InitPrefStore(MANAGED_USER_STORE, managed_user_prefs);
+  InitPrefStore(SUPERVISED_USER_STORE, supervised_user_prefs);
   InitPrefStore(EXTENSION_STORE, extension_prefs);
   InitPrefStore(COMMAND_LINE_STORE, command_line_prefs);
   InitPrefStore(USER_STORE, user_prefs);
   InitPrefStore(RECOMMENDED_STORE, recommended_prefs);
   InitPrefStore(DEFAULT_STORE, default_prefs);
 
   CheckInitializationCompleted();
 }
 
 PrefValueStore::~PrefValueStore() {}
 
 PrefValueStore* PrefValueStore::CloneAndSpecialize(
     PrefStore* managed_prefs,
-    PrefStore* managed_user_prefs,
+    PrefStore* supervised_user_prefs,
     PrefStore* extension_prefs,
     PrefStore* command_line_prefs,
     PrefStore* user_prefs,
     PrefStore* recommended_prefs,
     PrefStore* default_prefs,
     PrefNotifier* pref_notifier) {
   DCHECK(pref_notifier);
   if (!managed_prefs)
     managed_prefs = GetPrefStore(MANAGED_STORE);
-  if (!managed_user_prefs)
-    managed_user_prefs = GetPrefStore(MANAGED_USER_STORE);
+    supervised_user_prefs = GetPrefStore(SUPERVISED_USER_STORE);

[bartfab (slow), 2013/08/29 13:47:39]

These two lines got swapped around.

[Bernhard Bauer, 2013/08/29 13:54:25]

Fixed. Thanks!

+  if (!supervised_user_prefs)
   if (!extension_prefs)
     extension_prefs = GetPrefStore(EXTENSION_STORE);
   if (!command_line_prefs)
     command_line_prefs = GetPrefStore(COMMAND_LINE_STORE);
   if (!user_prefs)
     user_prefs = GetPrefStore(USER_STORE);
   if (!recommended_prefs)
     recommended_prefs = GetPrefStore(RECOMMENDED_STORE);
   if (!default_prefs)
     default_prefs = GetPrefStore(DEFAULT_STORE);
 
   return new PrefValueStore(
-      managed_prefs, managed_user_prefs, extension_prefs, command_line_prefs,
+      managed_prefs, supervised_user_prefs, extension_prefs, command_line_prefs,
       user_prefs, recommended_prefs, default_prefs, pref_notifier);
 }
 
 void PrefValueStore::set_callback(const PrefChangedCallback& callback) {
   pref_changed_callback_ = callback;
 }
 
 bool PrefValueStore::GetValue(const std::string& name,
                               base::Value::Type type,
                               const base::Value** out_value) const {
@@ skipping 164 matching lines @@
   if (initialization_failed_)
     return;
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
     scoped_refptr<PrefStore> store =
         GetPrefStore(static_cast<PrefStoreType>(i));
     if (store.get() && !store->IsInitializationComplete())
       return;
   }
   pref_notifier_->OnInitializationCompleted(true);
 }