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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_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/quic/quic_http_stream_test.cc ('K') | « net/quic/quic_http_stream_test.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8b79a9bc362f33a24eadc9cd865bc7e4a8411cce 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -9,7 +9,6 @@
#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/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/string_piece.h"
@@ -460,11 +459,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;
mmenke 2015/11/24 17:25:08 include scoped_ptr
+ 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 +480,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 +505,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 +530,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 +1947,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 +5844,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 +6058,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 +6166,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 +6281,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 +6402,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";
« net/quic/quic_http_stream_test.cc ('K') | « net/quic/quic_http_stream_test.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698