| Index: net/spdy/spdy_stream_unittest.cc
|
| diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
|
| index 307ff5e6e791add8664bf8d4785575970aaaee76..e0f49456f2bdccb935d37761eaeca097029c10e1 100644
|
| --- a/net/spdy/spdy_stream_unittest.cc
|
| +++ b/net/spdy/spdy_stream_unittest.cc
|
| @@ -191,8 +191,8 @@ TEST_P(SpdyStreamTest, SendDataAfterOpen) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -273,8 +273,8 @@ TEST_P(SpdyStreamTest, Trailers) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -400,8 +400,8 @@ TEST_P(SpdyStreamTest, StreamError) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -478,8 +478,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenRequestResponse) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -536,8 +536,8 @@ TEST_P(SpdyStreamTest, SendLargeDataAfterOpenBidirectional) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -590,8 +590,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeaders) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(
|
| - new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
|
| + SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
|
| EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
|
| NO_MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -645,8 +644,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersOnPush) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(
|
| - new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
|
| + SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
|
| EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
|
| NO_MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -715,8 +713,7 @@ TEST_P(SpdyStreamTest, UpperCaseHeadersInHeadersFrame) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(
|
| - new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
|
| + SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
|
| EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
|
| NO_MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -791,8 +788,7 @@ TEST_P(SpdyStreamTest, DuplicateHeaders) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(
|
| - new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
|
| + SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
|
| EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
|
| NO_MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -852,8 +848,8 @@ TEST_P(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {
|
| StreamDelegateSendImmediate delegate(stream, kPostBodyStringPiece);
|
| stream->SetDelegate(&delegate);
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -945,8 +941,8 @@ void SpdyStreamTest::RunResumeAfterUnstallRequestResponseTest(
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
| EXPECT_FALSE(stream->send_stalled_by_flow_control());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -1026,8 +1022,8 @@ void SpdyStreamTest::RunResumeAfterUnstallBidirectionalTest(
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock(
|
| - spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength)));
|
| + SpdyHeaderBlock headers(
|
| + spdy_util_.ConstructPostHeaderBlock(kStreamUrl, kPostBodyLength));
|
| EXPECT_EQ(ERR_IO_PENDING,
|
| stream->SendRequestHeaders(std::move(headers), MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
| @@ -1110,8 +1106,7 @@ TEST_P(SpdyStreamTest, ReceivedBytes) {
|
|
|
| EXPECT_FALSE(stream->HasUrlFromHeaders());
|
|
|
| - std::unique_ptr<SpdyHeaderBlock> headers(
|
| - new SpdyHeaderBlock(spdy_util_.ConstructGetHeaderBlock(kStreamUrl)));
|
| + SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kStreamUrl));
|
| EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
|
| NO_MORE_DATA_TO_SEND));
|
| EXPECT_TRUE(stream->HasUrlFromHeaders());
|
|
|