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/fileapi | |
| 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/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_dir_url_request_job.cc | 3 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_url_request_job.cc | 3 | ||||
| -rw-r--r-- | webkit/fileapi/file_writer_delegate_unittest.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc index 75859a5..182f1a9 100644 --- a/webkit/fileapi/file_system_dir_url_request_job.cc +++ b/webkit/fileapi/file_system_dir_url_request_job.cc @@ -20,6 +20,7 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation.h" #include "webkit/fileapi/file_system_url.h" @@ -32,7 +33,7 @@ namespace fileapi { FileSystemDirURLRequestJob::FileSystemDirURLRequestJob( URLRequest* request, FileSystemContext* file_system_context) - : URLRequestJob(request), + : URLRequestJob(request, request->context()->network_delegate()), file_system_context_(file_system_context), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { } diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/fileapi/file_system_url_request_job.cc index 9837100..ea3aaf2 100644 --- a/webkit/fileapi/file_system_url_request_job.cc +++ b/webkit/fileapi/file_system_url_request_job.cc @@ -26,6 +26,7 @@ #include "net/http/http_response_info.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "webkit/blob/file_stream_reader.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation.h" @@ -55,7 +56,7 @@ static net::HttpResponseHeaders* CreateHttpResponseHeaders() { FileSystemURLRequestJob::FileSystemURLRequestJob( URLRequest* request, FileSystemContext* file_system_context) - : URLRequestJob(request), + : URLRequestJob(request, request->context()->network_delegate()), file_system_context_(file_system_context), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), is_directory_(false), diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc index daafbfc..8758d2b 100644 --- a/webkit/fileapi/file_writer_delegate_unittest.cc +++ b/webkit/fileapi/file_writer_delegate_unittest.cc @@ -144,7 +144,7 @@ class FileWriterDelegateTestJob : public net::URLRequestJob { public: FileWriterDelegateTestJob(net::URLRequest* request, const std::string& content) - : net::URLRequestJob(request), + : net::URLRequestJob(request, request->context()->network_delegate()), content_(content), remaining_bytes_(content.length()), cursor_(0) { |