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

chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
diff --git a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
similarity index 87%
rename from chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
index 4028b9dbea11cef938b7f6360aa53a477064501e..a13bb90c1a89f0332a22c5c0536592a312b59f41 100644
--- a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
@@ -8,9 +8,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_settings_service.h"
-#include "chrome/browser/managed_mode/supervised_user_pref_store.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_pref_store.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,7 +22,7 @@ namespace {
 class SupervisedUserPrefStoreFixture : public PrefStore::Observer {
  public:
   explicit SupervisedUserPrefStoreFixture(
-      ManagedUserSettingsService* settings_service);
+      SupervisedUserSettingsService* settings_service);
   virtual ~SupervisedUserPrefStoreFixture();
 
   base::DictionaryValue* changed_prefs() {
@@ -37,14 +37,14 @@ class SupervisedUserPrefStoreFixture : public PrefStore::Observer {
   virtual void OnPrefValueChanged(const std::string& key) OVERRIDE;
   virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;
 
-private:
+ private:
   scoped_refptr<SupervisedUserPrefStore> pref_store_;
   base::DictionaryValue changed_prefs_;
   bool initialization_completed_;
 };
 
 SupervisedUserPrefStoreFixture::SupervisedUserPrefStoreFixture(
-    ManagedUserSettingsService* settings_service)
+    SupervisedUserSettingsService* settings_service)
     : pref_store_(new SupervisedUserPrefStore(settings_service)),
       initialization_completed_(pref_store_->IsInitializationComplete()) {
   pref_store_->AddObserver(this);
@@ -76,7 +76,7 @@ class SupervisedUserPrefStoreTest : public ::testing::Test {
   virtual void TearDown() OVERRIDE;
 
  protected:
-  ManagedUserSettingsService service_;
+  SupervisedUserSettingsService service_;
   scoped_refptr<TestingPrefStore> pref_store_;
 };
 
@@ -101,18 +101,18 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
 
   service_.SetActive(true);
 
-  // kAllowDeletingBrowserHistory is hardcoded to false for managed users.
+  // kAllowDeletingBrowserHistory is hardcoded to false for supervised users.
   bool allow_deleting_browser_history = true;
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(
       prefs::kAllowDeletingBrowserHistory, &allow_deleting_browser_history));
   EXPECT_FALSE(allow_deleting_browser_history);
 
-  // kManagedModeManualHosts does not have a hardcoded value.
+  // kSupervisedModeManualHosts does not have a hardcoded value.
   base::DictionaryValue* manual_hosts = NULL;
   EXPECT_FALSE(fixture.changed_prefs()->GetDictionary(
       prefs::kSupervisedUserManualHosts, &manual_hosts));
 
-  // kForceSafeSearch defaults to true for managed users.
+  // kForceSafeSearch defaults to true for supervised users.
   bool force_safesearch = false;
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
                                                   &force_safesearch));
@@ -123,12 +123,12 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   service_.SetActive(true);
   EXPECT_EQ(0u, fixture.changed_prefs()->size());
 
-  // kManagedModeManualHosts can be configured by the custodian.
+  // kSupervisedModeManualHosts can be configured by the custodian.
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   dict->SetBoolean("example.com", true);
   dict->SetBoolean("moose.org", false);
   service_.SetLocalSettingForTesting(
-      managed_users::kContentPackManualBehaviorHosts,
+      supervised_users::kContentPackManualBehaviorHosts,
       scoped_ptr<base::Value>(dict->DeepCopy()));
   EXPECT_EQ(1u, fixture.changed_prefs()->size());
   ASSERT_TRUE(fixture.changed_prefs()->GetDictionary(
@@ -139,7 +139,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   // hardcoded default.
   fixture.changed_prefs()->Clear();
   service_.SetLocalSettingForTesting(
-      managed_users::kForceSafeSearch,
+      supervised_users::kForceSafeSearch,
       scoped_ptr<base::Value>(new base::FundamentalValue(false)));
   EXPECT_EQ(1u, fixture.changed_prefs()->size());
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,