diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 19:13:38 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 19:13:38 +0000 |
| commit | 8f1ad25657141e93759dc7ab71b3630f50cafa88 (patch) | |
| tree | 2aa56b9c798b33d27b18333b0a439a7f01d5c289 /google_apis | |
| parent | 29125cfe3e83e71d7c9bbb920415dee4f470d833 (diff) | |
| download | chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.zip chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.tar.gz chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.tar.bz2 | |
Added merge session request throttle for XHR requests.
BUG=308318,309131,308681
TEST=manual, added MergeSessionTest.MergeSessionThrottle
Review URL: https://codereview.chromium.org/118733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/fake_gaia.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/google_apis/gaia/fake_gaia.h b/google_apis/gaia/fake_gaia.h index ae8c544..4cf1235 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); |