| Index: net/quic/quic_sent_packet_manager_test.cc
|
| diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
|
| index f8cfce7d1a5da159691e062931b4ee9330fa5bd1..2cf3a60287cdf893d786667c5099d5cfdb06e20c 100644
|
| --- a/net/quic/quic_sent_packet_manager_test.cc
|
| +++ b/net/quic/quic_sent_packet_manager_test.cc
|
| @@ -501,76 +501,6 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckFirst) {
|
| EXPECT_EQ(2u, stats_.packets_spuriously_retransmitted);
|
| }
|
|
|
| -TEST_F(QuicSentPacketManagerTest, LoseButDontRetransmitRevivedPacket) {
|
| - StrictMock<MockDebugDelegate> debug_delegate;
|
| - manager_.set_debug_delegate(&debug_delegate);
|
| -
|
| - SendDataPacket(1);
|
| - SendDataPacket(2);
|
| - SendFecPacket(3);
|
| - SendDataPacket(4);
|
| -
|
| - // Ack 2 and 3, and mark 1 as revived.
|
| - QuicAckFrame ack_frame;
|
| - ack_frame.largest_observed = 3;
|
| - ack_frame.missing_packets.Add(1);
|
| - ack_frame.latest_revived_packet = 1;
|
| - QuicPacketNumber acked[] = {2, 3};
|
| - ExpectAcksAndLosses(true, acked, arraysize(acked), nullptr, 0);
|
| - manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
| -
|
| - EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| - QuicPacketNumber unacked[] = {1, 4};
|
| - VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - QuicPacketNumber retransmittable[] = {4};
|
| - VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
|
| -
|
| - // Ack the 4th packet and expect the 1st to be considered lost.
|
| - if (FLAGS_quic_log_loss_event) {
|
| - EXPECT_CALL(debug_delegate, OnPacketLoss(1, LOSS_RETRANSMISSION, _));
|
| - }
|
| - ack_frame.largest_observed = 4;
|
| - ExpectAckAndLoss(true, 4, 1);
|
| - manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
| -
|
| - EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| - VerifyRetransmittablePackets(nullptr, 0);
|
| -}
|
| -
|
| -TEST_F(QuicSentPacketManagerTest, MarkLostThenReviveAndDontRetransmitPacket) {
|
| - SendDataPacket(1);
|
| - SendDataPacket(2);
|
| - SendDataPacket(3);
|
| - SendDataPacket(4);
|
| - SendFecPacket(5);
|
| -
|
| - // Ack 2, 3, and 4, and expect the 1st to be considered lost.
|
| - QuicAckFrame ack_frame;
|
| - ack_frame.largest_observed = 4;
|
| - ack_frame.missing_packets.Add(1);
|
| - QuicPacketNumber acked[] = {2, 3, 4};
|
| - QuicPacketNumber lost[] = {1};
|
| - ExpectAcksAndLosses(true, acked, arraysize(acked), lost, arraysize(lost));
|
| - manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
| -
|
| - EXPECT_TRUE(manager_.HasPendingRetransmissions());
|
| - QuicPacketNumber unacked[] = {1, 5};
|
| - VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - QuicPacketNumber retransmittable[] = {1};
|
| - VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
|
| -
|
| - // Ack 5th packet (FEC) and revive 1st packet. 1st packet should now be
|
| - // removed from pending retransmissions map.
|
| - ack_frame.largest_observed = 5;
|
| - ack_frame.latest_revived_packet = 1;
|
| - ExpectAck(5);
|
| - manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
| -
|
| - EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| - VerifyRetransmittablePackets(nullptr, 0);
|
| -}
|
| -
|
| TEST_F(QuicSentPacketManagerTest, AckPreviousTransmissionThenTruncatedAck) {
|
| SendDataPacket(1);
|
| RetransmitAndSendPacket(1, 2);
|
|
|