Index: net/http/http_network_transaction_unittest.cc |
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc |
index b33d9bad49e5cd01aee267a0402a8f16a9c145dc..616e6f9291810bf84d8eeda455f459e6c3d4c845 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -1181,9 +1181,10 @@ TEST_P(HttpNetworkTransactionTest, ReuseConnection) { |
} |
TEST_P(HttpNetworkTransactionTest, Ignores100) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -6013,9 +6014,10 @@ TEST_P(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) { |
} |
TEST_P(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request[2]; |
// Transaction 1: a GET request that succeeds. The socket is recycled |
@@ -9108,11 +9110,11 @@ TEST_P(HttpNetworkTransactionTest, UploadFileSmallerThanLength) { |
UploadFileElementReader::ScopedOverridingContentLengthForTests |
overriding_content_length(kFakeSize); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back( |
- new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
- temp_file_path, 0, kuint64max, base::Time())); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr(new UploadFileElementReader( |
+ base::ThreadTaskRunnerHandle::Get().get(), temp_file_path, 0, kuint64max, |
+ base::Time()))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -9162,11 +9164,11 @@ TEST_P(HttpNetworkTransactionTest, UploadUnreadableFile) { |
temp_file_content.length())); |
ASSERT_TRUE(base::MakeFileUnreadable(temp_file)); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back( |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr( |
new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(), |
- temp_file, 0, kuint64max, base::Time())); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ temp_file, 0, kuint64max, base::Time()))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -9219,9 +9221,9 @@ TEST_P(HttpNetworkTransactionTest, CancelDuringInitRequestBody) { |
}; |
FakeUploadElementReader* fake_reader = new FakeUploadElementReader; |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(fake_reader); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back(make_scoped_ptr(fake_reader)); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -14674,9 +14676,10 @@ TEST_P(HttpNetworkTransactionTest, CloseSSLSocketOnIdleForHttpRequest2) { |
} |
TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterReset) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -14781,9 +14784,10 @@ TEST_P(HttpNetworkTransactionTest, |
// Delete the transaction to release the socket back into the socket pool. |
trans1.reset(); |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request2; |
request2.method = "POST"; |
@@ -14813,9 +14817,10 @@ TEST_P(HttpNetworkTransactionTest, |
TEST_P(HttpNetworkTransactionTest, |
PostReadsErrorResponseAfterResetPartialBodySent) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -14868,8 +14873,6 @@ TEST_P(HttpNetworkTransactionTest, |
// This tests the more common case than the previous test, where headers and |
// body are not merged into a single request. |
TEST_P(HttpNetworkTransactionTest, ChunkedPostReadsErrorResponseAfterReset) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
ChunkedUploadDataStream upload_data_stream(0); |
HttpRequestInfo request; |
@@ -14927,9 +14930,10 @@ TEST_P(HttpNetworkTransactionTest, ChunkedPostReadsErrorResponseAfterReset) { |
} |
TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterResetAnd100) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -14980,9 +14984,10 @@ TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterResetAnd100) { |
} |
TEST_P(HttpNetworkTransactionTest, PostIgnoresNonErrorResponseAfterReset) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15022,9 +15027,10 @@ TEST_P(HttpNetworkTransactionTest, PostIgnoresNonErrorResponseAfterReset) { |
TEST_P(HttpNetworkTransactionTest, |
PostIgnoresNonErrorResponseAfterResetAnd100) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15065,9 +15071,10 @@ TEST_P(HttpNetworkTransactionTest, |
} |
TEST_P(HttpNetworkTransactionTest, PostIgnoresHttp09ResponseAfterReset) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15105,9 +15112,10 @@ TEST_P(HttpNetworkTransactionTest, PostIgnoresHttp09ResponseAfterReset) { |
} |
TEST_P(HttpNetworkTransactionTest, PostIgnoresPartial400HeadersAfterReset) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15327,9 +15335,10 @@ TEST_P(HttpNetworkTransactionTest, ProxyHeadersNotSentOverWsTunnel) { |
} |
TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesPost) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15371,9 +15380,10 @@ TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesPost) { |
} |
TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesPost100Continue) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0); |
+ std::vector<scoped_ptr<UploadElementReader>> element_readers; |
+ element_readers.push_back( |
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3))); |
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0); |
HttpRequestInfo request; |
request.method = "POST"; |
@@ -15416,8 +15426,6 @@ TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesPost100Continue) { |
} |
TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesChunkedPost) { |
- ScopedVector<UploadElementReader> element_readers; |
- element_readers.push_back(new UploadBytesElementReader("foo", 3)); |
ChunkedUploadDataStream upload_data_stream(0); |
HttpRequestInfo request; |