| Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| index 27f704268e4ac5ccfd8c4cb107d0835f08d5e262..2f128ad57e47d0b461b319885be0408d80c710ef 100644
|
| --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| @@ -149,8 +149,8 @@ class TestShellNetworkDelegate : public net::NetworkDelegate {
|
| net::AuthCredentials* credentials) OVERRIDE {
|
| return AUTH_REQUIRED_RESPONSE_NO_ACTION;
|
| }
|
| - virtual bool CanGetCookies(
|
| - const net::URLRequest* request,
|
| + virtual bool CanGetCookiesInternal(
|
| + const net::URLRequest& request,
|
| const net::CookieList& cookie_list) OVERRIDE {
|
| StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| StaticCookiePolicy::ALLOW_ALL_COOKIES :
|
| @@ -158,21 +158,25 @@ class TestShellNetworkDelegate : public net::NetworkDelegate {
|
|
|
| StaticCookiePolicy policy(policy_type);
|
| int rv = policy.CanGetCookies(
|
| - request->url(), request->first_party_for_cookies());
|
| + request.url(), request.first_party_for_cookies());
|
| return rv == net::OK;
|
| }
|
| - virtual bool CanSetCookie(const net::URLRequest* request,
|
| - const std::string& cookie_line,
|
| - net::CookieOptions* options) OVERRIDE {
|
| + virtual bool CanSetCookieInternal(const net::URLRequest& request,
|
| + const std::string& cookie_line,
|
| + net::CookieOptions* options) OVERRIDE {
|
| StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| StaticCookiePolicy::ALLOW_ALL_COOKIES :
|
| StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES;
|
|
|
| StaticCookiePolicy policy(policy_type);
|
| int rv = policy.CanSetCookie(
|
| - request->url(), request->first_party_for_cookies());
|
| + request.url(), request.first_party_for_cookies());
|
| return rv == net::OK;
|
| }
|
| + virtual bool CanAccessFileInternal(const net::URLRequest& request,
|
| + const FilePath& path) const OVERRIDE {
|
| + return true;
|
| + }
|
| };
|
|
|
| TestShellRequestContextParams* g_request_context_params = NULL;
|
|
|