Reland cros: Test for overlapping ContinueSessionRestore calls

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 <utility>
 #include <vector>
 
 #include "base/base_paths.h"
@@ skipping 280 matching lines @@
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->ListAccountsURLWithSource(std::string()), HandleListAccounts);
 
   // Handles /GetUserInfo GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->get_user_info_url(), HandleGetUserInfo);
 
   // Handles /oauth2/v1/userinfo call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->oauth_user_info_url(), HandleOAuthUserInfo);
+
+  // Handles /GetCheckConnectionInfo GAIA call.
+  REGISTER_RESPONSE_HANDLER(
+      gaia_urls->GetCheckConnectionInfoURLWithSource(std::string()),
+      HandleGetCheckConnectionInfo);
 }
 
 std::unique_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();
   std::unique_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());
   RequestHandlerMap::iterator iter = request_handlers_.find(request_path);
@@ skipping 125 matching lines @@
 
   http_response->AddCustomHeader(
       "Set-Cookie",
       base::StringPrintf(
           "oauth_code=%s; Path=/o/GetOAuth2Token; Secure; HttpOnly;",
           merge_session_params_.auth_code.c_str()));
   http_response->set_code(net::HTTP_OK);
   http_response->set_content_type("text/html");
 }
 
-void FakeGaia::FormatJSONResponse(const base::DictionaryValue& response_dict,
+void FakeGaia::FormatJSONResponse(const base::Value& value,
                                   BasicHttpResponse* http_response) {
   std::string response_json;
-  base::JSONWriter::Write(response_dict, &response_json);
+  base::JSONWriter::Write(value, &response_json);
   http_response->set_content(response_json);
   http_response->set_code(net::HTTP_OK);
 }
 
 const FakeGaia::AccessTokenInfo* FakeGaia::FindAccessTokenInfo(
     const std::string& auth_token,
     const std::string& client_id,
     const std::string& scope_string) const {
   if (auth_token.empty() || client_id.empty())
     return NULL;
@@ skipping 373 matching lines @@
   url = net::AppendQueryParameter(url, "RelayState",
                                   GaiaUrls::GetInstance()
                                       ->gaia_url()
                                       .Resolve(kDummySAMLContinuePath)
                                       .spec());
   std::string redirect_url = url.spec();
   http_response->set_code(net::HTTP_TEMPORARY_REDIRECT);
   http_response->AddCustomHeader("Google-Accounts-SAML", "Start");
   http_response->AddCustomHeader("Location", redirect_url);
 }
+
+void FakeGaia::HandleGetCheckConnectionInfo(
+    const net::test_server::HttpRequest& request,
+    net::test_server::BasicHttpResponse* http_response) {
+  base::ListValue connection_list;
+  FormatJSONResponse(connection_list, http_response);
+}