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

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 29 matching lines @@
 
 namespace {
 
 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]]]";
+
 typedef std::map<std::string, std::string> CookieMap;
 
 // Parses cookie name-value map our of |request|.
 CookieMap GetRequestCookies(const HttpRequest& request) {
   CookieMap result;
   std::map<std::string, std::string>::const_iterator iter =
            request.headers.find("Cookie");
   if (iter != request.headers.end()) {
     std::vector<std::string> cookie_nv_pairs;
     base::SplitString(iter->second, ' ', &cookie_nv_pairs);
@@ skipping 102 matching lines @@
       gaia_urls->oauth2_token_url(), HandleAuthToken);
 
   // Handles /oauth2/v2/tokeninfo GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->oauth2_token_info_url(), HandleTokenInfo);
 
   // Handles /oauth2/v2/IssueToken GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->oauth2_issue_token_url(), HandleIssueToken);
 
-  // Handles /GetUserInfo GAIA call.
+  // Handles /ListAccounts GAIA call.
   REGISTER_RESPONSE_HANDLER(
-      gaia_urls->get_user_info_url(), HandleGetUserInfo);
+      gaia_urls->list_accounts_url(), HandleListAccounts);
 }
 
 scoped_ptr<HttpResponse> FakeGaia::HandleRequest(const HttpRequest& request) {
   // The scheme and host of the URL is actually not important but required to
   // get a valid GURL in order to parse |request.relative_url|.
   GURL request_url = GURL("http://localhost").Resolve(request.relative_url);
   std::string request_path = request_url.path();
   scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());
   RequestHandlerMap::iterator iter = request_handlers_.find(request_path);
   if (iter != request_handlers_.end()) {
@@ skipping 327 matching lines @@
     response_dict.SetString("issueAdvice", "auto");
     response_dict.SetString("expiresIn",
                             base::IntToString(token_info->expires_in));
     response_dict.SetString("token", token_info->token);
     FormatJSONResponse(response_dict, http_response);
   } else {
     http_response->set_code(net::HTTP_BAD_REQUEST);
   }
 }
 
-void FakeGaia::HandleGetUserInfo(const HttpRequest& request,
+void FakeGaia::HandleListAccounts(const HttpRequest& request,
                                  BasicHttpResponse* http_response) {
-  std::string lsid;
-  if (!GetQueryParameter(request.content, "LSID", &lsid)) {
-    http_response->set_code(net::HTTP_BAD_REQUEST);
-    LOG(ERROR) << "/GetUserInfo missing LSID";
-    return;
-  }
-  if (lsid != merge_session_params_.auth_lsid_cookie) {
-    http_response->set_code(net::HTTP_BAD_REQUEST);
-    LOG(ERROR) << "/GetUserInfo contains unknown LSID";
-    return;
-  }
   http_response->set_content(base::StringPrintf(
-      "email=%s", merge_session_params_.email.c_str()));
+      kListAccountsResponseFormat, merge_session_params_.email.c_str()));
   http_response->set_code(net::HTTP_OK);
 }