| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index b0844289663e955b3f2d21687b6079b8cab01301..33211114c494b87b3d8e87c14995ef1f7fb3ea74 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -2813,13 +2813,7 @@ TEST_P(QuicConnectionTest, PingAfterSend) {
|
| clock_.AdvanceTime(QuicTime::Delta::FromSeconds(15));
|
| connection_.GetPingAlarm()->Fire();
|
| EXPECT_EQ(1u, writer_->frame_count());
|
| - if (version() >= QUIC_VERSION_18) {
|
| - ASSERT_EQ(1u, writer_->ping_frames().size());
|
| - } else {
|
| - ASSERT_EQ(1u, writer_->stream_frames().size());
|
| - EXPECT_EQ(kCryptoStreamId, writer_->stream_frames()[0].stream_id);
|
| - EXPECT_EQ(0u, writer_->stream_frames()[0].offset);
|
| - }
|
| + ASSERT_EQ(1u, writer_->ping_frames().size());
|
| writer_->Reset();
|
|
|
| EXPECT_CALL(visitor_, HasOpenDataStreams()).WillRepeatedly(Return(false));
|
| @@ -3021,16 +3015,6 @@ TEST_P(QuicConnectionTest, SendDelayedAckOnSecondPacket) {
|
| EXPECT_FALSE(connection_.GetAckAlarm()->IsSet());
|
| }
|
|
|
| -TEST_P(QuicConnectionTest, SendDelayedAckForPing) {
|
| - if (version() < QUIC_VERSION_18) {
|
| - return;
|
| - }
|
| - EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
|
| - EXPECT_FALSE(connection_.GetAckAlarm()->IsSet());
|
| - ProcessPingPacket(1);
|
| - EXPECT_TRUE(connection_.GetAckAlarm()->IsSet());
|
| -}
|
| -
|
| TEST_P(QuicConnectionTest, NoAckOnOldNacks) {
|
| EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
|
| // Drop one packet, triggering a sequence of acks.
|
|
|