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

chrome/browser/chromeos/login/mock_login_status_consumer.h

Index: chrome/browser/chromeos/login/mock_login_status_consumer.h
diff --git a/chrome/browser/chromeos/login/mock_login_status_consumer.h b/chrome/browser/chromeos/login/mock_login_status_consumer.h
index fc09b6750d3767cec1c0c5f8e81a068f5213cfc3..4429a83ff20b78262129df259ee79769c08ba05a 100644
--- a/chrome/browser/chromeos/login/mock_login_status_consumer.h
+++ b/chrome/browser/chromeos/login/mock_login_status_consumer.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_LOGIN_STATUS_CONSUMER_H_
 
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
+#include "chrome/browser/chromeos/login/user.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -17,9 +18,8 @@ class MockConsumer : public LoginStatusConsumer {
 
   MOCK_METHOD1(OnLoginFailure, void(const LoginFailure& error));
   MOCK_METHOD0(OnRetailModeLoginSuccess, void(void));
-  MOCK_METHOD4(OnLoginSuccess, void(
-      const std::string& username,
-      const std::string& password,
+  MOCK_METHOD3(OnLoginSuccess, void(
+      const UserCredentials& credentials,
       bool pending_requests,
       bool using_oauth));
   MOCK_METHOD0(OnOffTheRecordLoginSuccess, void(void));
@@ -37,13 +37,11 @@ class MockConsumer : public LoginStatusConsumer {
 
   // Compatible with LoginStatusConsumer::OnLoginSuccess()
   static void OnSuccessQuit(
-      const std::string& username,
-      const std::string& password,
+      const UserCredentials& credentials,
       bool pending_requests,
       bool using_oauth);
   static void OnSuccessQuitAndFail(
-      const std::string& username,
-      const std::string& password,
+      const UserCredentials& credentials,
       bool pending_requests,
       bool using_oauth);