| 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 374fb7061fc28b23ad28c223dff821963d437d4d..16aa125b59a2be8dea21c2d937c620a4893f0f8e 100644
|
| --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| @@ -150,7 +150,7 @@ class TestShellNetworkDelegate : public net::NetworkDelegate {
|
| return AUTH_REQUIRED_RESPONSE_NO_ACTION;
|
| }
|
| virtual bool CanGetCookies(
|
| - const net::URLRequest* request,
|
| + const net::URLRequest& request,
|
| const net::CookieList& cookie_list) OVERRIDE {
|
| StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| StaticCookiePolicy::ALLOW_ALL_COOKIES :
|
| @@ -158,10 +158,10 @@ 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,
|
| + virtual bool CanSetCookie(const net::URLRequest& request,
|
| const std::string& cookie_line,
|
| net::CookieOptions* options) OVERRIDE {
|
| StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| @@ -170,9 +170,13 @@ class TestShellNetworkDelegate : public net::NetworkDelegate {
|
|
|
| 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 CanAccessFile(const net::URLRequest& request,
|
| + const FilePath& path) const OVERRIDE {
|
| + return true;
|
| + }
|
| };
|
|
|
| TestShellRequestContextParams* g_request_context_params = NULL;
|
|
|