Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/chromeos/login/auth/online_attempt.cc b/src/chrome/browser/chromeos/login/auth/online_attempt.cc
index 6090477..5dfed04 100644 (file)
--- a/src/chrome/browser/chromeos/login/auth/online_attempt.cc
+++ b/src/chrome/browser/chromeos/login/auth/online_attempt.cc
@@ -10,11 +10,11 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/login/auth/auth_attempt_state.h"
-#include "chrome/browser/chromeos/login/auth/auth_attempt_state_resolver.h"
-#include "chrome/browser/chromeos/login/auth/key.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/auth_attempt_state_resolver.h"
+#include "chromeos/login/auth/key.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"
 #include "google_apis/gaia/gaia_auth_consumer.h"
@@ -37,7 +37,7 @@ OnlineAttempt::OnlineAttempt(AuthAttemptState* current_attempt,
       resolver_(callback),
       weak_factory_(this),
       try_again_(true) {
-  DCHECK(attempt_->user_type == User::USER_TYPE_REGULAR);
+  DCHECK(attempt_->user_type == user_manager::USER_TYPE_REGULAR);
 }
 
 OnlineAttempt::~OnlineAttempt() {
@@ -76,7 +76,7 @@ void OnlineAttempt::OnClientLoginSuccess(
     TryClientLogin();
     return;
   }
-  TriggerResolve(LoginFailure::LoginFailureNone());
+  TriggerResolve(AuthFailure::AuthFailureNone());
 }
 
 void OnlineAttempt::OnClientLoginFailure(
@@ -103,20 +103,19 @@ void OnlineAttempt::OnClientLoginFailure(
     // and succeeded.  That we've failed with INVALID_GAIA_CREDENTIALS now
     // indicates that the account is HOSTED.
     LOG(WARNING) << "Rejecting valid HOSTED account.";
-    TriggerResolve(LoginFailure::FromNetworkAuthFailure(
-                       GoogleServiceAuthError(
-                           GoogleServiceAuthError::HOSTED_NOT_ALLOWED)));
+    TriggerResolve(AuthFailure::FromNetworkAuthFailure(
+        GoogleServiceAuthError(GoogleServiceAuthError::HOSTED_NOT_ALLOWED)));
     return;
   }
 
   if (error.state() == GoogleServiceAuthError::TWO_FACTOR) {
     LOG(WARNING) << "Two factor authenticated. Sync will not work.";
-    TriggerResolve(LoginFailure::LoginFailureNone());
+    TriggerResolve(AuthFailure::AuthFailureNone());
 
     return;
   }
   VLOG(2) << "ClientLogin attempt failed with " << error.state();
-  TriggerResolve(LoginFailure::FromNetworkAuthFailure(error));
+  TriggerResolve(AuthFailure::FromNetworkAuthFailure(error));
 }
 
 void OnlineAttempt::TryClientLogin() {
@@ -150,12 +149,11 @@ void OnlineAttempt::CancelClientLogin() {
     LOG(WARNING) << "Canceling ClientLogin attempt.";
     CancelRequest();
 
-    TriggerResolve(LoginFailure(LoginFailure::LOGIN_TIMED_OUT));
+    TriggerResolve(AuthFailure(AuthFailure::LOGIN_TIMED_OUT));
   }
 }
 
-void OnlineAttempt::TriggerResolve(
-    const LoginFailure& outcome) {
+void OnlineAttempt::TriggerResolve(const AuthFailure& outcome) {
   attempt_->RecordOnlineLoginStatus(outcome);
   client_fetcher_.reset(NULL);
   resolver_->Resolve();