Remove ScopedVector from ElementsUploadDataStream
Also made related small refactorings in http_cache_unittest and remove some unused variables from http_network_transaction_unittest
[email protected]
BUG=554289
Review URL: https://codereview.chromium.org/1476443002
Cr-Commit-Position: refs/heads/master@{#361841}
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 838f105..6bc1af2 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -8,6 +8,7 @@
#include <vector>
+#include "base/memory/scoped_ptr.h"
#include "base/thread_task_runner_handle.h"
#include "net/base/chunked_upload_data_stream.h"
#include "net/base/elements_upload_data_stream.h"
@@ -518,10 +519,10 @@
Initialize();
- ScopedVector<UploadElementReader> element_readers;
- element_readers.push_back(
- new UploadBytesElementReader(kUploadData, strlen(kUploadData)));
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0);
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
+ element_readers.push_back(make_scoped_ptr(
+ new UploadBytesElementReader(kUploadData, strlen(kUploadData))));
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0);
request_.method = "POST";
request_.url = GURL("http://www.google.com/");
request_.upload_data_stream = &upload_data_stream;
