Added merge session request throttle for XHR requests

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 ae8c5448f63d7ca3b14f1fe54e409f7bcf20dc36..4cf12358f20c108be64d9f5864a91c57ba657381 100644
--- a/google_apis/gaia/fake_gaia.h
+++ b/google_apis/gaia/fake_gaia.h
@@ -73,7 +73,7 @@ class FakeGaia {
   };
 
   FakeGaia();
-  ~FakeGaia();
+  virtual ~FakeGaia();
 
   // Sets the initial value of tokens and cookies.
   void SetMergeSessionParams(const MergeSessionParams& params);
@@ -105,6 +105,11 @@ class FakeGaia {
   static bool GetQueryParameter(const std::string& query,
                                 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;
@@ -130,8 +135,6 @@ class FakeGaia {
                         net::test_server::BasicHttpResponse* http_response);
   void HandleSSO(const net::test_server::HttpRequest& request,
                  net::test_server::BasicHttpResponse* http_response);
-  void HandleMergeSession(const net::test_server::HttpRequest& request,
-                          net::test_server::BasicHttpResponse* http_response);
   void HandleServiceLoginAuth(
       const net::test_server::HttpRequest& request,
       net::test_server::BasicHttpResponse* http_response);