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

chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc

Index: chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc
diff --git a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc
similarity index 50%
rename from chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc
rename to chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc
index 6e31f616693e7d8290ecdf1ce90f4ff481982bd1..842f43bd15dc5b57014e93e1b969ae92dc681762 100644
--- a/chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.cc
+++ b/chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc
@@ -2,57 +2,58 @@
 // 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_factory.h"
+#include "chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h"
 
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
-#include "chrome/browser/managed_mode/chromeos/managed_user_password_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/supervised_user/chromeos/supervised_user_password_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 namespace chromeos {
 
 // static
-ManagedUserPasswordService*
-ManagedUserPasswordServiceFactory::GetForProfile(Profile* profile) {
-  return static_cast<ManagedUserPasswordService*>(
+SupervisedUserPasswordService*
+SupervisedUserPasswordServiceFactory::GetForProfile(Profile* profile) {
+  return static_cast<SupervisedUserPasswordService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
-ManagedUserPasswordServiceFactory*
-ManagedUserPasswordServiceFactory::GetInstance() {
-  return Singleton<ManagedUserPasswordServiceFactory>::get();
+SupervisedUserPasswordServiceFactory*
+SupervisedUserPasswordServiceFactory::GetInstance() {
+  return Singleton<SupervisedUserPasswordServiceFactory>::get();
 }
 
-ManagedUserPasswordServiceFactory::ManagedUserPasswordServiceFactory()
+SupervisedUserPasswordServiceFactory::SupervisedUserPasswordServiceFactory()
     : BrowserContextKeyedServiceFactory(
-          "ManagedUserPasswordService",
+          "SupervisedUserPasswordService",
           BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ManagedUserSharedSettingsServiceFactory::GetInstance());
+  DependsOn(SupervisedUserSharedSettingsServiceFactory::GetInstance());
 }
 
-ManagedUserPasswordServiceFactory::
-    ~ManagedUserPasswordServiceFactory() {}
+SupervisedUserPasswordServiceFactory::
+    ~SupervisedUserPasswordServiceFactory() {}
 
-KeyedService* ManagedUserPasswordServiceFactory::BuildServiceInstanceFor(
+KeyedService* SupervisedUserPasswordServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile= static_cast<Profile*>(context);
   User* user = UserManager::Get()->GetUserByProfile(profile);
   if (user->GetType() != User::USER_TYPE_LOCALLY_MANAGED)
     return NULL;
-  ManagedUserPasswordService* result = new ManagedUserPasswordService();
+  SupervisedUserPasswordService* result = new SupervisedUserPasswordService();
   result->Init(
       user->email(),
-      ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile));
+      SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
+          profile));
   return result;
 }
 
 content::BrowserContext*
-ManagedUserPasswordServiceFactory::GetBrowserContextToUse(
+SupervisedUserPasswordServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }