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

google_apis/gaia/fake_gaia.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gaia/fake_gaia.h"
 
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 33 matching lines @@
 const char kTestAuthCode[] = "fake-auth-code";
 const char kTestGaiaUberToken[] = "fake-uber-token";
 const char kTestAuthLoginAccessToken[] = "fake-access-token";
 const char kTestRefreshToken[] = "fake-refresh-token";
 const char kTestSessionSIDCookie[] = "fake-session-SID-cookie";
 const char kTestSessionLSIDCookie[] = "fake-session-LSID-cookie";
 const char kTestOAuthLoginSID[] = "fake-oauth-SID-cookie";
 const char kTestOAuthLoginLSID[] = "fake-oauth-LSID-cookie";
 const char kTestOAuthLoginAuthCode[] = "fake-oauth-auth-code";
 
-const char kDefaultGaiaId[]  ="12345";
-
 const base::FilePath::CharType kServiceLogin[] =
     FILE_PATH_LITERAL("google_apis/test/service_login.html");
 
 // OAuth2 Authentication header value prefix.
 const char kAuthHeaderBearer[] = "Bearer ";
 const char kAuthHeaderOAuth[] = "OAuth ";
 
 const char kListAccountsResponseFormat[] =
     "[\"gaia.l.a.r\",[[\"gaia.l.a\",1,\"\",\"%s\",\"\",1,1,0]]]";
 
@@ skipping 92 matching lines @@
   params.session_lsid_cookie = kTestSessionLSIDCookie;
   params.email = email;
   SetMergeSessionParams(params);
 }
 
 void FakeGaia::SetMergeSessionParams(
     const MergeSessionParams& params) {
   merge_session_params_ = params;
 }
 
-void FakeGaia::MapEmailToGaiaId(const std::string& email,
-                                const std::string& gaia_id) {
-  DCHECK(!email.empty());
-  DCHECK(!gaia_id.empty());
-  email_to_gaia_id_map_[email] = gaia_id;
-}
-
-std::string FakeGaia::GetGaiaIdOfEmail(const std::string& email) const {
-  DCHECK(!email.empty());
-  auto it = email_to_gaia_id_map_.find(email);
-  return it == email_to_gaia_id_map_.end() ? std::string(kDefaultGaiaId) :
-      it->second;
-}
-
-void FakeGaia::AddGoogleAccountsSigninHeader(
-    net::test_server::BasicHttpResponse* http_response,
-    const std::string& email) const {
-  DCHECK(!email.empty());
-  http_response->AddCustomHeader("google-accounts-signin",
-      base::StringPrintf(
-          "email=\"%s\", obfuscatedid=\"%s\", sessionindex=0",
-          email.c_str(), GetGaiaIdOfEmail(email).c_str()));
-}
-
 void FakeGaia::Initialize() {
   GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
   // Handles /MergeSession GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->merge_session_url(), HandleMergeSession);
 
   // Handles /o/oauth2/programmatic_auth GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->client_login_to_oauth2_url(), HandleProgramaticAuth);
 
@@ skipping 232 matching lines @@
 
 void FakeGaia::HandleServiceLoginAuth(const HttpRequest& request,
                                       BasicHttpResponse* http_response) {
   std::string continue_url =
       GaiaUrls::GetInstance()->service_login_url().spec();
   GetQueryParameter(request.content, "continue", &continue_url);
 
   std::string redirect_url = continue_url;
 
   std::string email;
-  const bool is_saml =
-      GetQueryParameter(request.content, "Email", &email) &&
-      saml_account_idp_map_.find(email) != saml_account_idp_map_.end();
-
-  if (is_saml) {
+  if (GetQueryParameter(request.content, "Email", &email) &&
+      saml_account_idp_map_.find(email) != saml_account_idp_map_.end()) {
     GURL url(saml_account_idp_map_[email]);
     url = net::AppendQueryParameter(url, "SAMLRequest", "fake_request");
     url = net::AppendQueryParameter(url, "RelayState", continue_url);
     redirect_url = url.spec();
     http_response->AddCustomHeader("Google-Accounts-SAML", "Start");
   } else if (!merge_session_params_.auth_sid_cookie.empty() &&
              !merge_session_params_.auth_lsid_cookie.empty()) {
     SetCookies(http_response,
                merge_session_params_.auth_sid_cookie,
                merge_session_params_.auth_lsid_cookie);
   }
 
   http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
   http_response->AddCustomHeader("Location", redirect_url);
-
-  // SAML sign-ins complete in HandleSSO().
-  if (is_saml)
-    return;
-
-  AddGoogleAccountsSigninHeader(http_response, email);
+  http_response->AddCustomHeader("google-accounts-signin",
+      base::StringPrintf("email=\"%s\", sessionindex=0", email.c_str()));
 }
 
 void FakeGaia::HandleSSO(const HttpRequest& request,
                          BasicHttpResponse* http_response) {
   if (!merge_session_params_.auth_sid_cookie.empty() &&
       !merge_session_params_.auth_lsid_cookie.empty()) {
     SetCookies(http_response,
                merge_session_params_.auth_sid_cookie,
                merge_session_params_.auth_lsid_cookie);
   }
   std::string relay_state;
   GetQueryParameter(request.content, "RelayState", &relay_state);
   std::string redirect_url = relay_state;
   http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
   http_response->AddCustomHeader("Location", redirect_url);
   http_response->AddCustomHeader("Google-Accounts-SAML", "End");
-
-  if (!merge_session_params_.email.empty())
-    AddGoogleAccountsSigninHeader(http_response, merge_session_params_.email);
 }
 
 void FakeGaia::HandleAuthToken(const HttpRequest& request,
                                BasicHttpResponse* http_response) {
   std::string scope;
   GetQueryParameter(request.content, "scope", &scope);
 
   std::string grant_type;
   if (!GetQueryParameter(request.content, "grant_type", &grant_type)) {
     http_response->set_code(net::HTTP_BAD_REQUEST);
@@ skipping 111 matching lines @@
 }
 
 void FakeGaia::HandleGetUserInfo(const HttpRequest& request,
                                  BasicHttpResponse* http_response) {
   http_response->set_content(base::StringPrintf(
       "email=%s\ndisplayEmail=%s",
       merge_session_params_.email.c_str(),
       merge_session_params_.email.c_str()));
   http_response->set_code(net::HTTP_OK);
 }
-