Reland cros: Test for overlapping ContinueSessionRestore calls

google_apis/gaia/fake_gaia.h

Index: google_apis/gaia/fake_gaia.h
diff --git a/google_apis/gaia/fake_gaia.h b/google_apis/gaia/fake_gaia.h
index 23f247e74e7f868664c4f6877ed99509add8d06a..b2f01839119d0c8cd733a8163b329f00bad0c53b 100644
--- a/google_apis/gaia/fake_gaia.h
+++ b/google_apis/gaia/fake_gaia.h
@@ -15,7 +15,7 @@
 #include "url/gurl.h"
 
 namespace base {
-class DictionaryValue;
+class Value;
 }
 
 namespace net {
@@ -171,8 +171,8 @@ class FakeGaia {
   void SetOAuthCodeCookie(
       net::test_server::BasicHttpResponse* http_response) const;
 
-  // Formats a JSON response with the data in |response_dict|.
-  void FormatJSONResponse(const base::DictionaryValue& response_dict,
+  // Formats a JSON response with the data in |value|.
+  void FormatJSONResponse(const base::Value& value,
                           net::test_server::BasicHttpResponse* http_response);
 
   typedef base::Callback<void(
@@ -222,6 +222,9 @@ class FakeGaia {
                            net::test_server::BasicHttpResponse* http_response);
   void HandleSAMLRedirect(const net::test_server::HttpRequest& request,
                           net::test_server::BasicHttpResponse* http_response);
+  void HandleGetCheckConnectionInfo(
+      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