commit 06d4c1ff5b0fd20e45496cb385069a4eee673dc5
author fayang <fayang@google.com> Thu Dec 03 08:15:27 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 03 08:16:01 2020 -0800
tree 816d14cd43a3f149b8fe09dfe47f48c28ded1299
parent f99f693c3e7c02d97504bdd71feef9aa75f5ab18

Deprecate gfe2_reloadable_flag_quic_fix_arm_pto_for_application_data.

PiperOrigin-RevId: 345455252
Change-Id: I04437cf0eda91c2423ad65bacd75e4be9b7ee53d

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 e087211..f6d6f6d 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -3318,7 +3318,6 @@
   // Send packet 6 in 1-RTT.
   clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(10));
   SendDataPacket(6, ENCRYPTION_FORWARD_SECURE);
-  const QuicTime packet6_sent_time = clock_.Now();
   // Verify PTO timeout is now based on packet 5.
   EXPECT_EQ(packet5_sent_time + expected_pto_delay * 2,
             manager_.GetRetransmissionTime());
@@ -3328,21 +3327,11 @@
   const QuicTime packet7_sent_time = clock_.Now();
   SendDataPacket(7, ENCRYPTION_HANDSHAKE);
 
-  if (GetQuicReloadableFlag(quic_fix_arm_pto_for_application_data)) {
-    expected_pto_delay =
-        srtt + GetPtoRttvarMultiplier() * rtt_stats->mean_deviation();
-    // Verify PTO timeout is now based on packet 7.
-    EXPECT_EQ(packet7_sent_time + expected_pto_delay * 2,
-              manager_.GetRetransmissionTime());
-
-  } else {
-    expected_pto_delay =
-        srtt + GetPtoRttvarMultiplier() * rtt_stats->mean_deviation() +
-        QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs);
-    // Verify PTO timeout is now based on packet 6.
-    EXPECT_EQ(packet6_sent_time + expected_pto_delay * 2,
-              manager_.GetRetransmissionTime());
-  }
+  expected_pto_delay =
+      srtt + GetPtoRttvarMultiplier() * rtt_stats->mean_deviation();
+  // Verify PTO timeout is now based on packet 7.
+  EXPECT_EQ(packet7_sent_time + expected_pto_delay * 2,
+            manager_.GetRetransmissionTime());
 
   // Neuter handshake key.
   manager_.SetHandshakeConfirmed();