Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / chromeos / manager_password_service_factory.cc

diff --git a/src/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc b/src/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
index 0778b82..3debf86 100644 (file)
--- a/src/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
+++ b/src/chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc
@@ -4,15 +4,16 @@
 
 #include "chrome/browser/supervised_user/chromeos/manager_password_service_factory.h"
 
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.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/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/chromeos/manager_password_service.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/user_manager/user.h"
 
 namespace chromeos {
 
@@ -43,10 +44,9 @@ ManagerPasswordServiceFactory::
 KeyedService* ManagerPasswordServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile= static_cast<Profile*>(context);
-  chromeos::User* user = chromeos::UserManager::Get()->
-      GetUserByProfile(profile);
-  if (chromeos::UserManager::Get()->GetSupervisedUserManager()->
-      HasSupervisedUsers(user->email())) {
+  user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
+  if (ChromeUserManager::Get()->GetSupervisedUserManager()->HasSupervisedUsers(
+          user->email())) {
     ManagerPasswordService* result = new ManagerPasswordService();
     result->Init(
         user->email(),