diff options
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); |