net/url_request/url_request_http_job.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: net/url_request/url_request_http_job.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: Remove a local variable 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

Index: net/url_request/url_request_http_job.cc

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

index 48acdcc8a385b5c824188e73fecdd05c4aa03c27..4a89ea3efa06e36cd46f34619c78cfb185884ca9 100644

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -28,7 +28,6 @@

#include "net/base/sdch_manager.h"

#include "net/base/ssl_cert_request_info.h"

#include "net/base/ssl_config_service.h"

-#include "net/base/upload_data_stream.h"

#include "net/cookies/cookie_monster.h"

#include "net/http/http_network_session.h"

#include "net/http/http_request_headers.h"

@@ -894,10 +893,9 @@ void URLRequestHttpJob::RestartTransactionWithAuth(

AddCookieHeaderAndStart();

}

-void URLRequestHttpJob::SetUpload(UploadData* upload) {

+void URLRequestHttpJob::SetUpload(UploadDataStream* upload) {

DCHECK(!transaction_.get()) << "cannot change once started";

- upload_data_stream_.reset(new UploadDataStream(upload));

- request_info_.upload_data_stream = upload_data_stream_.get();

+ request_info_.upload_data_stream = upload;

}

void URLRequestHttpJob::SetExtraRequestHeaders(

« no previous file with comments | « net/url_request/url_request_http_job.h ('k') | net/url_request/url_request_job.h » ('j') | no next file with comments »