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

chrome/browser/supervised_user/supervised_user_pref_mapping_service.h

Index: chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
diff --git a/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h b/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
similarity index 58%
rename from chrome/browser/managed_mode/supervised_user_pref_mapping_service.h
rename to chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
index 1f0f96cba89e126b38ae202665f8bfb74f342d47..bcabd9252d36c986bf9f3dbee7c17c893af1fc6a 100644
--- a/chrome/browser/managed_mode/supervised_user_pref_mapping_service.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MANAGED_MODE_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_
-#define CHROME_BROWSER_MANAGED_MODE_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
-#include "chrome/browser/managed_mode/managed_users.h"
+#include "chrome/browser/supervised_user/supervised_users.h"
 #include "components/keyed_service/core/keyed_service.h"
 
-class ManagedUserSharedSettingsService;
 class PrefService;
+class SupervisedUserSharedSettingsService;
 
-// SupervisedUserPrefMappingService maps shared managed user settings to user
-// preferences. When a shared managed user setting is updated via sync, the
+// SupervisedUserPrefMappingService maps shared supervised user settings to user
+// preferences. When a shared supervised user setting is updated via sync, the
 // corresponding local user preference is set to this new value.
 class SupervisedUserPrefMappingService : public KeyedService {
  public:
@@ -26,7 +26,7 @@ class SupervisedUserPrefMappingService : public KeyedService {
 
   SupervisedUserPrefMappingService(
       PrefService* prefs,
-      ManagedUserSharedSettingsService* shared_settings);
+      SupervisedUserSharedSettingsService* shared_settings);
   virtual ~SupervisedUserPrefMappingService();
 
   // KeyedService implementation:
@@ -34,26 +34,26 @@ class SupervisedUserPrefMappingService : public KeyedService {
 
   void Init();
 
-  // Updates the managed user shared setting when the avatar has changed.
+  // Updates the supervised user shared setting when the avatar has changed.
   void OnAvatarChanged();
 
-  // Called when a managed user shared setting was changed by receiving new sync
-  // data. Updates the corresponding user pref.
-  void OnSharedSettingChanged(const std::string& mu_id, const std::string& key);
+  // Called when a supervised user shared setting was changed by receiving new
+  // sync data. Updates the corresponding user pref.
+  void OnSharedSettingChanged(const std::string& su_id, const std::string& key);
 
  private:
-  // Returns the current chrome avatar index that is stored as a managed user
+  // Returns the current chrome avatar index that is stored as a supervised user
   // shared setting, or -1 if no avatar index is stored.
   int GetChromeAvatarIndex();
 
   PrefService* prefs_;
-  ManagedUserSharedSettingsService* shared_settings_;
+  SupervisedUserSharedSettingsService* shared_settings_;
   scoped_ptr<CallbackList::Subscription> subscription_;
-  std::string managed_user_id_;
+  std::string supervised_user_id_;
   PrefChangeRegistrar pref_change_registrar_;
   base::WeakPtrFactory<SupervisedUserPrefMappingService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserPrefMappingService);
 };
 
-#endif  // CHROME_BROWSER_MANAGED_MODE_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_
+#endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_MAPPING_SERVICE_H_