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

google_apis/gaia/fake_gaia.h

 // 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.
 
 #ifndef GOOGLE_APIS_GAIA_FAKE_GAIA_H_
 #define GOOGLE_APIS_GAIA_FAKE_GAIA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 68 matching lines @@
   FakeGaia();
   virtual ~FakeGaia();
 
   void SetFakeMergeSessionParams(const std::string& email,
                                  const std::string& auth_sid_cookie,
                                  const std::string& auth_lsid_cookie);
 
   // Sets the initial value of tokens and cookies.
   void SetMergeSessionParams(const MergeSessionParams& params);
 
-  // Sets the specified |gaia_id| as corresponding to the given |email|
-  // address when setting GAIA response headers.  If no mapping is given for
-  // an email address, a default GAIA Id is used.
-  void MapEmailToGaiaId(const std::string& email, const std::string& gaia_id);
-
   // Initializes HTTP request handlers. Should be called after switches
   // for tweaking GaiaUrls are in place.
   void Initialize();
 
   // Handles a request and returns a response if the request was recognized as a
   // GAIA request. Note that this respects the switches::kGaiaUrl and friends so
   // that this can used with EmbeddedTestServer::RegisterRequestHandler().
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
       const net::test_server::HttpRequest& request);
 
@@ skipping 15 matching lines @@
                                 const std::string& key,
                                 std::string* value);
  protected:
   // HTTP handler for /MergeSession.
   virtual void HandleMergeSession(
       const net::test_server::HttpRequest& request,
       net::test_server::BasicHttpResponse* http_response);
 
  private:
   typedef std::multimap<std::string, AccessTokenInfo> AccessTokenInfoMap;
-  typedef std::map<std::string, std::string> EmailToGaiaIdMap;
   typedef std::map<std::string, GURL> SamlAccountIdpMap;
 
-  std::string GetGaiaIdOfEmail(const std::string& email) const;
-
-  void AddGoogleAccountsSigninHeader(
-      net::test_server::BasicHttpResponse* http_response,
-      const std::string& email) const;
-
   // Formats a JSON response with the data in |response_dict|.
   void FormatJSONResponse(const base::DictionaryValue& response_dict,
                           net::test_server::BasicHttpResponse* http_response);
 
   typedef base::Callback<void(
       const net::test_server::HttpRequest& request,
       net::test_server::BasicHttpResponse* http_response)>
           HttpRequestHandlerCallback;
   typedef std::map<std::string, HttpRequestHandlerCallback> RequestHandlerMap;
 
@@ skipping 26 matching lines @@
   // Returns the access token associated with |auth_token| that matches the
   // given |client_id| and |scope_string|. If |scope_string| is empty, the first
   // token satisfying the other criteria is returned. Returns NULL if no token
   // matches.
   const AccessTokenInfo* FindAccessTokenInfo(const std::string& auth_token,
                                              const std::string& client_id,
                                              const std::string& scope_string)
       const;
 
   MergeSessionParams merge_session_params_;
-  EmailToGaiaIdMap email_to_gaia_id_map_;
   AccessTokenInfoMap access_token_info_map_;
   RequestHandlerMap request_handlers_;
   std::string service_login_response_;
   SamlAccountIdpMap saml_account_idp_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGaia);
 };
 
 #endif  // GOOGLE_APIS_GAIA_FAKE_GAIA_H_