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

chrome/browser/supervised_user/chromeos/supervised_user_password_service.h

Index: chrome/browser/supervised_user/chromeos/supervised_user_password_service.h
diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service.h b/chrome/browser/supervised_user/chromeos/supervised_user_password_service.h
similarity index 37%
rename from chrome/browser/managed_mode/chromeos/managed_user_password_service.h
rename to chrome/browser/supervised_user/chromeos/supervised_user_password_service.h
index 165332ca3ef33c37b2da397155b1895e9a81673d..30cedca185c80fc76819cbdb114254cfe91c42e6 100644
--- a/chrome/browser/managed_mode/chromeos/managed_user_password_service.h
+++ b/chrome/browser/supervised_user/chromeos/supervised_user_password_service.h
@@ -2,44 +2,45 @@
 // 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_MANAGED_USER_PASSWORD_SERVICE_H_
-#define CHROME_BROWSER_MANAGED_MODE_CHROMEOS_MANAGED_USER_PASSWORD_SERVICE_H_
+#ifndef CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_SUPERVISED_USER_PASSWORD_SERVICE_H_
+#define CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_SUPERVISED_USER_PASSWORD_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_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_users.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace chromeos {
 
-class ManagedUserPasswordService : public KeyedService {
+class SupervisedUserPasswordService : public KeyedService {
  public:
-  ManagedUserPasswordService();
-  virtual ~ManagedUserPasswordService();
+  SupervisedUserPasswordService();
+  virtual ~SupervisedUserPasswordService();
 
   virtual void Shutdown() OVERRIDE;
 
   void Init(const std::string& user_id,
-            ManagedUserSharedSettingsService* service);
+            SupervisedUserSharedSettingsService* service);
  private:
-  void OnSharedSettingsChange(const std::string& mu_id, const std::string& key);
+  void OnSharedSettingsChange(const std::string& su_id, const std::string& key);
 
   // Cached value from Init().
-  // User id of currently logged in managed user.
+  // User id of currently logged in supervised user.
   std::string user_id_;
-  ManagedUserSharedSettingsService* settings_service_;
+  SupervisedUserSharedSettingsService* settings_service_;
 
-  scoped_ptr<ManagedUserSharedSettingsService::ChangeCallbackList::Subscription>
+  scoped_ptr<SupervisedUserSharedSettingsService::ChangeCallbackList::
+                 Subscription>
       settings_service_subscription_;
 
-  base::WeakPtrFactory<ManagedUserPasswordService> weak_ptr_factory_;
+  base::WeakPtrFactory<SupervisedUserPasswordService> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ManagedUserPasswordService);
+  DISALLOW_COPY_AND_ASSIGN(SupervisedUserPasswordService);
 };
 
 }  // namespace chromeos
-#endif  // CHROME_BROWSER_MANAGED_MODE_CHROMEOS_MANAGED_USER_PASSWORD_SERVICE_H_
+#endif  // CHROME_BROWSER_SUPERVISED_USER_CHROMEOS_SUPERVISED_USER_PASSWORD_SERVICE_H_