Index: net/spdy/spdy_network_transaction_unittest.cc |
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc |
index 2cc8bdb7aef2f027df8bc007d37f71b15fc88c9c..07f0962f78b983cb63dda367c9836fadb2ba8d0e 100644 |
--- a/net/spdy/spdy_network_transaction_unittest.cc |
+++ b/net/spdy/spdy_network_transaction_unittest.cc |
@@ -9,7 +9,7 @@ |
#include "base/bind_helpers.h" |
#include "base/files/file_util.h" |
#include "base/files/scoped_temp_dir.h" |
-#include "base/memory/scoped_vector.h" |
+#include "base/memory/scoped_ptr.h" |
#include "base/run_loop.h" |
#include "base/stl_util.h" |
#include "base/strings/string_piece.h" |
@@ -460,11 +460,11 @@ class SpdyNetworkTransactionTest |
const HttpRequestInfo& CreatePostRequest() { |
if (!post_request_initialized_) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back( |
- new UploadBytesElementReader(kUploadData, kUploadDataSize)); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr( |
+ new UploadBytesElementReader(kUploadData, kUploadDataSize))); |
upload_data_stream_.reset( |
- new ElementsUploadDataStream(element_readers.Pass(), 0)); |
+ new ElementsUploadDataStream(std::move(element_readers), 0)); |
post_request_.method = "POST"; |
post_request_.url = GURL(GetDefaultUrl()); |
@@ -481,12 +481,12 @@ class SpdyNetworkTransactionTest |
CHECK_EQ(static_cast<int>(kUploadDataSize), |
base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadFileElementReader( |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, |
- kUploadDataSize, base::Time())); |
+ kUploadDataSize, base::Time()))); |
upload_data_stream_.reset( |
- new ElementsUploadDataStream(element_readers.Pass(), 0)); |
+ new ElementsUploadDataStream(std::move(element_readers), 0)); |
post_request_.method = "POST"; |
post_request_.url = GURL(GetDefaultUrl()); |
@@ -506,12 +506,12 @@ class SpdyNetworkTransactionTest |
base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
CHECK(base::MakeFileUnreadable(file_path)); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadFileElementReader( |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
base::ThreadTaskRunnerHandle::Get().get(), file_path, 0, |
- kUploadDataSize, base::Time())); |
+ kUploadDataSize, base::Time()))); |
upload_data_stream_.reset( |
- new ElementsUploadDataStream(element_readers.Pass(), 0)); |
+ new ElementsUploadDataStream(std::move(element_readers), 0)); |
post_request_.method = "POST"; |
post_request_.url = GURL(GetDefaultUrl()); |
@@ -531,17 +531,17 @@ class SpdyNetworkTransactionTest |
CHECK_EQ(static_cast<int>(kUploadDataSize), |
base::WriteFile(file_path, kUploadData, kUploadDataSize)); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back( |
- new UploadBytesElementReader(kUploadData, kFileRangeOffset)); |
- element_readers.push_back(new UploadFileElementReader( |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr( |
+ new UploadBytesElementReader(kUploadData, kFileRangeOffset))); |
+ element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
base::ThreadTaskRunnerHandle::Get().get(), file_path, |
- kFileRangeOffset, kFileRangeLength, base::Time())); |
- element_readers.push_back(new UploadBytesElementReader( |
+ kFileRangeOffset, kFileRangeLength, base::Time()))); |
+ element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
kUploadData + kFileRangeOffset + kFileRangeLength, |
- kUploadDataSize - (kFileRangeOffset + kFileRangeLength))); |
+ kUploadDataSize - (kFileRangeOffset + kFileRangeLength)))); |
upload_data_stream_.reset( |
- new ElementsUploadDataStream(element_readers.Pass(), 0)); |
+ new ElementsUploadDataStream(std::move(element_readers), 0)); |
post_request_.method = "POST"; |
post_request_.url = GURL(GetDefaultUrl()); |
@@ -1948,8 +1948,8 @@ TEST_P(SpdyNetworkTransactionTest, NullPost) { |
TEST_P(SpdyNetworkTransactionTest, EmptyPost) { |
BufferedSpdyFramer framer(spdy_util_.spdy_version(), false); |
// Create an empty UploadDataStream. |
- ScopedVector<UploadElementReader> element_readers; |
- ElementsUploadDataStream stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ ElementsUploadDataStream stream(std::move(element_readers), 0); |
// Setup the request |
HttpRequestInfo request; |
@@ -5845,12 +5845,12 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateReceived) { |
DeterministicSocketData data(reads, arraysize(reads), |
writes, arraysize(writes)); |
- ScopedVector<UploadElementReader> element_readers; |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
for (int i = 0; i < kFrameCount; ++i) { |
- element_readers.push_back( |
- new UploadBytesElementReader(content->c_str(), content->size())); |
+ element_readers.push_back(make_scoped_ptr( |
+ new UploadBytesElementReader(content->c_str(), content->size()))); |
} |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
// Setup the request |
HttpRequestInfo request; |
@@ -6059,12 +6059,12 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateOverflow) { |
DeterministicSocketData data(reads, arraysize(reads), |
writes, arraysize(writes)); |
- ScopedVector<UploadElementReader> element_readers; |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
for (int i = 0; i < kFrameCount; ++i) { |
- element_readers.push_back( |
- new UploadBytesElementReader(content->c_str(), content->size())); |
+ element_readers.push_back(make_scoped_ptr( |
+ new UploadBytesElementReader(content->c_str(), content->size()))); |
} |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
// Setup the request |
HttpRequestInfo request; |
@@ -6167,12 +6167,12 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlStallResume) { |
SequencedSocketData data(reads, arraysize(reads), writes.get(), num_writes); |
- ScopedVector<UploadElementReader> element_readers; |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
std::string upload_data_string(initial_window_size, 'a'); |
upload_data_string.append(kUploadData, kUploadDataSize); |
- element_readers.push_back(new UploadBytesElementReader( |
- upload_data_string.c_str(), upload_data_string.size())); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
+ upload_data_string.c_str(), upload_data_string.size()))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -6282,12 +6282,12 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlStallResumeAfterSettings) { |
DeterministicSocketData data(vector_as_array(&reads), reads.size(), |
vector_as_array(&writes), writes.size()); |
- ScopedVector<UploadElementReader> element_readers; |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
std::string upload_data_string(initial_window_size, 'a'); |
upload_data_string.append(kUploadData, kUploadDataSize); |
- element_readers.push_back(new UploadBytesElementReader( |
- upload_data_string.c_str(), upload_data_string.size())); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
+ upload_data_string.c_str(), upload_data_string.size()))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -6403,12 +6403,12 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlNegativeSendWindowSize) { |
DeterministicSocketData data(vector_as_array(&reads), reads.size(), |
vector_as_array(&writes), writes.size()); |
- ScopedVector<UploadElementReader> element_readers; |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
std::string upload_data_string(initial_window_size, 'a'); |
upload_data_string.append(kUploadData, kUploadDataSize); |
- element_readers.push_back(new UploadBytesElementReader( |
- upload_data_string.c_str(), upload_data_string.size())); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader( |
+ upload_data_string.c_str(), upload_data_string.size()))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |