Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / auth / online_attempt_host.cc

diff --git a/src/chrome/browser/chromeos/login/auth/online_attempt_host.cc b/src/chrome/browser/chromeos/login/auth/online_attempt_host.cc
index 36c4fa2..277e2d8 100644 (file)
--- a/src/chrome/browser/chromeos/login/auth/online_attempt_host.cc
+++ b/src/chrome/browser/chromeos/login/auth/online_attempt_host.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/chromeos/login/auth/online_attempt_host.h"
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/login/auth/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/auth/online_attempt.h"
-#include "chrome/browser/chromeos/login/auth/user_context.h"
-#include "chrome/browser/chromeos/login/users/user.h"
+#include "chromeos/login/auth/auth_attempt_state.h"
+#include "chromeos/login/auth/user_context.h"
+#include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -29,7 +29,7 @@ void OnlineAttemptHost::Check(content::BrowserContext* auth_context,
     current_attempt_user_context_ = user_context;
 
     state_.reset(new AuthAttemptState(user_context,
-                                      User::USER_TYPE_REGULAR,
+                                      user_manager::USER_TYPE_REGULAR,
                                       false,    // unlock
                                       false,    // online_complete
                                       false));  // user_is_new
@@ -47,7 +47,7 @@ void OnlineAttemptHost::Reset() {
 void OnlineAttemptHost::Resolve() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (state_->online_complete()) {
-    bool success = state_->online_outcome().reason() == LoginFailure::NONE;
+    bool success = state_->online_outcome().reason() == AuthFailure::NONE;
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,