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

google_apis/gaia/fake_gaia.cc

Index: google_apis/gaia/fake_gaia.cc
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc
index 7ba1c585f4d1cde1a527f9b502e20ac121478341..aba65a3af8234707b27c7baa6cd17b1400e16999 100644
--- a/google_apis/gaia/fake_gaia.cc
+++ b/google_apis/gaia/fake_gaia.cc
@@ -142,6 +142,7 @@ FakeGaia::FakeGaia() {
 FakeGaia::~FakeGaia() {}
 
 void FakeGaia::SetFakeMergeSessionParams(
+    const std::string& gaia_id,
     const std::string& email,
     const std::string& auth_sid_cookie,
     const std::string& auth_lsid_cookie) {
@@ -155,6 +156,7 @@ void FakeGaia::SetFakeMergeSessionParams(
   params.session_sid_cookie = kTestSessionSIDCookie;
   params.session_lsid_cookie = kTestSessionLSIDCookie;
   params.email = email;
+  params.gaia_id = gaia_id;
   SetMergeSessionParams(params);
 }
 
@@ -432,7 +434,9 @@ void FakeGaia::HandleServiceLoginAuth(const HttpRequest& request,
   http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
   http_response->AddCustomHeader("Location", redirect_url);
   http_response->AddCustomHeader("google-accounts-signin",

[bartfab (slow), 2014/10/17 09:54:56]

This line is actually wrong - and was wrong before your CL already:

* For regular GAIA users, all is well. Login succeeds the moment you submit the
login form and it is correct to return the user's e-mail address and GAIA ID
here.

* For SAML users, we redirect to the SAML IdP. The user is not authenticated
yet. We should not be returning an e-mail address or GAIA ID yet. We should do
it in HandleSSO() instead, based on the user who actually authenticated via SAML
(we use the e-mail address in |merge_session_params_| as the SAML user's e-mail
address for now).

[Roger Tawa OOO till Jul 10th, 2014/10/20 16:04:01]

Done.

-      base::StringPrintf("email=\"%s\", sessionindex=0", email.c_str()));
+      base::StringPrintf(
+          "email=\"%s\", obfuscatedid=\"%s\", sessionindex=0",
+          email.c_str(), merge_session_params_.gaia_id.c_str()));

[bartfab (slow), 2014/10/17 09:54:56]

We have tests that set up multiple accounts and verify that an attempt to log in
as Alice really logs you in as Alice, not as Bob. Right now, the tests do this
by verifying that the logged-in user's e-mail address is correct, because the
e-mail address is the primary account identifier.

You are making these changes to pave the way for the GAIA ID to become the
primary account identifier. This means that tests using multiple accounts will
need to be able to tell these accounts apart by looking at their GAIA IDs.
Returning the same GAIA ID for all login attempts will not work at that point.
We can fix it later, or we can fix it now: The GAIA ID should depend on the
user's e-mail address. It should not be a fixed value read from
|merge_session_params_|.

[Roger Tawa OOO till Jul 10th, 2014/10/20 16:04:01]

Not sure you can do that, or that it's needed.  Today the user enters and email
into gaia, and then reenters that email into saml page.  At the end we check
that the emails match.  You can't do that with gaia-ids; the user won't enter
them, and we can't get it until after sign in.  We only get one id and there is
nothing to check against.

I think the email checking logic is good even after the gaia-id migration.  No
need to change anything.

In any case, fixed this to make all tests work.

 }
 
 void FakeGaia::HandleSSO(const HttpRequest& request,