| Index: net/tools/quic/quic_server_session_test.cc
|
| diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc
|
| index 22308fb27bec5b222fab86510b6e0daea725d023..2238b04a1bc7d8fcbd9d62f8a275b5ee14ea41b2 100644
|
| --- a/net/tools/quic/quic_server_session_test.cc
|
| +++ b/net/tools/quic/quic_server_session_test.cc
|
| @@ -31,8 +31,8 @@ namespace test {
|
|
|
| class QuicServerSessionPeer {
|
| public:
|
| - static QuicDataStream* GetIncomingDataStream(
|
| - QuicServerSession* s, QuicStreamId id) {
|
| + static QuicDataStream* GetIncomingDataStream(QuicServerSession* s,
|
| + QuicStreamId id) {
|
| return s->GetIncomingDataStream(id);
|
| }
|
| static QuicDataStream* GetDataStream(QuicServerSession* s, QuicStreamId id) {
|
| @@ -52,8 +52,7 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
|
|
|
| connection_ =
|
| new StrictMock<MockConnection>(true, SupportedVersions(GetParam()));
|
| - session_.reset(new QuicServerSession(
|
| - config_, connection_, &owner_));
|
| + session_.reset(new QuicServerSession(config_, connection_, &owner_));
|
| session_->InitializeSession(crypto_config_);
|
| visitor_ = QuicConnectionPeer::GetVisitor(connection_);
|
| }
|
| @@ -68,7 +67,8 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
|
| QuicConnectionVisitorInterface* visitor_;
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(Tests, QuicServerSessionTest,
|
| +INSTANTIATE_TEST_CASE_P(Tests,
|
| + QuicServerSessionTest,
|
| ::testing::ValuesIn(QuicSupportedVersions()));
|
|
|
| TEST_P(QuicServerSessionTest, CloseStreamDueToReset) {
|
| @@ -121,10 +121,10 @@ TEST_P(QuicServerSessionTest, AcceptClosedStream) {
|
| QuicStreamId stream_id = 5;
|
| vector<QuicStreamFrame> frames;
|
| // Send (empty) compressed headers followed by two bytes of data.
|
| - frames.push_back(QuicStreamFrame(stream_id, false, 0,
|
| - MakeIOVector("\1\0\0\0\0\0\0\0HT")));
|
| - frames.push_back(QuicStreamFrame(stream_id + 2, false, 0,
|
| - MakeIOVector("\2\0\0\0\0\0\0\0HT")));
|
| + frames.push_back(
|
| + QuicStreamFrame(stream_id, false, 0, MakeIOVector("\1\0\0\0\0\0\0\0HT")));
|
| + frames.push_back(QuicStreamFrame(
|
| + stream_id + 2, false, 0, MakeIOVector("\2\0\0\0\0\0\0\0HT")));
|
| visitor_->OnStreamFrames(frames);
|
| EXPECT_EQ(2u, session_->GetNumOpenStreams());
|
|
|
| @@ -139,8 +139,8 @@ TEST_P(QuicServerSessionTest, AcceptClosedStream) {
|
| // data on the floor, but accept the packet because it has data for stream 5.
|
| frames.clear();
|
| frames.push_back(QuicStreamFrame(stream_id, false, 2, MakeIOVector("TP")));
|
| - frames.push_back(QuicStreamFrame(stream_id + 2, false, 2,
|
| - MakeIOVector("TP")));
|
| + frames.push_back(
|
| + QuicStreamFrame(stream_id + 2, false, 2, MakeIOVector("TP")));
|
| visitor_->OnStreamFrames(frames);
|
| // The stream should never be opened, now that the reset is received.
|
| EXPECT_EQ(1u, session_->GetNumOpenStreams());
|
| @@ -150,8 +150,8 @@ TEST_P(QuicServerSessionTest, AcceptClosedStream) {
|
| TEST_P(QuicServerSessionTest, MaxNumConnections) {
|
| QuicStreamId stream_id = 5;
|
| EXPECT_EQ(0u, session_->GetNumOpenStreams());
|
| - EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
|
| - stream_id));
|
| + EXPECT_TRUE(
|
| + QuicServerSessionPeer::GetIncomingDataStream(session_.get(), stream_id));
|
| EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
|
| stream_id + 2));
|
| EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
|
| @@ -164,8 +164,8 @@ TEST_P(QuicServerSessionTest, MaxNumConnections) {
|
| TEST_P(QuicServerSessionTest, MaxNumConnectionsImplicit) {
|
| QuicStreamId stream_id = 5;
|
| EXPECT_EQ(0u, session_->GetNumOpenStreams());
|
| - EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
|
| - stream_id));
|
| + EXPECT_TRUE(
|
| + QuicServerSessionPeer::GetIncomingDataStream(session_.get(), stream_id));
|
| // Implicitly opens two more streams.
|
| EXPECT_CALL(*connection_, SendConnectionClose(QUIC_TOO_MANY_OPEN_STREAMS));
|
| EXPECT_FALSE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
|
|
|