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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 14009470a30677809700d97ad3ee81a45f2d4705..69966fd976795c8a8691d87e9561faa9ace4934d 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -788,6 +788,9 @@ void SigninScreenHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("completeLogin",
       base::Bind(&SigninScreenHandler::HandleCompleteLogin,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("completeAuthentication",
+      base::Bind(&SigninScreenHandler::HandleCompleteAuthentication,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getUsers",
       base::Bind(&SigninScreenHandler::HandleGetUsers,
                  base::Unretained(this)));
@@ -1188,7 +1191,29 @@ void SigninScreenHandler::HandleCompleteLogin(const base::ListValue* args) {
 
   typed_email = gaia::SanitizeEmail(typed_email);
   delegate_->SetDisplayEmail(typed_email);
-  delegate_->CompleteLogin(typed_email, password);
+  delegate_->CompleteLogin(UserCredentials(typed_email,
+                                           password,
+                                           std::string()));  // auth_code
+}
+
+void SigninScreenHandler::HandleCompleteAuthentication(
+    const base::ListValue* args) {
+  if (!delegate_)
+    return;
+
+  std::string email;
+  std::string auth_code;
+  if (!args->GetString(0, &email) ||
+      !args->GetString(1, &auth_code)) {
+    NOTREACHED();
+    return;
+  }
+
+  email = gaia::SanitizeEmail(email);
+  delegate_->SetDisplayEmail(email);
+  delegate_->CompleteLogin(UserCredentials(email,
+                                           std::string(),
+                                           auth_code));
 }
 
 void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
@@ -1204,7 +1229,9 @@ void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
   }
 
   username = gaia::SanitizeEmail(username);
-  delegate_->Login(username, password);
+  delegate_->Login(UserCredentials(username,
+                                   password,
+                                   std::string()));  // auth_code
 }
 
 void SigninScreenHandler::HandleLaunchDemoUser(const base::ListValue* args) {
@@ -1763,7 +1790,9 @@ void SigninScreenHandler::HandleRunLocallyManagedUserCreationFlow(
       new LocallyManagedUserCreationFlow(new_user_name, new_user_password);
   UserManager::Get()->SetUserFlow(custodian_username, flow);
 
-  delegate_->Login(custodian_username, custodian_password);
+  delegate_->Login(UserCredentials(custodian_username,
+                                   custodian_password,
+                                   std::string()));  // auth_code
 }
 
 void SigninScreenHandler::StartClearingDnsCache() {