cloud_print/service/service_state.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: cloud_print/service/service_state.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') | « chrome/browser/sessions/better_session_restore_browsertest.cc ('k') | content/browser/download/download_manager_impl.cc » ('j') | net/url_request/url_request.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cloud_print/service/service_state.cc

diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc

index 29298d2ce4778b9114b444603d0594d9f088b15a..73b3966cad1e979c93f75e3ee0ed8c14dd27482a 100644

--- a/cloud_print/service/service_state.cc

+++ b/cloud_print/service/service_state.cc

@@ -13,6 +13,7 @@

#include "net/base/escape.h"

#include "net/base/io_buffer.h"

#include "net/base/load_flags.h"

+#include "net/base/upload_data.h"

#include "net/url_request/url_request.h"

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_builder.h"

@@ -178,7 +179,9 @@ std::string ServiceState::LoginToGoogle(const std::string& service,

load_flags = load_flags | net::LOAD_DO_NOT_SAVE_COOKIES;

request.set_load_flags(load_flags);

- request.AppendBytesToUpload(post_body.c_str(), post_body.size());

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

+ upload_data->AppendBytes(post_body.c_str(), post_body.size());

+ request.set_upload(upload_data);

request.SetExtraRequestHeaderByName(

"Content-Type", "application/x-www-form-urlencoded", true);

request.set_method("POST");