Support for auth code based authentication flow for both app and web UI driven flow.

chrome/browser/chromeos/login/auth_attempt_state.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 
 #include <string>
 
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
-AuthAttemptState::AuthAttemptState(const std::string& username,
-                                   const std::string& password,
+AuthAttemptState::AuthAttemptState(const UserCredentials& credentials,
                                    const std::string& ascii_hash,
                                    const std::string& login_token,
                                    const std::string& login_captcha,
                                    const User::UserType user_type,
                                    const bool user_is_new)
-    : username(username),
-      password(password),
+    : credentials(credentials),
       ascii_hash(ascii_hash),
       login_token(login_token),
       login_captcha(login_captcha),
       user_type(user_type),
       unlock(false),
       online_complete_(false),
       online_outcome_(LoginFailure::NONE),
       hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
       is_first_time_user_(user_is_new),
       cryptohome_complete_(false),
       cryptohome_outcome_(false),
       cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) {
 }
 
 AuthAttemptState::AuthAttemptState(const std::string& username,
                                    const std::string& ascii_hash)
-    : username(username),
+    : credentials(username, "", ""),
       ascii_hash(ascii_hash),
       user_type(User::USER_TYPE_REGULAR),
       unlock(true),
       online_complete_(true),
       online_outcome_(LoginFailure::UNLOCK_FAILED),
       hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
       is_first_time_user_(false),
       cryptohome_complete_(false),
       cryptohome_outcome_(false),
       cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) {
 }
 
-AuthAttemptState::AuthAttemptState(const std::string& username,
-                                   const std::string& password,
+AuthAttemptState::AuthAttemptState(const UserCredentials& credentials,
                                    const std::string& ascii_hash,
                                    const bool user_is_new)
-    : username(username),
-      password(password),
+    : credentials(credentials),
       ascii_hash(ascii_hash),
       user_type(User::USER_TYPE_REGULAR),
       unlock(true),
       online_complete_(false),
       online_outcome_(LoginFailure::NONE),
       hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
       is_first_time_user_(user_is_new),
       cryptohome_complete_(false),
       cryptohome_outcome_(false),
       cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) {
@@ skipping 61 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return cryptohome_outcome_;
 }
 
 cryptohome::MountError AuthAttemptState::cryptohome_code() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return cryptohome_code_;
 }
 
 }  // namespace chromeos