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

chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc

Index: chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc
diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service.cc b/chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc
similarity index 68%
rename from chrome/browser/managed_mode/chromeos/managed_user_password_service.cc
rename to chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc
index 321074ad9bfa018e5e0863d1b83883601079fdb5..ecc22e416cb4d4f1a02b15cd29786affc39c89ff 100644
--- a/chrome/browser/managed_mode/chromeos/managed_user_password_service.cc
+++ b/chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc
@@ -2,30 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/managed_mode/chromeos/managed_user_password_service.h"
+#include "chrome/browser/supervised_user/chromeos/supervised_user_password_service.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
-#include "chrome/browser/managed_mode/managed_user_constants.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 
 namespace chromeos {
 
-ManagedUserPasswordService::ManagedUserPasswordService()
+SupervisedUserPasswordService::SupervisedUserPasswordService()
     : weak_ptr_factory_(this) {}
 
-ManagedUserPasswordService::~ManagedUserPasswordService() {}
+SupervisedUserPasswordService::~SupervisedUserPasswordService() {}
 
-void ManagedUserPasswordService::Init(
+void SupervisedUserPasswordService::Init(
     const std::string& user_id,
-    ManagedUserSharedSettingsService* shared_settings_service) {
+    SupervisedUserSharedSettingsService* shared_settings_service) {
   user_id_ = user_id;
   settings_service_ = shared_settings_service;
   settings_service_subscription_ = settings_service_->Subscribe(
-      base::Bind(&ManagedUserPasswordService::OnSharedSettingsChange,
+      base::Bind(&SupervisedUserPasswordService::OnSharedSettingsChange,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Force value check in case we have missed some notification.
@@ -34,17 +34,17 @@ void ManagedUserPasswordService::Init(
       chromeos::UserManager::Get()->GetSupervisedUserManager();
 
   OnSharedSettingsChange(supervised_user_manager->GetUserSyncId(user_id),
-                         managed_users::kChromeOSPasswordData);
+                         supervised_users::kChromeOSPasswordData);
 }
 
-void ManagedUserPasswordService::OnSharedSettingsChange(
-    const std::string& mu_id,
+void SupervisedUserPasswordService::OnSharedSettingsChange(
+    const std::string& su_id,
     const std::string& key) {
-  if (key != managed_users::kChromeOSPasswordData)
+  if (key != supervised_users::kChromeOSPasswordData)
     return;
   chromeos::SupervisedUserManager* supervised_user_manager =
       chromeos::UserManager::Get()->GetSupervisedUserManager();
-  const chromeos::User* user = supervised_user_manager->FindBySyncId(mu_id);
+  const chromeos::User* user = supervised_user_manager->FindBySyncId(su_id);
   if (user == NULL) {
     LOG(WARNING) << "Got notification for user not on device.";
     return;
@@ -52,7 +52,7 @@ void ManagedUserPasswordService::OnSharedSettingsChange(
   DCHECK(user_id_ == user->email());
   if (user_id_ != user->email())
     return;
-  const base::Value* value = settings_service_->GetValue(mu_id, key);
+  const base::Value* value = settings_service_->GetValue(su_id, key);
   if (value == NULL) {
     LOG(WARNING) << "Got empty value from sync.";
     return;
@@ -69,7 +69,7 @@ void ManagedUserPasswordService::OnSharedSettingsChange(
   auth->ScheduleSupervisedPasswordChange(user_id_, dict);
 }
 
-void ManagedUserPasswordService::Shutdown() {
+void SupervisedUserPasswordService::Shutdown() {
     settings_service_subscription_.reset();
 }