Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: mojo/services/network/url_loader_impl.cc

Issue 1476443002: Remove ScopedVector from ElementsUploadDataStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: mojo/services/network/url_loader_impl.cc
diff --git a/mojo/services/network/url_loader_impl.cc b/mojo/services/network/url_loader_impl.cc
index 002f2ee45ab7b34b5818744569edf17ce8ec1d13..1c1b60f00b3d3fe1fbc9bc6c6e5937bb66bb8344 100644
--- a/mojo/services/network/url_loader_impl.cc
+++ b/mojo/services/network/url_loader_impl.cc
@@ -190,13 +190,13 @@ void URLLoaderImpl::Start(URLRequestPtr request,
url_request_->SetExtraRequestHeaders(headers);
}
if (request->body) {
- ScopedVector<net::UploadElementReader> element_readers;
+ std::vector<scoped_ptr<net::UploadElementReader>> element_readers;
mmenke 2015/11/24 17:25:08 include <vector>, scoped_ptr
for (size_t i = 0; i < request->body.size(); ++i) {
- element_readers.push_back(
- new UploadDataPipeElementReader(request->body[i].Pass()));
+ element_readers.push_back(make_scoped_ptr(
+ new UploadDataPipeElementReader(request->body[i].Pass())));
}
url_request_->set_upload(make_scoped_ptr<net::UploadDataStream>(
- new net::ElementsUploadDataStream(element_readers.Pass(), 0)));
+ new net::ElementsUploadDataStream(std::move(element_readers), 0)));
}
if (request->bypass_cache)
url_request_->SetLoadFlags(net::LOAD_BYPASS_CACHE);

Powered by Google App Engine
This is Rietveld 408576698