Remove lastest_revived_packet from QuicAckFrame since FEC is gone. No functional change expected.

net/quic/quic_sent_packet_manager_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_sent_packet_manager.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/test_tools/quic_config_peer.h"
 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
@@ skipping 483 matching lines @@
   ack_frame.largest_observed = 5;
   ExpectAckAndLoss(true, 5, 2);
   EXPECT_CALL(debug_delegate, OnPacketLoss(2, LOSS_RETRANSMISSION, _));
   manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
 
   VerifyUnackedPackets(nullptr, 0);
   EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
   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);
   RetransmitAndSendPacket(2, 3);
   RetransmitAndSendPacket(3, 4);
   SendDataPacket(5);
   SendDataPacket(6);
   SendDataPacket(7);
   SendDataPacket(8);
   SendDataPacket(9);
@@ skipping 1186 matching lines @@
   manager_.OnConnectionMigration(PORT_CHANGE);
 
   EXPECT_EQ(2 * default_init_rtt, rtt_stats->initial_rtt_us());
   EXPECT_EQ(1u, manager_.consecutive_rto_count());
   EXPECT_EQ(2u, manager_.consecutive_tlp_count());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net