content/browser/download/download_manager_impl.cc - Issue 11419034: net: Move ownership of UploadDataStream from URLRequestHttpJob to URLRequest

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/download/download_manager_impl.cc

Issue 11419034: net: Move ownership of UploadDataStream from URLRequestHttpJob to URLRequest (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix ASAN Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/web_request/upload_data_presenter.h ('K') | « cloud_print/service/service_state.cc ('k') | content/browser/renderer_host/resource_dispatcher_host_unittest.cc » ('j') | net/url_request/url_request.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/download/download_manager_impl.cc

diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc

index 3da3f5658984eb20b046e95f25f8a746ba68733f..358eb3e16b049583dc7c80ef754ae2cfa35389ff 100644

--- a/content/browser/download/download_manager_impl.cc

+++ b/content/browser/download/download_manager_impl.cc

@@ -61,9 +61,12 @@ void BeginDownload(scoped_ptr<DownloadUrlParameters> params) {

request.get(), params->referrer().policy);

request->set_load_flags(request->load_flags() | params->load_flags());

request->set_method(params->method());

- if (!params->post_body().empty())

- request->AppendBytesToUpload(params->post_body().data(),

- params->post_body().size());

+ if (!params->post_body().empty()) {

+ scoped_refptr<net::UploadData> upload_data = new net::UploadData();

+ upload_data->AppendBytes(params->post_body().data(),

+ params->post_body().size());

+ request->set_upload(upload_data);

+ }

if (params->post_id() >= 0) {

// The POST in this case does not have an actual body, and only works

// when retrieving data from cache. This is done because we don't want