Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / attestation / platform_verification_flow.cc

diff --git a/src/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/src/chrome/browser/chromeos/attestation/platform_verification_flow.cc
index 0adda12..95cbdc8 100644 (file)
--- a/src/chrome/browser/chromeos/attestation/platform_verification_flow.cc
+++ b/src/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -13,18 +13,18 @@
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
 #include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h"
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
-#include "chrome/browser/chromeos/login/user.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/attestation/attestation_flow.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/user_manager/user.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -87,8 +87,9 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
     return url;
   }
 
-  virtual User* GetUser(content::WebContents* web_contents) OVERRIDE {
-    return UserManager::Get()->GetUserByProfile(
+  virtual user_manager::User* GetUser(
+      content::WebContents* web_contents) OVERRIDE {
+    return ProfileHelper::Get()->GetUserByProfile(
         Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   }
 
@@ -254,7 +255,7 @@ void PlatformVerificationFlow::OnConsentResponse(
 
   // At this point all user interaction is complete and we can proceed with the
   // certificate request.
-  chromeos::User* user = delegate_->GetUser(context.web_contents);
+  user_manager::User* user = delegate_->GetUser(context.web_contents);
   if (!user) {
     ReportError(context.callback, INTERNAL_ERROR);
     LOG(ERROR) << "Profile does not map to a valid user.";