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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_session_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_pool_unittest.cc ('k') | net/spdy/spdy_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index cef49cc7b04a0865ab4f86f909147d609c1df39c..0ea55df594cbd6b3de562af08e1f02176dd23152 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -397,7 +397,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreams) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
@@ -463,7 +463,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveAndCreatedStream) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -536,7 +536,7 @@ TEST_P(SpdySessionTest, GoAwayTwice) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
@@ -610,7 +610,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreamsThenClose) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(*headers));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
@@ -695,7 +695,7 @@ TEST_P(SpdySessionTest, GoAwayWhileDraining) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -740,7 +740,7 @@ TEST_P(SpdySessionTest, CreateStreamAfterGoAway) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -804,7 +804,7 @@ TEST_P(SpdySessionTest, SynStreamAfterGoAway) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -855,7 +855,7 @@ TEST_P(SpdySessionTest, NetworkChangeWithActiveStreams) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -1016,7 +1016,7 @@ TEST_P(SpdySessionTest, PingAndWriteLoop) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
// Shift time so that a ping will be sent out.
@@ -1111,7 +1111,7 @@ TEST_P(SpdySessionTest, StreamIdSpaceExhausted) {
// Activate stream 1. One ID remains available.
stream1->SendRequestHeaders(
std::unique_ptr<SpdyHeaderBlock>(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL)),
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL))),
NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
@@ -1123,7 +1123,7 @@ TEST_P(SpdySessionTest, StreamIdSpaceExhausted) {
// Activate stream 2. ID space is exhausted.
stream2->SendRequestHeaders(
std::unique_ptr<SpdyHeaderBlock>(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL)),
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL))),
NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
@@ -1246,7 +1246,7 @@ TEST_P(SpdySessionTest, MaxConcurrentStreamsZero) {
test::StreamDelegateDoNothing delegate(stream);
stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -1359,7 +1359,7 @@ TEST_P(SpdySessionTest, DeleteExpiredPushStreams) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
@@ -1864,7 +1864,7 @@ TEST_P(SpdySessionTest, SynCompressionHistograms) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -1954,13 +1954,13 @@ TEST_P(SpdySessionTest, OutOfOrderSynStreams) {
// Queue the lower priority one first.
std::unique_ptr<SpdyHeaderBlock> headers_lowest(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream_lowest->SendRequestHeaders(std::move(headers_lowest),
NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream_lowest->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers_highest(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream_highest->SendRequestHeaders(std::move(headers_highest),
NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream_highest->HasUrlFromHeaders());
@@ -2017,12 +2017,12 @@ TEST_P(SpdySessionTest, CancelStream) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2080,12 +2080,12 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedSelfClosingStreams) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2136,12 +2136,12 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedMutuallyClosingStreams) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2203,12 +2203,12 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedSelfClosingStreams) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2279,12 +2279,12 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedMutuallyClosingStreams) {
spdy_stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2367,7 +2367,7 @@ TEST_P(SpdySessionTest, CloseActivatedStreamThatClosesSession) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -2542,7 +2542,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
EXPECT_EQ(2u, session_->pending_create_stream_queue_size(LOWEST));
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2567,7 +2567,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
test::StreamDelegateDoNothing delegate2(stream2);
stream2->SetDelegate(&delegate2);
std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -2592,7 +2592,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
test::StreamDelegateDoNothing delegate3(stream3);
stream3->SetDelegate(&delegate3);
std::unique_ptr<SpdyHeaderBlock> headers3(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
stream3->SendRequestHeaders(std::move(headers3), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream3->HasUrlFromHeaders());
@@ -2741,7 +2741,7 @@ TEST_P(SpdySessionTest, ReadDataWithoutYielding) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2805,7 +2805,7 @@ TEST_P(SpdySessionTest, TestYieldingSlowReads) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2876,7 +2876,7 @@ TEST_P(SpdySessionTest, TestYieldingSlowSynchronousReads) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2957,7 +2957,7 @@ TEST_P(SpdySessionTest, TestYieldingDuringReadData) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3064,7 +3064,7 @@ TEST_P(SpdySessionTest, TestYieldingDuringAsyncReadData) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3133,7 +3133,7 @@ TEST_P(SpdySessionTest, GoAwayWhileInDoReadLoop) {
EXPECT_EQ(0u, spdy_stream1->stream_id());
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3350,7 +3350,7 @@ TEST_P(SpdySessionTest, CloseSessionOnIdleWhenPoolStalled) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
EXPECT_EQ(ERR_IO_PENDING, spdy_stream1->SendRequestHeaders(
std::move(headers1), NO_MORE_DATA_TO_SEND));
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3480,7 +3480,7 @@ TEST_P(SpdySessionTest, CreateStreamOnStreamReset) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -3767,7 +3767,7 @@ TEST_P(SpdySessionTest, StreamFlowControlTooMuchData) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
EXPECT_EQ(ERR_IO_PENDING, spdy_stream->SendRequestHeaders(
std::move(headers), NO_MORE_DATA_TO_SEND));
@@ -3905,7 +3905,7 @@ TEST_P(SpdySessionTest, StreamFlowControlTooMuchDataTwoDataFrames) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
EXPECT_EQ(ERR_IO_PENDING, spdy_stream->SendRequestHeaders(
std::move(headers), NO_MORE_DATA_TO_SEND));
@@ -3997,8 +3997,8 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) {
DropReceivedDataDelegate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4063,8 +4063,8 @@ TEST_P(SpdySessionTest, SessionFlowControlNoSendLeaks) {
test::StreamDelegateSendImmediate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4148,8 +4148,8 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) {
test::StreamDelegateSendImmediate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kMsgDataSize)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4249,8 +4249,8 @@ void SpdySessionTest::RunResumeAfterUnstallTest(
EXPECT_FALSE(stream->HasUrlFromHeaders());
EXPECT_FALSE(stream->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4388,8 +4388,8 @@ TEST_P(SpdySessionTest, ResumeByPriorityAfterSendWindowSizeIncrease) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4399,8 +4399,8 @@ TEST_P(SpdySessionTest, ResumeByPriorityAfterSendWindowSizeIncrease) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4537,8 +4537,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4548,8 +4548,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4559,8 +4559,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
EXPECT_EQ(3u, stream2->stream_id());
EXPECT_TRUE(stream2->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers3(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers3(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream3->SendRequestHeaders(std::move(headers3),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream3->HasUrlFromHeaders());
@@ -4666,8 +4666,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedSession) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4677,8 +4677,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedSession) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(
- spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize));
+ std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultURL, kBodyDataSize)));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4748,7 +4748,7 @@ TEST_P(SpdySessionTest, GoAwayOnSessionFlowControlError) {
spdy_stream->SetDelegate(&delegate);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
// Write request.
@@ -4836,7 +4836,7 @@ TEST_P(SpdySessionTest, PushedStreamShouldNotCountToClientConcurrencyLimit) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -4916,7 +4916,7 @@ TEST_P(SpdySessionTest, RejectPushedStreamExceedingConcurrencyLimit) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5010,7 +5010,7 @@ TEST_P(SpdySessionTest, TrustedSpdyProxy) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -5089,7 +5089,7 @@ TEST_P(SpdySessionTest, TrustedSpdyProxyNotSet) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -5115,9 +5115,8 @@ TEST_P(SpdySessionTest, IgnoreReservedRemoteStreamsCount) {
std::unique_ptr<SpdySerializedFrame> push_a(spdy_util_.ConstructSpdyPush(
nullptr, 0, 2, 1, "http://www.example.org/a.dat"));
- std::unique_ptr<SpdyHeaderBlock> push_headers(new SpdyHeaderBlock);
- spdy_util_.AddUrlToHeaderBlock("http://www.example.org/b.dat",
- push_headers.get());
+ SpdyHeaderBlock push_headers;
+ spdy_util_.AddUrlToHeaderBlock("http://www.example.org/b.dat", &push_headers);
std::unique_ptr<SpdySerializedFrame> push_b(
spdy_util_.ConstructInitialSpdyPushFrame(std::move(push_headers), 4, 1));
std::unique_ptr<SpdySerializedFrame> headers_b(
@@ -5161,7 +5160,7 @@ TEST_P(SpdySessionTest, IgnoreReservedRemoteStreamsCount) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5211,8 +5210,8 @@ TEST_P(SpdySessionTest, CancelReservedStreamOnHeadersReceived) {
return;
const char kPushedUrl[] = "http://www.example.org/a.dat";
- std::unique_ptr<SpdyHeaderBlock> push_headers(new SpdyHeaderBlock);
- spdy_util_.AddUrlToHeaderBlock(kPushedUrl, push_headers.get());
+ SpdyHeaderBlock push_headers;
+ spdy_util_.AddUrlToHeaderBlock(kPushedUrl, &push_headers);
std::unique_ptr<SpdySerializedFrame> push_promise(
spdy_util_.ConstructInitialSpdyPushFrame(std::move(push_headers), 2, 1));
std::unique_ptr<SpdySerializedFrame> headers_frame(
@@ -5253,7 +5252,7 @@ TEST_P(SpdySessionTest, CancelReservedStreamOnHeadersReceived) {
EXPECT_EQ(0u, session_->num_active_pushed_streams());
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(kDefaultURL));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultURL)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5505,7 +5504,7 @@ TEST_P(AltSvcFrameTest, ProcessAltSvcFrameOnActiveStream) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(request_origin));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(request_origin)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5561,7 +5560,7 @@ TEST_P(AltSvcFrameTest, DoNotProcessAltSvcFrameOnStreamWithInsecureOrigin) {
spdy_stream1->SetDelegate(&delegate1);
std::unique_ptr<SpdyHeaderBlock> headers(
- spdy_util_.ConstructGetHeaderBlock(request_origin));
+ new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(request_origin)));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
« no previous file with comments | « net/spdy/spdy_session_pool_unittest.cc ('k') | net/spdy/spdy_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698