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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_stream_unittest.cc

Issue 2096713002: Reduce SpdyHeaderBlock copies with move semantics. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clear() does not work after all. Created 4 years, 6 months 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
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_stream_unittest.cc
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index faff16e959550459a1af5e02de5a5004d2cb0561..14c889d5ffb08ea5deb7f3abe19c87924c4fed6c 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -199,8 +199,8 @@ TEST_P(SpdyStreamTest, SendDataAfterOpen) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -257,7 +257,8 @@ TEST_P(SpdyStreamTest, Trailers) {
SpdyHeaderBlock late_headers;
late_headers["foo"] = "bar";
std::unique_ptr<SpdySerializedFrame> trailers(
- spdy_util_.ConstructSpdyResponseHeaders(1, late_headers, false));
+ spdy_util_.ConstructSpdyResponseHeaders(1, std::move(late_headers),
+ false));
AddRead(*trailers);
AddReadEOF();
@@ -280,8 +281,8 @@ TEST_P(SpdyStreamTest, Trailers) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -408,8 +409,8 @@ TEST_P(SpdyStreamTest, StreamError) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -486,8 +487,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -544,8 +545,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -599,7 +600,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -654,7 +655,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -693,7 +694,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {
SpdyHeaderBlock late_headers;
late_headers["X-UpperCase"] = "yes";
std::unique_ptr<SpdySerializedFrame> headers_frame(
- spdy_util_.ConstructSpdyReply(2, late_headers));
+ spdy_util_.ConstructSpdyReply(2, std::move(late_headers)));
AddRead(*headers_frame);
AddWritePause();
@@ -724,7 +725,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -769,7 +770,7 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {
SpdyHeaderBlock late_headers;
late_headers[spdy_util_.GetStatusKey()] = "500 Server Error";
std::unique_ptr<SpdySerializedFrame> headers_frame(
- spdy_util_.ConstructSpdyReply(2, late_headers));
+ spdy_util_.ConstructSpdyReply(2, std::move(late_headers)));
AddRead(*headers_frame);
AddReadPause();
@@ -800,7 +801,7 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -860,8 +861,8 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {
StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -953,8 +954,8 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(
EXPECT_FALSE(stream->HasUrlFromHeaders());
EXPECT_FALSE(stream->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -1034,8 +1035,8 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(
EXPECT_FALSE(stream->HasUrlFromHeaders());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -1119,7 +1120,7 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {
EXPECT_FALSE(stream->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698