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

chrome/browser/supervised_user/supervised_user_shared_settings_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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_MANAGED_USER_SHARED_SETTINGS_SERVICE_H_
-#define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SHARED_SETTINGS_SERVICE_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/memory/scoped_ptr.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"
 #include "sync/api/syncable_service.h"
 
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-// ManagedUserSharedSettingsService syncs settings (as key-value pairs) that can
-// be modified both by a supervised user and their manager.
+// SupervisedUserSharedSettingsService syncs settings (as key-value pairs) that
+// can be modified both by a supervised user and their manager.
 // A supervised user can only modify their own settings, whereas a manager can
 // modify settings for all their supervised users.
 //
 // The shared settings are stored in the user preferences in a multi-level
-// dictionary. The first level is the MU ID, the second level is the key for the
+// dictionary. The first level is the SU ID, the second level is the key for the

[Pam (message me for reviews), 2014/06/16 23:51:51]

If I'm not mistaken, the entity on the server side is still called the Managed
User ID; it would be nice to add a comment mentioning the mismatch if so.

 // setting, and the third level is a dictionary with a "value" key for the value
 // and an "acknowledged" flag, which is used to wait for the Sync server to
 // acknowledge that it has seen a setting change (see
-// ManagedUserSharedSettingsUpdate for how to use this).
-class ManagedUserSharedSettingsService : public KeyedService,
-                                         public syncer::SyncableService {
+// SupervisedUserSharedSettingsUpdate for how to use this).
+class SupervisedUserSharedSettingsService : public KeyedService,
+                                            public syncer::SyncableService {
  public:
   // Called whenever a setting changes (see Subscribe() below).
   typedef base::Callback<void(const std::string& /* mu_id */,
                               const std::string& /* key */)> ChangeCallback;
   typedef base::CallbackList<
       void(const std::string& /* mu_id */, const std::string& /* key */)>
       ChangeCallbackList;
 
   // This constructor is public only for testing. Use
-  // |ManagedUserSyncServiceFactory::GetForProfile(...)| instead to get an
-  // instance of this service in production code.
-  explicit ManagedUserSharedSettingsService(PrefService* prefs);
-  virtual ~ManagedUserSharedSettingsService();
+  // |SupervisedUserSharedSettingsServiceFactory::GetForProfile(...)| instead to
+  // get an instance of this service in production code.
+  explicit SupervisedUserSharedSettingsService(PrefService* prefs);
+  virtual ~SupervisedUserSharedSettingsService();
 
   // Returns the value for the given |key| and the supervised user identified by
   // |mu_id|. If either the supervised user or the key does not exist, NULL is
   // returned. Note that if the profile that owns this service belongs to a
   // supervised user, callers will only see settings for their own |mu_id|, i.e.
   // a non-matching |mu_id| is treated as non-existent.
   const base::Value* GetValue(const std::string& mu_id, const std::string& key);
 
   // Sets the value for the given |key| and the supervised user identified by
   // |mu_id|. If the profile that owns this service belongs to a supervised
@@ skipping 43 matching lines @@
   friend class ManagedUserSharedSettingsUpdate;
 
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
   ChangeCallbackList callbacks_;
 
   PrefService* prefs_;
 };
 
-#endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SHARED_SETTINGS_SERVICE_H_
+#endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_