Switch GAIA e-mail address retrieval from /GetUserInfo to /ListAccounts

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 54 matching lines @@
     std::string refresh_token;
     std::string access_token;
 
     // Uber token response from /OAuthLogin call.
     std::string gaia_uber_token;
 
     // Values of SID and LSID cookie generated from /MergeSession call.
     std::string session_sid_cookie;
     std::string session_lsid_cookie;
 
-    // The e-mail address returned by /GetUserInfo.
+    // The e-mail address returned by /ListAccounts.
     std::string email;
   };
 
   FakeGaia();
   virtual ~FakeGaia();
 
   // Sets the initial value of tokens and cookies.
   void SetMergeSessionParams(const MergeSessionParams& params);
 
   // Initializes HTTP request handlers. Should be called after switches
@@ skipping 55 matching lines @@
       const net::test_server::HttpRequest& request,
       net::test_server::BasicHttpResponse* http_response);
   void HandleSSO(const net::test_server::HttpRequest& request,
                  net::test_server::BasicHttpResponse* http_response);
   void HandleAuthToken(const net::test_server::HttpRequest& request,
                        net::test_server::BasicHttpResponse* http_response);
   void HandleTokenInfo(const net::test_server::HttpRequest& request,
                        net::test_server::BasicHttpResponse* http_response);
   void HandleIssueToken(const net::test_server::HttpRequest& request,
                         net::test_server::BasicHttpResponse* http_response);
-  void HandleGetUserInfo(const net::test_server::HttpRequest& request,
-                         net::test_server::BasicHttpResponse* http_response);
+  void HandleListAccounts(const net::test_server::HttpRequest& request,
+                          net::test_server::BasicHttpResponse* http_response);
 
   // 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_;
   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_