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

chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
similarity index 87%
rename from chrome/browser/managed_mode/managed_user_settings_service_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
index 70dbc2b38b6ab168207a394b32464ee04742b2e3..fc82144754987b06bdb169715e78f40322367983 100644
--- a/chrome/browser/managed_mode/managed_user_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/json/json_reader.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/managed_mode/managed_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
@@ -54,10 +54,10 @@ const char kSettingsName[] = "TestingSetting";
 const char kSettingsValue[] = "SettingsValue";
 const char kSplitItemName[] = "X-SuperMoosePowers";
 
-class ManagedUserSettingsServiceTest : public ::testing::Test {
+class SupervisedUserSettingsServiceTest : public ::testing::Test {
  protected:
-  ManagedUserSettingsServiceTest() {}
-  virtual ~ManagedUserSettingsServiceTest() {}
+  SupervisedUserSettingsServiceTest() {}
+  virtual ~SupervisedUserSettingsServiceTest() {}
 
   scoped_ptr<syncer::SyncChangeProcessor> CreateSyncProcessor() {
     sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
@@ -79,8 +79,8 @@ class ManagedUserSettingsServiceTest : public ::testing::Test {
   void UploadSplitItem(const std::string& key, const std::string& value) {
     split_items_.SetStringWithoutPathExpansion(key, value);
     settings_service_.UploadItem(
-        ManagedUserSettingsService::MakeSplitSettingKey(kSplitItemName,
-                                                            key),
+        SupervisedUserSettingsService::MakeSplitSettingKey(kSplitItemName,
+                                                           key),
         scoped_ptr<base::Value>(new base::StringValue(value)));
   }
 
@@ -92,22 +92,22 @@ class ManagedUserSettingsServiceTest : public ::testing::Test {
   }
 
   void VerifySyncDataItem(syncer::SyncData sync_data) {
-    const sync_pb::ManagedUserSettingSpecifics& managed_user_setting =
+    const sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
         sync_data.GetSpecifics().managed_user_setting();
     base::Value* expected_value = NULL;
-    if (managed_user_setting.name() == kAtomicItemName) {
+    if (supervised_user_setting.name() == kAtomicItemName) {
       expected_value = atomic_setting_value_.get();
     } else {
-      EXPECT_TRUE(StartsWithASCII(managed_user_setting.name(),
+      EXPECT_TRUE(StartsWithASCII(supervised_user_setting.name(),
                                   std::string(kSplitItemName) + ':',
                                   true));
       std::string key =
-          managed_user_setting.name().substr(strlen(kSplitItemName) + 1);
+          supervised_user_setting.name().substr(strlen(kSplitItemName) + 1);
       EXPECT_TRUE(split_items_.GetWithoutPathExpansion(key, &expected_value));
     }
 
     scoped_ptr<base::Value> value(
-        base::JSONReader::Read(managed_user_setting.value()));
+        base::JSONReader::Read(supervised_user_setting.value()));
     EXPECT_TRUE(expected_value->Equals(value.get()));
   }
 
@@ -123,7 +123,7 @@ class ManagedUserSettingsServiceTest : public ::testing::Test {
     TestingPrefStore* pref_store = new TestingPrefStore;
     settings_service_.Init(pref_store);
     settings_service_.Subscribe(
-        base::Bind(&ManagedUserSettingsServiceTest::OnNewSettingsAvailable,
+        base::Bind(&SupervisedUserSettingsServiceTest::OnNewSettingsAvailable,
                    base::Unretained(this)));
     pref_store->SetInitializationCompleted();
     ASSERT_FALSE(settings_);
@@ -137,13 +137,13 @@ class ManagedUserSettingsServiceTest : public ::testing::Test {
 
   base::DictionaryValue split_items_;
   scoped_ptr<base::Value> atomic_setting_value_;
-  ManagedUserSettingsService settings_service_;
+  SupervisedUserSettingsService settings_service_;
   scoped_ptr<base::DictionaryValue> settings_;
 
   scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
 };
 
-TEST_F(ManagedUserSettingsServiceTest, ProcessAtomicSetting) {
+TEST_F(SupervisedUserSettingsServiceTest, ProcessAtomicSetting) {
   StartSyncing(syncer::SyncDataList());
   ASSERT_TRUE(settings_);
   const base::Value* value = NULL;
@@ -151,7 +151,7 @@ TEST_F(ManagedUserSettingsServiceTest, ProcessAtomicSetting) {
 
   settings_.reset();
   syncer::SyncData data =
-      ManagedUserSettingsService::CreateSyncDataForSetting(
+      SupervisedUserSettingsService::CreateSyncDataForSetting(
           kSettingsName, base::StringValue(kSettingsValue));
   syncer::SyncChangeList change_list;
   change_list.push_back(
@@ -166,7 +166,7 @@ TEST_F(ManagedUserSettingsServiceTest, ProcessAtomicSetting) {
   EXPECT_EQ(kSettingsValue, string_value);
 }
 
-TEST_F(ManagedUserSettingsServiceTest, ProcessSplitSetting) {
+TEST_F(SupervisedUserSettingsServiceTest, ProcessSplitSetting) {
   StartSyncing(syncer::SyncDataList());
   ASSERT_TRUE(settings_);
   const base::Value* value = NULL;
@@ -181,9 +181,9 @@ TEST_F(ManagedUserSettingsServiceTest, ProcessSplitSetting) {
   syncer::SyncChangeList change_list;
   for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
     syncer::SyncData data =
-        ManagedUserSettingsService::CreateSyncDataForSetting(
-            ManagedUserSettingsService::MakeSplitSettingKey(kSettingsName,
-                                                                it.key()),
+        SupervisedUserSettingsService::CreateSyncDataForSetting(
+            SupervisedUserSettingsService::MakeSplitSettingKey(kSettingsName,
+                                                               it.key()),
             it.value());
     change_list.push_back(
         syncer::SyncChange(FROM_HERE, syncer::SyncChange::ACTION_ADD, data));
@@ -198,7 +198,7 @@ TEST_F(ManagedUserSettingsServiceTest, ProcessSplitSetting) {
   EXPECT_TRUE(dict_value->Equals(&dict));
 }
 
-TEST_F(ManagedUserSettingsServiceTest, SetLocalSetting) {
+TEST_F(SupervisedUserSettingsServiceTest, SetLocalSetting) {
   const base::Value* value = NULL;
   EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
 
@@ -213,7 +213,7 @@ TEST_F(ManagedUserSettingsServiceTest, SetLocalSetting) {
   EXPECT_EQ(kSettingsValue, string_value);
 }
 
-TEST_F(ManagedUserSettingsServiceTest, UploadItem) {
+TEST_F(SupervisedUserSettingsServiceTest, UploadItem) {
   UploadSplitItem("foo", "bar");
   UploadSplitItem("blurp", "baz");
   UploadAtomicItem("hurdle");