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

chrome/browser/supervised_user/supervised_user_registration_utility.h

Index: chrome/browser/supervised_user/supervised_user_registration_utility.h
diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.h b/chrome/browser/supervised_user/supervised_user_registration_utility.h
similarity index 36%
rename from chrome/browser/managed_mode/managed_user_registration_utility.h
rename to chrome/browser/supervised_user/supervised_user_registration_utility.h
index 98c9f54f7597e060863352881b36bc3f3ad44d3f..b4bb88ae09550031b8b763298e4f3a078a497f33 100644
--- a/chrome/browser/managed_mode/managed_user_registration_utility.h
+++ b/chrome/browser/supervised_user/supervised_user_registration_utility.h
@@ -2,8 +2,8 @@
 // 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_REGISTRATION_UTILITY_H_
-#define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_REGISTRATION_UTILITY_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_H_
+#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_H_
 
 #include <map>
 #include <string>
@@ -15,26 +15,26 @@
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service_observer.h"
-#include "chrome/browser/managed_mode/managed_users.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service_observer.h"
+#include "chrome/browser/supervised_user/supervised_users.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class GoogleServiceAuthError;
-class ManagedUserRefreshTokenFetcher;
-class ManagedUserRegistrationUtilityTest;
-class ManagedUserSharedSettingsService;
 class PrefService;
 class Profile;
+class SupervisedUserRefreshTokenFetcher;
+class SupervisedUserRegistrationUtilityTest;
+class SupervisedUserSharedSettingsService;
 
 namespace browser_sync {
 class DeviceInfo;
 }
 
 // Structure to store registration information.
-struct ManagedUserRegistrationInfo {
-  ManagedUserRegistrationInfo(const base::string16& name, int avatar_index);
-  ~ManagedUserRegistrationInfo();
+struct SupervisedUserRegistrationInfo {
+  SupervisedUserRegistrationInfo(const base::string16& name, int avatar_index);
+  ~SupervisedUserRegistrationInfo();
   int avatar_index;
   base::string16 name;
   std::string master_key;
@@ -43,69 +43,68 @@ struct ManagedUserRegistrationInfo {
   base::DictionaryValue password_data;
 };
 
-// Holds the state necessary for registering a new managed user with the
+// Holds the state necessary for registering a new supervised user with the
 // management server and associating it with its custodian. Each instance
-// of this class handles registering a single managed user and should not
+// of this class handles registering a single supervised user and should not
 // be used afterwards.
-class ManagedUserRegistrationUtility {
+class SupervisedUserRegistrationUtility {
  public:
   // Callback for Register() below. If registration is successful, |token| will
-  // contain an OAuth2 refresh token for the newly registered managed user,
+  // contain an OAuth2 refresh token for the newly registered supervised user,
   // otherwise |token| will be empty and |error| will contain the authentication
   // error for the custodian.
   typedef base::Callback<void(const GoogleServiceAuthError& /* error */,
                               const std::string& /* token */)>
       RegistrationCallback;
 
-  virtual ~ManagedUserRegistrationUtility() {}
+  virtual ~SupervisedUserRegistrationUtility() {}
 
-  // Creates ManagedUserRegistrationUtility for a given |profile|.
-  static scoped_ptr<ManagedUserRegistrationUtility> Create(Profile* profile);
+  // Creates SupervisedUserRegistrationUtility for a given |profile|.
+  static scoped_ptr<SupervisedUserRegistrationUtility> Create(Profile* profile);
 
-  static std::string GenerateNewManagedUserId();
+  static std::string GenerateNewSupervisedUserId();
 
-  // Registers a new managed user with the server. |managed_user_id| is a new
-  // unique ID for the new managed user. If its value is the same as that of
-  // of one of the existing managed users, then the same user will be created
-  // on this machine (and if he has no avatar in sync, his avatar will
-  // be updated). |info| contains necessary information like
-  // the display name of the user and his avatar. |callback| is called
-  // with the result of the registration. We use the info here and not the
-  // profile, because on Chrome OS the profile of the managed user does not
-  // yet exist.
-  virtual void Register(const std::string& managed_user_id,
-                        const ManagedUserRegistrationInfo& info,
+  // Registers a new supervised user with the server. |supervised_user_id| is a
+  // new unique ID for the new supervised user. If its value is the same as that
+  // of one of the existing supervised users, then the same user will be created
+  // on this machine (and if he has no avatar in sync, his avatar will be
+  // updated). |info| contains necessary information like the display name of
+  // the user and his avatar. |callback| is called with the result of the
+  // registration. We use the info here and not the profile, because on Chrome
+  // OS the profile of the supervised user does not yet exist.
+  virtual void Register(const std::string& supervised_user_id,
+                        const SupervisedUserRegistrationInfo& info,
                         const RegistrationCallback& callback) = 0;
 
  protected:
-  ManagedUserRegistrationUtility() {}
+  SupervisedUserRegistrationUtility() {}
 
  private:
-  friend class ScopedTestingManagedUserRegistrationUtility;
-  friend class ManagedUserRegistrationUtilityTest;
+  friend class ScopedTestingSupervisedUserRegistrationUtility;
+  friend class SupervisedUserRegistrationUtilityTest;
 
   // Creates implementation with explicit dependencies, can be used for testing.
-  static ManagedUserRegistrationUtility* CreateImpl(
+  static SupervisedUserRegistrationUtility* CreateImpl(
       PrefService* prefs,
-      scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher,
-      ManagedUserSyncService* service,
-      ManagedUserSharedSettingsService* shared_settings_service);
+      scoped_ptr<SupervisedUserRefreshTokenFetcher> token_fetcher,
+      SupervisedUserSyncService* service,
+      SupervisedUserSharedSettingsService* shared_settings_service);
 
-  // Set the instance of ManagedUserRegistrationUtility that will be returned
+  // Set the instance of SupervisedUserRegistrationUtility that will be returned
   // by next Create() call. Takes ownership of the |utility|.
-  static void SetUtilityForTests(ManagedUserRegistrationUtility* utility);
+  static void SetUtilityForTests(SupervisedUserRegistrationUtility* utility);
 };
 
-// Class that sets the instance of ManagedUserRegistrationUtility that will be
-// returned by next Create() call, and correctly destroys it if Create() was
+// Class that sets the instance of SupervisedUserRegistrationUtility that will
+// be returned by next Create() call, and correctly destroys it if Create() was
 // not called.
-class ScopedTestingManagedUserRegistrationUtility {
+class ScopedTestingSupervisedUserRegistrationUtility {
  public:
-  // Delegates ownership of the |instance| to ManagedUserRegistrationUtility.
-  ScopedTestingManagedUserRegistrationUtility(
-      ManagedUserRegistrationUtility* instance);
+  // Delegates ownership of the |instance| to SupervisedUserRegistrationUtility.
+  ScopedTestingSupervisedUserRegistrationUtility(
+      SupervisedUserRegistrationUtility* instance);
 
-  ~ScopedTestingManagedUserRegistrationUtility();
+  ~ScopedTestingSupervisedUserRegistrationUtility();
 };
 
-#endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_REGISTRATION_UTILITY_H_
+#endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_H_