Revert of Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
index 4d5c4117f280ca2c802e70819be318c898bb8d4f..c90428d9fdc3e4326c78e1246babc449639299f1 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -100,10 +100,12 @@
 
   // WebUI message handlers.
   void HandleFrameLoadingCompleted(int status);
-  void HandleCompleteAuthentication(const std::string& email,
+  void HandleCompleteAuthentication(const std::string& gaia_id,
+                                    const std::string& email,
                                     const std::string& password,
                                     const std::string& auth_code);
-  void HandleCompleteLogin(const std::string& typed_email,
+  void HandleCompleteLogin(const std::string& gaia_id,
+                           const std::string& typed_email,
                            const std::string& password,
                            bool using_saml);
 
@@ -114,13 +116,15 @@
   void HandleGaiaUIReady();
 
   // This is called when ConsumerManagementService::SetOwner() returns.
-  void OnSetOwnerDone(const std::string& typed_email,
+  void OnSetOwnerDone(const std::string& gaia_id,
+                      const std::string& typed_email,
                       const std::string& password,
                       bool using_saml,
                       bool success);
 
   // Really handles the complete login message.
-  void DoCompleteLogin(const std::string& typed_email,
+  void DoCompleteLogin(const std::string& gaia_id,
+                       const std::string& typed_email,
                        const std::string& password,
                        bool using_saml);