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

chrome/browser/supervised_user/supervised_user_pref_store.cc

Index: chrome/browser/supervised_user/supervised_user_pref_store.cc
diff --git a/chrome/browser/managed_mode/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc
similarity index 72%
rename from chrome/browser/managed_mode/supervised_user_pref_store.cc
rename to chrome/browser/supervised_user/supervised_user_pref_store.cc
index ceaeec28285142ee4aa68ba2397bf646c30c14fe..f8b9b7b6e2f18f7052ba469f59830043fa3e0377 100644
--- a/chrome/browser/managed_mode/supervised_user_pref_store.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -2,49 +2,49 @@
 // 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/supervised_user_pref_store.h"
+#include "chrome/browser/supervised_user/supervised_user_pref_store.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/managed_mode/managed_mode_url_filter.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_settings_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #include "chrome/common/pref_names.h"
 
 using base::FundamentalValue;
 
 namespace {
 
-struct ManagedUserSettingsPrefMappingEntry {
+struct SupervisedUserSettingsPrefMappingEntry {
   const char* settings_name;
   const char* pref_name;
 };
 
-ManagedUserSettingsPrefMappingEntry kManagedUserSettingsPrefMapping[] = {
+SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
   {
-    managed_users::kContentPackDefaultFilteringBehavior,
+    supervised_users::kContentPackDefaultFilteringBehavior,
     prefs::kDefaultSupervisedUserFilteringBehavior,
   },
   {
-    managed_users::kContentPackManualBehaviorHosts,
+    supervised_users::kContentPackManualBehaviorHosts,
     prefs::kSupervisedUserManualHosts,
   },
   {
-    managed_users::kContentPackManualBehaviorURLs,
+    supervised_users::kContentPackManualBehaviorURLs,
     prefs::kSupervisedUserManualURLs,
   },
   {
-    managed_users::kForceSafeSearch,
+    supervised_users::kForceSafeSearch,
     prefs::kForceSafeSearch,
   },
   {
-    managed_users::kSigninAllowed,
+    supervised_users::kSigninAllowed,
     prefs::kSigninAllowed,
   },
   {
-    managed_users::kUserName,
+    supervised_users::kUserName,
     prefs::kProfileName,
   },
 };
@@ -52,9 +52,9 @@ ManagedUserSettingsPrefMappingEntry kManagedUserSettingsPrefMapping[] = {
 }  // namespace
 
 SupervisedUserPrefStore::SupervisedUserPrefStore(
-    ManagedUserSettingsService* managed_user_settings_service)
+    SupervisedUserSettingsService* supervised_user_settings_service)
     : weak_ptr_factory_(this) {
-  managed_user_settings_service->Subscribe(
+  supervised_user_settings_service->Subscribe(
       base::Bind(&SupervisedUserPrefStore::OnNewSettingsAvailable,
                  weak_ptr_factory_.GetWeakPtr()));
 }
@@ -93,17 +93,17 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
     prefs_->SetValue(prefs::kAllowDeletingBrowserHistory,
                      new FundamentalValue(false));
     prefs_->SetValue(prefs::kDefaultSupervisedUserFilteringBehavior,
-                     new FundamentalValue(ManagedModeURLFilter::ALLOW));
+                     new FundamentalValue(SupervisedUserURLFilter::ALLOW));
     prefs_->SetValue(prefs::kForceSafeSearch, new FundamentalValue(true));
     prefs_->SetValue(prefs::kHideWebStoreIcon, new FundamentalValue(true));
     prefs_->SetValue(prefs::kIncognitoModeAvailability,
                      new FundamentalValue(IncognitoModePrefs::DISABLED));
     prefs_->SetValue(prefs::kSigninAllowed, new FundamentalValue(false));
 
-    // Copy managed user settings to prefs.
-    for (size_t i = 0; i < arraysize(kManagedUserSettingsPrefMapping); ++i) {
-      const ManagedUserSettingsPrefMappingEntry& entry =
-          kManagedUserSettingsPrefMapping[i];
+    // Copy supervised user settings to prefs.
+    for (size_t i = 0; i < arraysize(kSupervisedUserSettingsPrefMapping); ++i) {
+      const SupervisedUserSettingsPrefMappingEntry& entry =
+          kSupervisedUserSettingsPrefMapping[i];
       const base::Value* value = NULL;
       if (settings->GetWithoutPathExpansion(entry.settings_name, &value))
         prefs_->SetValue(entry.pref_name, value->DeepCopy());