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

chrome/browser/chromeos/login/auth_attempt_state.h

Index: chrome/browser/chromeos/login/auth_attempt_state.h
diff --git a/chrome/browser/chromeos/login/auth_attempt_state.h b/chrome/browser/chromeos/login/auth_attempt_state.h
index 54670a9f73cfc3a3772ecc8309e8ed4904d90636..0fee139feb33c80c3bf1dd9a824c7be023a0bd67 100644
--- a/chrome/browser/chromeos/login/auth_attempt_state.h
+++ b/chrome/browser/chromeos/login/auth_attempt_state.h
@@ -21,8 +21,7 @@ namespace chromeos {
 class AuthAttemptState {
  public:
   // Used to initialize for a login attempt.
-  AuthAttemptState(const std::string& username,
-                   const std::string& password,
+  AuthAttemptState(const UserCredentials& credentials,
                    const std::string& ascii_hash,
                    const std::string& login_token,
                    const std::string& login_captcha,
@@ -30,8 +29,7 @@ class AuthAttemptState {
                    const bool user_is_new);
 
   // Used to initialize for a externally authenticated login.
-  AuthAttemptState(const std::string& username,
-                   const std::string& password,
+  AuthAttemptState(const UserCredentials& credentials,
                    const std::string& ascii_hash,
                    const bool user_is_new);
 
@@ -70,10 +68,9 @@ class AuthAttemptState {
 
   // Saved so we can retry client login, and also so we know for whom login
   // has succeeded, in the event of successful completion.
-  const std::string username;
+  const UserCredentials credentials;
 
   // These fields are saved so we can retry client login.
-  const std::string password;
   const std::string ascii_hash;
   const std::string login_token;
   const std::string login_captcha;