Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / policy / profile_policy_connector_factory.cc

diff --git a/src/chrome/browser/policy/profile_policy_connector_factory.cc b/src/chrome/browser/policy/profile_policy_connector_factory.cc
index 6f00201..e5ec872 100644 (file)
--- a/src/chrome/browser/policy/profile_policy_connector_factory.cc
+++ b/src/chrome/browser/policy/profile_policy_connector_factory.cc
@@ -14,11 +14,10 @@
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/user.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "components/user_manager/user.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
@@ -95,10 +94,9 @@ ProfilePolicyConnectorFactory::CreateForProfileInternal(
       SchemaRegistryServiceFactory::GetForContext(profile)->registry();
 
 #if defined(OS_CHROMEOS)
-  chromeos::User* user = NULL;
+  user_manager::User* user = NULL;
   if (!chromeos::ProfileHelper::IsSigninProfile(profile)) {
-    chromeos::UserManager* user_manager = chromeos::UserManager::Get();
-    user = user_manager->GetUserByProfile(profile);
+    user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
     CHECK(user);
   }
   user_cloud_policy_manager =