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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 2144933005: Move some SpdyHeaderBlock instances from heap to stack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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.h » ('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 a1f240698bd1eeb4f265c427797bc14b008ec207..83a0afb48f11b577c3bad83e8e91f9ec38124c1b 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -398,10 +398,8 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreams) {
test::StreamDelegateDoNothing delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
- std::unique_ptr<SpdyHeaderBlock> headers2(
- new SpdyHeaderBlock(headers->Clone()));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
+ SpdyHeaderBlock headers2(headers.Clone());
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -463,8 +461,7 @@ TEST_P(SpdySessionTest, GoAwayWithActiveAndCreatedStream) {
SPDY_REQUEST_RESPONSE_STREAM, session_, test_url_, MEDIUM, BoundNetLog());
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -534,10 +531,8 @@ TEST_P(SpdySessionTest, GoAwayTwice) {
test::StreamDelegateDoNothing delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
- std::unique_ptr<SpdyHeaderBlock> headers2(
- new SpdyHeaderBlock(headers->Clone()));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
+ SpdyHeaderBlock headers2(headers.Clone());
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -607,10 +602,8 @@ TEST_P(SpdySessionTest, GoAwayWithActiveStreamsThenClose) {
test::StreamDelegateDoNothing delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
- std::unique_ptr<SpdyHeaderBlock> headers2(
- new SpdyHeaderBlock(headers->Clone()));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
+ SpdyHeaderBlock headers2(headers.Clone());
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -693,8 +686,7 @@ TEST_P(SpdySessionTest, GoAwayWhileDraining) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -736,8 +728,7 @@ TEST_P(SpdySessionTest, CreateStreamAfterGoAway) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -798,8 +789,7 @@ TEST_P(SpdySessionTest, SynStreamAfterGoAway) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -847,8 +837,7 @@ TEST_P(SpdySessionTest, NetworkChangeWithActiveStreams) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -1008,8 +997,7 @@ TEST_P(SpdySessionTest, PingAndWriteLoop) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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.
@@ -1102,10 +1090,8 @@ TEST_P(SpdySessionTest, StreamIdSpaceExhausted) {
EXPECT_EQ(1u, session_->pending_create_stream_queue_size(MEDIUM));
// Activate stream 1. One ID remains available.
- stream1->SendRequestHeaders(
- std::unique_ptr<SpdyHeaderBlock>(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl))),
- NO_MORE_DATA_TO_SEND);
+ stream1->SendRequestHeaders(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl),
+ NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(kLastStreamId - 2u, stream1->stream_id());
@@ -1114,10 +1100,8 @@ TEST_P(SpdySessionTest, StreamIdSpaceExhausted) {
EXPECT_EQ(1u, session_->pending_create_stream_queue_size(MEDIUM));
// Activate stream 2. ID space is exhausted.
- stream2->SendRequestHeaders(
- std::unique_ptr<SpdyHeaderBlock>(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl))),
- NO_MORE_DATA_TO_SEND);
+ stream2->SendRequestHeaders(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl),
+ NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
// Active streams remain active.
@@ -1228,8 +1212,7 @@ TEST_P(SpdySessionTest, MaxConcurrentStreamsZero) {
base::WeakPtr<SpdyStream> stream = request.ReleaseStream();
test::StreamDelegateDoNothing delegate(stream);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -1341,8 +1324,7 @@ TEST_P(SpdySessionTest, DeleteExpiredPushStreams) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
base::RunLoop().RunUntilIdle();
@@ -1759,8 +1741,7 @@ TEST_P(SpdySessionTest, SynCompressionHistograms) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -1834,14 +1815,14 @@ TEST_P(SpdySessionTest, OutOfOrderSynStreams) {
// Queue the lower priority one first.
- std::unique_ptr<SpdyHeaderBlock> headers_lowest(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers_lowest(
+ 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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers_highest(
+ spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream_highest->SendRequestHeaders(std::move(headers_highest),
NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream_highest->HasUrlFromHeaders());
@@ -1897,13 +1878,11 @@ TEST_P(SpdySessionTest, CancelStream) {
test::StreamDelegateDoNothing delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -1960,13 +1939,11 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedSelfClosingStreams) {
test::ClosingDelegate delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2016,13 +1993,11 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoCreatedMutuallyClosingStreams) {
test::ClosingDelegate delegate2(spdy_stream1);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2083,13 +2058,11 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedSelfClosingStreams) {
test::ClosingDelegate delegate2(spdy_stream2);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2159,13 +2132,11 @@ TEST_P(SpdySessionTest, CloseSessionWithTwoActivatedMutuallyClosingStreams) {
test::ClosingDelegate delegate2(spdy_stream1);
spdy_stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(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(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream2->HasUrlFromHeaders());
@@ -2247,8 +2218,7 @@ TEST_P(SpdySessionTest, CloseActivatedStreamThatClosesSession) {
SessionClosingDelegate delegate(spdy_stream, session_);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -2420,8 +2390,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
EXPECT_EQ(1u, session_->num_created_streams());
EXPECT_EQ(2u, session_->pending_create_stream_queue_size(LOWEST));
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2445,8 +2414,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
base::WeakPtr<SpdyStream> stream2 = request2.ReleaseStream();
test::StreamDelegateDoNothing delegate2(stream2);
stream2->SetDelegate(&delegate2);
- std::unique_ptr<SpdyHeaderBlock> headers2(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers2(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
stream2->SendRequestHeaders(std::move(headers2), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -2470,8 +2438,7 @@ TEST_P(SpdySessionTest, CloseTwoStalledCreateStream) {
base::WeakPtr<SpdyStream> stream3 = request3.ReleaseStream();
test::StreamDelegateDoNothing delegate3(stream3);
stream3->SetDelegate(&delegate3);
- std::unique_ptr<SpdyHeaderBlock> headers3(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers3(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
stream3->SendRequestHeaders(std::move(headers3), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(stream3->HasUrlFromHeaders());
@@ -2619,8 +2586,7 @@ TEST_P(SpdySessionTest, ReadDataWithoutYielding) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2683,8 +2649,7 @@ TEST_P(SpdySessionTest, TestYieldingSlowReads) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2754,8 +2719,7 @@ TEST_P(SpdySessionTest, TestYieldingSlowSynchronousReads) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2835,8 +2799,7 @@ TEST_P(SpdySessionTest, TestYieldingDuringReadData) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -2942,8 +2905,7 @@ TEST_P(SpdySessionTest, TestYieldingDuringAsyncReadData) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3011,8 +2973,7 @@ TEST_P(SpdySessionTest, GoAwayWhileInDoReadLoop) {
ASSERT_TRUE(spdy_stream1);
EXPECT_EQ(0u, spdy_stream1->stream_id());
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers1), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -3224,8 +3185,7 @@ TEST_P(SpdySessionTest, CloseSessionOnIdleWhenPoolStalled) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers1(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers1(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());
@@ -3354,8 +3314,7 @@ TEST_P(SpdySessionTest, CreateStreamOnStreamReset) {
StreamCreatingDelegate delegate(spdy_stream, session_);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -3631,8 +3590,7 @@ TEST_P(SpdySessionTest, StreamFlowControlTooMuchData) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
EXPECT_EQ(ERR_IO_PENDING, spdy_stream->SendRequestHeaders(
std::move(headers), NO_MORE_DATA_TO_SEND));
@@ -3769,8 +3727,7 @@ TEST_P(SpdySessionTest, StreamFlowControlTooMuchDataTwoDataFrames) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
EXPECT_EQ(ERR_IO_PENDING, spdy_stream->SendRequestHeaders(
std::move(headers), NO_MORE_DATA_TO_SEND));
@@ -3862,8 +3819,8 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) {
DropReceivedDataDelegate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize)));
+ SpdyHeaderBlock headers(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -3927,8 +3884,8 @@ TEST_P(SpdySessionTest, SessionFlowControlNoSendLeaks) {
test::StreamDelegateSendImmediate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize)));
+ SpdyHeaderBlock headers(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4011,8 +3968,8 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) {
test::StreamDelegateSendImmediate delegate(stream, msg_data);
stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize)));
+ SpdyHeaderBlock headers(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kMsgDataSize));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4111,8 +4068,8 @@ void SpdySessionTest::RunResumeAfterUnstallTest(
EXPECT_FALSE(stream->HasUrlFromHeaders());
EXPECT_FALSE(stream->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING,
stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
@@ -4250,8 +4207,8 @@ TEST_P(SpdySessionTest, ResumeByPriorityAfterSendWindowSizeIncrease) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers1(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4261,8 +4218,8 @@ TEST_P(SpdySessionTest, ResumeByPriorityAfterSendWindowSizeIncrease) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers2(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4399,8 +4356,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers1(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4410,8 +4367,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers2(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4421,8 +4378,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedStreams) {
EXPECT_EQ(3u, stream2->stream_id());
EXPECT_TRUE(stream2->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers3(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers3(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream3->SendRequestHeaders(std::move(headers3),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream3->HasUrlFromHeaders());
@@ -4528,8 +4485,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedSession) {
StallSessionSend();
- std::unique_ptr<SpdyHeaderBlock> headers1(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers1(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream1->SendRequestHeaders(std::move(headers1),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream1->HasUrlFromHeaders());
@@ -4539,8 +4496,8 @@ TEST_P(SpdySessionTest, SendWindowSizeIncreaseWithDeletedSession) {
EXPECT_EQ(1u, stream1->stream_id());
EXPECT_TRUE(stream1->send_stalled_by_flow_control());
- std::unique_ptr<SpdyHeaderBlock> headers2(new SpdyHeaderBlock(
- spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize)));
+ SpdyHeaderBlock headers2(
+ spdy_util_.ConstructPostHeaderBlock(kDefaultUrl, kBodyDataSize));
EXPECT_EQ(ERR_IO_PENDING, stream2->SendRequestHeaders(std::move(headers2),
MORE_DATA_TO_SEND));
EXPECT_TRUE(stream2->HasUrlFromHeaders());
@@ -4609,8 +4566,7 @@ TEST_P(SpdySessionTest, GoAwayOnSessionFlowControlError) {
test::StreamDelegateDoNothing delegate(spdy_stream);
spdy_stream->SetDelegate(&delegate);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
// Write request.
@@ -4675,8 +4631,7 @@ TEST_P(SpdySessionTest, PushedStreamShouldNotCountToClientConcurrencyLimit) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -4755,8 +4710,7 @@ TEST_P(SpdySessionTest, RejectPushedStreamExceedingConcurrencyLimit) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -4862,8 +4816,7 @@ TEST_P(SpdySessionTest, TrustedSpdyProxy) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -4954,8 +4907,7 @@ TEST_P(SpdySessionTest, TrustedSpdyProxyNotSet) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream->HasUrlFromHeaders());
@@ -5022,8 +4974,7 @@ TEST_P(SpdySessionTest, IgnoreReservedRemoteStreamsCount) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5110,8 +5061,7 @@ TEST_P(SpdySessionTest, CancelReservedStreamOnHeadersReceived) {
EXPECT_EQ(0u, session_->num_pushed_streams());
EXPECT_EQ(0u, session_->num_active_pushed_streams());
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5362,8 +5312,7 @@ TEST_P(AltSvcFrameTest, ProcessAltSvcFrameOnActiveStream) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(request_origin)));
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(request_origin));
spdy_stream1->SendRequestHeaders(std::move(headers), NO_MORE_DATA_TO_SEND);
EXPECT_TRUE(spdy_stream1->HasUrlFromHeaders());
@@ -5418,8 +5367,7 @@ TEST_P(AltSvcFrameTest, DoNotProcessAltSvcFrameOnStreamWithInsecureOrigin) {
test::StreamDelegateDoNothing delegate1(spdy_stream1);
spdy_stream1->SetDelegate(&delegate1);
- std::unique_ptr<SpdyHeaderBlock> headers(
- new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(request_origin)));
+ SpdyHeaderBlock headers(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.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698