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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.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
« net/http/http_cache_unittest.cc ('K') | « net/http/http_cache_unittest.cc ('k') | net/http/http_stream_parser_unittest.cc » ('j') | net/http/http_stream_parser_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..79d7b9a80a9c459ef6af3d8ff7f14ac16901d049 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,9 @@ 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));
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
+ element_readers.push_back(
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3)));
mmenke 2015/11/24 17:25:08 This doesn't seem to be removed. Just remove it?
ChunkedUploadDataStream upload_data_stream(0);
HttpRequestInfo request;
@@ -14927,9 +14933,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 +14987,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 +15030,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 +15074,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 +15115,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 +15338,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 +15383,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 +15429,9 @@ TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesPost100Continue) {
}
TEST_P(HttpNetworkTransactionTest, TotalNetworkBytesChunkedPost) {
- ScopedVector<UploadElementReader> element_readers;
- element_readers.push_back(new UploadBytesElementReader("foo", 3));
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
+ element_readers.push_back(
+ make_scoped_ptr(new UploadBytesElementReader("foo", 3)));
ChunkedUploadDataStream upload_data_stream(0);
HttpRequestInfo request;
« net/http/http_cache_unittest.cc ('K') | « net/http/http_cache_unittest.cc ('k') | net/http/http_stream_parser_unittest.cc » ('j') | net/http/http_stream_parser_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698