commit 4ae5f98fb63dabf03145f9da0bffd4cdf00403b5
author fayang <fayang@google.com> Mon Jun 29 07:56:37 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 29 07:57:10 2020 -0700
tree 6bc42c429b6ed8ea643e24d5cc281481fcacfeab
parent d6c5bd08c17abb85043d3c1eece283e2aec05d4a

Deprecate gfe2_reloadable_flag_quic_fix_last_inflight_packets_sent_time.

PiperOrigin-RevId: 318814138
Change-Id: Ibf770948d591b1e4f098b9a169c4bd83c5dd5b41

quic/core/quic_sent_packet_manager_test.cc

diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index 7af3063..89c9c89 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -3957,7 +3957,6 @@
 
   // Send INITIAL 1.
   SendDataPacket(1, ENCRYPTION_INITIAL);
-  const QuicTime packet1_sent_time = clock_.Now();
   // Send HANDSHAKE 2.
   clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(10));
   SendDataPacket(2, ENCRYPTION_HANDSHAKE);
@@ -3987,34 +3986,12 @@
       (GetQuicReloadableFlag(quic_fix_pto_timeout)
            ? QuicTime::Delta::Zero()
            : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
-  if (GetQuicReloadableFlag(quic_fix_last_inflight_packets_sent_time)) {
-    // Verify PTO is armed based on handshake data.
-    EXPECT_EQ(packet2_sent_time + pto_delay, manager_.GetRetransmissionTime());
-  } else {
-    // Problematic: PTO is still armed based on initial data.
-    EXPECT_EQ(packet1_sent_time + pto_delay, manager_.GetRetransmissionTime());
-    clock_.AdvanceTime(pto_delay);
-    manager_.OnRetransmissionTimeout();
-    // Nothing to retransmit in INITIAL space.
-    EXPECT_CALL(notifier_, RetransmitFrames(_, _)).Times(0);
-    manager_.MaybeSendProbePackets();
-    // PING packet gets sent.
-    SendPingPacket(6, ENCRYPTION_INITIAL);
-    manager_.AdjustPendingTimerTransmissions();
-
-    // Verify PTO is armed based on packet 2.
-    EXPECT_EQ(packet2_sent_time + pto_delay * 2,
-              manager_.GetRetransmissionTime());
-    clock_.AdvanceTime(pto_delay * 2);
-    manager_.OnRetransmissionTimeout();
-    EXPECT_CALL(notifier_, RetransmitFrames(_, _)).Times(testing::AtLeast(1));
-    manager_.MaybeSendProbePackets();
-  }
+  // Verify PTO is armed based on handshake data.
+  EXPECT_EQ(packet2_sent_time + pto_delay, manager_.GetRetransmissionTime());
 }
 
 // Regression test for b/157895910.
 TEST_F(QuicSentPacketManagerTest, EarliestSentTimeNotInitializedWhenPtoFires) {
-  SetQuicReloadableFlag(quic_fix_last_inflight_packets_sent_time, true);
   manager_.EnableMultiplePacketNumberSpacesSupport();
   EXPECT_CALL(*send_algorithm_, PacingRate(_))
       .WillRepeatedly(Return(QuicBandwidth::Zero()));