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

chrome/browser/supervised_user/chromeos/manager_password_service.h

Index: chrome/browser/supervised_user/chromeos/manager_password_service.h
diff --git a/chrome/browser/managed_mode/chromeos/manager_password_service.h b/chrome/browser/supervised_user/chromeos/manager_password_service.h
similarity index 55%
rename from chrome/browser/managed_mode/chromeos/manager_password_service.h
rename to chrome/browser/supervised_user/chromeos/manager_password_service.h
index 65a790eb24038dae6fdf5f5a140d66ac7146f189..24425a5c13d340ec346cbe4c1c73673dfe605044 100644
--- a/chrome/browser/managed_mode/chromeos/manager_password_service.h
+++ b/chrome/browser/supervised_user/chromeos/manager_password_service.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_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
-#define CHROME_BROWSER_MANAGED_MODE_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
+#define CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
 
 #include <string>
 
@@ -11,22 +11,22 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/auth/extended_authenticator.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
-#include "chrome/browser/managed_mode/managed_users.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_users.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace chromeos {
 
 class UserContext;
 
-// Handles managed user password change that is detected while manager is
+// Handles supervised user password change that is detected while manager is
 // signed in.
-// It uses manager's master key to authorize update of managed user's key.
+// It uses manager's master key to authorize update of supervised user's key.
 // Edge case: Pre-M35 supervised users don't have correct labels for keys.
-// After new managed user key is added, migration is done in following way:
+// After new supervised user key is added, migration is done in following way:
 // 1) Master key is added with correct label
-// 2) Old managed user's key is deleted.
+// 2) Old supervised user's key is deleted.
 // 3) Old master key is deleted.
 class ManagerPasswordService
     : public KeyedService,
@@ -38,34 +38,36 @@ class ManagerPasswordService
   virtual void Shutdown() OVERRIDE;
 
   void Init(const std::string& user_id,
-            ManagedUserSyncService* user_service,
-            ManagedUserSharedSettingsService* service);
+            SupervisedUserSyncService* user_service,
+            SupervisedUserSharedSettingsService* service);
 
   // chromeos::ExtendedAuthenticator::AuthStatusConsumer overrides:
   virtual void OnAuthenticationFailure(ExtendedAuthenticator::AuthState state)
       OVERRIDE;
 
  private:
-  void OnSharedSettingsChange(const std::string& mu_id, const std::string& key);
-  void GetManagedUsersCallback(const std::string& sync_mu_id,
-                               const std::string& user_id,
-                               scoped_ptr<base::DictionaryValue> password_data,
-                               const base::DictionaryValue* managed_users);
+  void OnSharedSettingsChange(const std::string& su_id, const std::string& key);
+  void GetSupervisedUsersCallback(
+      const std::string& sync_su_id,
+      const std::string& user_id,
+      scoped_ptr<base::DictionaryValue> password_data,
+      const base::DictionaryValue* supervised_users);
   void OnAddKeySuccess(const UserContext& master_key_context,
                        const std::string& user_id,
                        scoped_ptr<base::DictionaryValue> password_data);
   void OnKeyTransformedIfNeeded(const UserContext& master_key_context);
   void OnNewManagerKeySuccess(const UserContext& master_key_context);
-  void OnOldManagedUserKeyDeleted(const UserContext& master_key_context);
+  void OnOldSupervisedUserKeyDeleted(const UserContext& master_key_context);
   void OnOldManagerKeyDeleted(const UserContext& master_key_context);
 
   // Cached value from Init().
-  // User id of currently logged in user, that have managed users on device.
+  // User id of currently logged in user, that have supervised users on device.
   std::string user_id_;
-  ManagedUserSyncService* user_service_;
-  ManagedUserSharedSettingsService* settings_service_;
+  SupervisedUserSyncService* user_service_;
+  SupervisedUserSharedSettingsService* settings_service_;
 
-  scoped_ptr<ManagedUserSharedSettingsService::ChangeCallbackList::Subscription>
+  scoped_ptr<SupervisedUserSharedSettingsService::ChangeCallbackList::
+                 Subscription>
       settings_service_subscription_;
 
   scoped_refptr<ExtendedAuthenticator> authenticator_;
@@ -76,4 +78,4 @@ class ManagerPasswordService
 };
 
 }  // namespace chromeos
-#endif  // CHROME_BROWSER_MANAGED_MODE_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_
+#endif  // CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_MANAGER_PASSWORD_SERVICE_H_