diff options
| author | shalev@chromium.org <shalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 19:07:33 +0000 |
|---|---|---|
| committer | shalev@chromium.org <shalev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 19:07:33 +0000 |
| commit | 180aad7c121d6ad743e639769fc1b6c39b5ad5b5 (patch) | |
| tree | 46fea45392cb5f06f0665d853e29638774c37568 /webkit/appcache | |
| parent | bd3699e4b9341e8084defefae72284aa36ddcedd (diff) | |
| download | chromium_src-180aad7c121d6ad743e639769fc1b6c39b5ad5b5.zip chromium_src-180aad7c121d6ad743e639769fc1b6c39b5ad5b5.tar.gz chromium_src-180aad7c121d6ad743e639769fc1b6c39b5ad5b5.tar.bz2 | |
Decouple URLRequestJob from URLRequestContext; access NetworkDelegate as a contructor parameter.
Note: this depends on
http://codereview.chromium.org/10559036/
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10534100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
| -rw-r--r-- | webkit/appcache/appcache_request_handler_unittest.cc | 5 | ||||
| -rw-r--r-- | webkit/appcache/appcache_url_request_job.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 5e6e928..d537212 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -75,12 +75,13 @@ class AppCacheRequestHandlerTest : public testing::Test { public: MockURLRequestJob(net::URLRequest* request, int response_code) - : net::URLRequestJob(request), + : net::URLRequestJob(request, request->context()->network_delegate()), response_code_(response_code), has_response_info_(false) {} MockURLRequestJob(net::URLRequest* request, const net::HttpResponseInfo& info) - : net::URLRequestJob(request), + : net::URLRequestJob(request, + request->context()->network_delegate()), response_code_(info.headers->response_code()), has_response_info_(true), response_info_(info) {} diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc index 3ca1bdf..2c8efa7 100644 --- a/webkit/appcache/appcache_url_request_job.cc +++ b/webkit/appcache/appcache_url_request_job.cc @@ -18,6 +18,7 @@ #include "net/http/http_response_headers.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_status.h" #include "webkit/appcache/appcache_service.h" @@ -25,7 +26,8 @@ namespace appcache { AppCacheURLRequestJob::AppCacheURLRequestJob( net::URLRequest* request, AppCacheStorage* storage) - : net::URLRequestJob(request), storage_(storage), + : net::URLRequestJob(request, request->context()->network_delegate()), + storage_(storage), has_been_started_(false), has_been_killed_(false), delivery_type_(AWAITING_DELIVERY_ORDERS), group_id_(0), cache_id_(kNoCacheId), is_fallback_(false), |