Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/policy/schema_registry_service_factory.cc b/src/chrome/browser/policy/schema_registry_service_factory.cc
index 9da5afd..a2997ab 100644 (file)
--- a/src/chrome/browser/policy/schema_registry_service_factory.cc
+++ b/src/chrome/browser/policy/schema_registry_service_factory.cc
@@ -14,12 +14,12 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
-#include "chrome/browser/chromeos/login/users/user.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #endif
 
 namespace policy {
@@ -33,13 +33,13 @@ DeviceLocalAccountPolicyBroker* GetBroker(content::BrowserContext* context) {
   if (chromeos::ProfileHelper::IsSigninProfile(profile))
     return NULL;
 
-  if (!chromeos::UserManager::IsInitialized()) {
+  if (!user_manager::UserManager::IsInitialized()) {
     // Bail out in unit tests that don't have a UserManager.
     return NULL;
   }
 
-  chromeos::UserManager* user_manager = chromeos::UserManager::Get();
-  chromeos::User* user = user_manager->GetUserByProfile(profile);
+  user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return NULL;