diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 20:28:28 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 20:28:28 +0000 |
| commit | f288ef0df0a231d3abf9c9afed4b1d17f7b4e12d (patch) | |
| tree | 31e2abbd97fd38151b1026258411e3732764f99a /content/browser/loader/resource_dispatcher_host_impl.cc | |
| parent | fbd5c8ac9e5ee6d101295deceaa089f063c4f535 (diff) | |
| download | chromium_src-f288ef0df0a231d3abf9c9afed4b1d17f7b4e12d.zip chromium_src-f288ef0df0a231d3abf9c9afed4b1d17f7b4e12d.tar.gz chromium_src-f288ef0df0a231d3abf9c9afed4b1d17f7b4e12d.tar.bz2 | |
net: Change argument of URLRequest::set_upload from UploadData to UploadDataStream
Users of URLRequest are now responsible to create UploadDataStream.
UploadOwnedBytesElementReader is moved from upload_data_stream.cc to upload_bytes_element_reader.h.
BUG=156574
TEST=net_unittests and git try
TBR=abodenha@chromium.org for cloud_print/service/service_state.cc
Review URL: https://chromiumcodereview.appspot.com/11439008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_dispatcher_host_impl.cc')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index b0045d4..420b087 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -66,7 +66,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/request_priority.h" #include "net/base/ssl_cert_request_info.h" -#include "net/base/upload_data.h" +#include "net/base/upload_data_stream.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_cache.h" #include "net/http/http_response_headers.h" @@ -953,9 +953,9 @@ void ResourceDispatcherHostImpl::BeginRequest( // Resolve elements from request_body and prepare upload data. if (request_data.request_body) { - request->set_upload( - request_data.request_body->ResolveElementsAndCreateUploadData( - filter_->blob_storage_context()->controller())); + request->set_upload(make_scoped_ptr( + request_data.request_body->ResolveElementsAndCreateUploadDataStream( + filter_->blob_storage_context()->controller()))); } bool allow_download = request_data.allow_download && |