diff options
| author | ycxiao@chromium.org <ycxiao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:06:26 +0000 |
|---|---|---|
| committer | ycxiao@chromium.org <ycxiao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:06:26 +0000 |
| commit | 03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8 (patch) | |
| tree | 24b6f95ffb2e3c90e53fb52d7e95210221e85c0b /net/url_request/url_request_test_util.h | |
| parent | 3529138ef50534cf1d4ee99e5de32158a2bda83a (diff) | |
| download | chromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.zip chromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.tar.gz chromium_src-03d845f833e7f85ff8cdb4d6bb7c56aab2bc65e8.tar.bz2 | |
Change CanGetCookies signature, add CookieList as parameters in order to remove the getting cookies call inside ResourceDispatcherHost::CanGetCookies.
BUG=68657
TEST=XXXX
Review URL: http://codereview.chromium.org/7461121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_test_util.h')
| -rw-r--r-- | net/url_request/url_request_test_util.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 3bd1292..8b3206ea 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -100,12 +100,6 @@ class TestDelegate : public net::URLRequest::Delegate { void set_cancel_in_received_data_pending(bool val) { cancel_in_rd_pending_ = val; } - void set_cancel_in_get_cookies_blocked(bool val) { - cancel_in_getcookiesblocked_ = val; - } - void set_cancel_in_set_cookie_blocked(bool val) { - cancel_in_setcookieblocked_ = val; - } void set_quit_on_complete(bool val) { quit_on_complete_ = val; } void set_quit_on_redirect(bool val) { quit_on_redirect_ = val; } void set_allow_certificate_errors(bool val) { @@ -137,10 +131,11 @@ class TestDelegate : public net::URLRequest::Delegate { virtual void OnSSLCertificateError(net::URLRequest* request, int cert_error, net::X509Certificate* cert) OVERRIDE; - virtual bool CanGetCookies(net::URLRequest* request) OVERRIDE; - virtual bool CanSetCookie(net::URLRequest* request, + virtual bool CanGetCookies(const net::URLRequest* request, + const net::CookieList& cookie_list) const OVERRIDE; + virtual bool CanSetCookie(const net::URLRequest* request, const std::string& cookie_line, - net::CookieOptions* options) OVERRIDE; + net::CookieOptions* options) const OVERRIDE; virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE; virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) OVERRIDE; @@ -155,8 +150,6 @@ class TestDelegate : public net::URLRequest::Delegate { bool cancel_in_rs_; bool cancel_in_rd_; bool cancel_in_rd_pending_; - bool cancel_in_getcookiesblocked_; - bool cancel_in_setcookieblocked_; bool quit_on_complete_; bool quit_on_redirect_; bool allow_certificate_errors_; @@ -169,9 +162,9 @@ class TestDelegate : public net::URLRequest::Delegate { int response_started_count_; int received_bytes_count_; int received_redirect_count_; - int blocked_get_cookies_count_; - int blocked_set_cookie_count_; - int set_cookie_count_; + mutable int blocked_get_cookies_count_; + mutable int blocked_set_cookie_count_; + mutable int set_cookie_count_; bool received_data_before_response_; bool request_failed_; bool have_certificate_errors_; |