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

Unified Diff: net/http/http_stream_parser_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
Index: net/http/http_stream_parser_unittest.cc
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc
index b431549fe83337713fc9f6c743cd97636a2e36d7..f962274a4d6785c84127c89f268020d330aa3040 100644
--- a/net/http/http_stream_parser_unittest.cc
+++ b/net/http/http_stream_parser_unittest.cc
@@ -126,9 +126,9 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_NoBody) {
}
TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_EmptyBody) {
- ScopedVector<UploadElementReader> element_readers;
- scoped_ptr<UploadDataStream> body(
- new ElementsUploadDataStream(element_readers.Pass(), 0));
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
+ scoped_ptr<UploadDataStream> body(make_scoped_ptr(
mmenke 2015/11/24 17:25:08 include scoped_ptr
+ new ElementsUploadDataStream(std::move(element_readers), 0)));
ASSERT_EQ(OK, body->Init(CompletionCallback()));
// Shouldn't be merged if upload data is empty.
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
@@ -153,14 +153,14 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) {
ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir.path(), &temp_file_path));
{
- ScopedVector<UploadElementReader> element_readers;
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
- element_readers.push_back(
+ element_readers.push_back(make_scoped_ptr(
new UploadFileElementReader(base::ThreadTaskRunnerHandle::Get().get(),
- temp_file_path, 0, 0, base::Time()));
+ temp_file_path, 0, 0, base::Time())));
scoped_ptr<UploadDataStream> body(
- new ElementsUploadDataStream(element_readers.Pass(), 0));
+ new ElementsUploadDataStream(std::move(element_readers), 0));
TestCompletionCallback callback;
ASSERT_EQ(ERR_IO_PENDING, body->Init(callback.callback()));
ASSERT_EQ(OK, callback.WaitForResult());
@@ -174,13 +174,13 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) {
}
TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_SmallBodyInMemory) {
- ScopedVector<UploadElementReader> element_readers;
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
const std::string payload = "123";
- element_readers.push_back(new UploadBytesElementReader(
- payload.data(), payload.size()));
+ element_readers.push_back(make_scoped_ptr(
+ new UploadBytesElementReader(payload.data(), payload.size())));
scoped_ptr<UploadDataStream> body(
- new ElementsUploadDataStream(element_readers.Pass(), 0));
+ new ElementsUploadDataStream(std::move(element_readers), 0));
ASSERT_EQ(OK, body->Init(CompletionCallback()));
// Yes, should be merged if the in-memory body is small here.
ASSERT_TRUE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
@@ -188,13 +188,13 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_SmallBodyInMemory) {
}
TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_LargeBodyInMemory) {
- ScopedVector<UploadElementReader> element_readers;
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
const std::string payload(10000, 'a'); // 'a' x 10000.
- element_readers.push_back(new UploadBytesElementReader(
- payload.data(), payload.size()));
+ element_readers.push_back(make_scoped_ptr(
+ new UploadBytesElementReader(payload.data(), payload.size())));
scoped_ptr<UploadDataStream> body(
- new ElementsUploadDataStream(element_readers.Pass(), 0));
+ new ElementsUploadDataStream(std::move(element_readers), 0));
ASSERT_EQ(OK, body->Init(CompletionCallback()));
// Shouldn't be merged if the in-memory body is large here.
ASSERT_FALSE(HttpStreamParser::ShouldMergeRequestHeadersAndBody(
@@ -333,9 +333,10 @@ TEST(HttpStreamParser, SentBytesPost) {
scoped_ptr<ClientSocketHandle> socket_handle =
CreateConnectedSocketHandle(&data);
- ScopedVector<UploadElementReader> element_readers;
- element_readers.push_back(new UploadBytesElementReader("hello world!", 12));
- ElementsUploadDataStream upload_data_stream(element_readers.Pass(), 0);
+ std::vector<scoped_ptr<UploadElementReader>> element_readers;
+ element_readers.push_back(
+ make_scoped_ptr(new UploadBytesElementReader("hello world!", 12)));
+ ElementsUploadDataStream upload_data_stream(std::move(element_readers), 0);
ASSERT_EQ(OK, upload_data_stream.Init(TestCompletionCallback().callback()));
HttpRequestInfo request;

Powered by Google App Engine
This is Rietveld 408576698