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

chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
similarity index 87%
rename from chrome/browser/managed_mode/managed_user_shared_settings_service_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
index 20df39e8413d9aba14ef0f4df04f0bbc1ae47fd6..cee796944078096b66e590d596aad41e696d0729 100644
--- a/chrome/browser/managed_mode/managed_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "sync/api/fake_sync_change_processor.h"
@@ -72,14 +72,14 @@ std::string ToJson(const Value* value) {
 
 }  // namespace
 
-class ManagedUserSharedSettingsServiceTest : public ::testing::Test {
+class SupervisedUserSharedSettingsServiceTest : public ::testing::Test {
  protected:
   typedef base::CallbackList<void(const std::string&, const std::string&)>
       CallbackList;
 
-  ManagedUserSharedSettingsServiceTest()
+  SupervisedUserSharedSettingsServiceTest()
       : settings_service_(profile_.GetPrefs()) {}
-  virtual ~ManagedUserSharedSettingsServiceTest() {}
+  virtual ~SupervisedUserSharedSettingsServiceTest() {}
 
   void StartSyncing(const syncer::SyncDataList& initial_sync_data) {
     sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
@@ -116,22 +116,22 @@ class ManagedUserSharedSettingsServiceTest : public ::testing::Test {
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     subscription_ = settings_service_.Subscribe(
-        base::Bind(&ManagedUserSharedSettingsServiceTest::OnSettingChanged,
+        base::Bind(&SupervisedUserSharedSettingsServiceTest::OnSettingChanged,
                    base::Unretained(this)));
   }
 
   virtual void TearDown() OVERRIDE { settings_service_.Shutdown(); }
 
-  void OnSettingChanged(const std::string& mu_id, const std::string& key) {
-    const Value* value = settings_service_.GetValue(mu_id, key);
+  void OnSettingChanged(const std::string& su_id, const std::string& key) {
+    const Value* value = settings_service_.GetValue(su_id, key);
     ASSERT_TRUE(value);
     changed_settings_.push_back(
-        ManagedUserSharedSettingsService::CreateSyncDataForSetting(
-            mu_id, key, *value, true));
+        SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
+            su_id, key, *value, true));
   }
 
   TestingProfile profile_;
-  ManagedUserSharedSettingsService settings_service_;
+  SupervisedUserSharedSettingsService settings_service_;
   SyncDataList changed_settings_;
 
   scoped_ptr<CallbackList::Subscription> subscription_;
@@ -139,7 +139,7 @@ class ManagedUserSharedSettingsServiceTest : public ::testing::Test {
   scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
 };
 
-TEST_F(ManagedUserSharedSettingsServiceTest, Empty) {
+TEST_F(SupervisedUserSharedSettingsServiceTest, Empty) {
   StartSyncing(SyncDataList());
   EXPECT_EQ(0u, sync_processor_->changes().size());
   EXPECT_EQ(0u, changed_settings_.size());
@@ -149,7 +149,7 @@ TEST_F(ManagedUserSharedSettingsServiceTest, Empty) {
   EXPECT_EQ(0u, GetAllSettings()->size());
 }
 
-TEST_F(ManagedUserSharedSettingsServiceTest, SetAndGet) {
+TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) {
   StartSyncing(SyncDataList());
 
   const char kIdA[] = "aaaaaa";
@@ -184,7 +184,7 @@ TEST_F(ManagedUserSharedSettingsServiceTest, SetAndGet) {
   EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
 }
 
-TEST_F(ManagedUserSharedSettingsServiceTest, Merge) {
+TEST_F(SupervisedUserSharedSettingsServiceTest, Merge) {
   // Set initial values, then stop syncing so we can restart.
   StartSyncing(SyncDataList());
 
@@ -204,10 +204,10 @@ TEST_F(ManagedUserSharedSettingsServiceTest, Merge) {
   StringValue blurp("blurp");
   SyncDataList sync_data;
   sync_data.push_back(
-      ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+      SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
           kIdA, "name", name, true));
   sync_data.push_back(
-      ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+      SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
           kIdC, "baz", blurp, true));
 
   StartSyncing(sync_data);
@@ -228,7 +228,7 @@ TEST_F(ManagedUserSharedSettingsServiceTest, Merge) {
   EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
 }
 
-TEST_F(ManagedUserSharedSettingsServiceTest, ProcessChanges) {
+TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) {
   StartSyncing(SyncDataList());
 
   const char kIdA[] = "aaaaaa";
@@ -247,12 +247,12 @@ TEST_F(ManagedUserSharedSettingsServiceTest, ProcessChanges) {
   changes.push_back(
       SyncChange(FROM_HERE,
                  SyncChange::ACTION_UPDATE,
-                 ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+                 SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
                      kIdA, "name", name, true)));
   changes.push_back(
       SyncChange(FROM_HERE,
                  SyncChange::ACTION_ADD,
-                 ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+                 SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
                      kIdC, "baz", blurp, true)));
   SyncError error = settings_service_.ProcessSyncChanges(FROM_HERE, changes);
   EXPECT_FALSE(error.IsSet()) << error.ToString();