commit 319fb626ed46da8adf6160c84c0a26b6f05c1273
author fayang <fayang@google.com> Mon Jul 13 07:34:37 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 13 07:35:01 2020 -0700
tree e59017562cac5b22147e50d48e96863140af4f6b
parent aa55b0f33302d7229f2bb5f69f0f8c1803ebe177

Deprecate gfe2_reloadable_flag_quic_fix_pto_timeout.

PiperOrigin-RevId: 320952326
Change-Id: I079137e42ab868f654536ce5fc02869d4fbe4de5

quic/core/quic_sent_packet_manager.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 5033836..4ff4927 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -496,8 +496,7 @@
 bool QuicSentPacketManager::ShouldAddMaxAckDelay(
     PacketNumberSpace space) const {
   DCHECK(pto_enabled_);
-  if (fix_pto_timeout_ && supports_multiple_packet_number_spaces() &&
-      space != APPLICATION_DATA) {
+  if (supports_multiple_packet_number_spaces() && space != APPLICATION_DATA) {
     // When the PTO is armed for Initial or Handshake packet number spaces,
     // the max_ack_delay is 0.
     return false;

quic/core/quic_sent_packet_manager.h

diff --git a/quic/core/quic_sent_packet_manager.h b/quic/core/quic_sent_packet_manager.h
index 2176246..4d76f5c 100644
--- a/quic/core/quic_sent_packet_manager.h
+++ b/quic/core/quic_sent_packet_manager.h
@@ -671,7 +671,6 @@
   // available.
   float pto_multiplier_without_rtt_samples_;
 
-  const bool fix_pto_timeout_ = GetQuicReloadableFlag(quic_fix_pto_timeout);
   const bool fix_packet_number_length_ =
       GetQuicReloadableFlag(quic_fix_packet_number_length);
 };

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 e938017..c55eff3 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -3256,9 +3256,7 @@
       GetQuicReloadableFlag(quic_default_on_pto) ? 2 : 4;
   QuicTime::Delta expected_pto_delay =
       srtt + pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   EXPECT_EQ(clock_.Now() + expected_pto_delay,
             manager_.GetRetransmissionTime());
 
@@ -3353,9 +3351,7 @@
       GetQuicReloadableFlag(quic_default_on_pto) ? 2 : 4;
   QuicTime::Delta expected_pto_delay =
       srtt + pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   EXPECT_EQ(packet1_sent_time + expected_pto_delay,
             manager_.GetRetransmissionTime());
 
@@ -3628,9 +3624,7 @@
       GetQuicReloadableFlag(quic_default_on_pto) ? 2 : 4;
   QuicTime::Delta expected_pto_delay =
       srtt + pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   EXPECT_EQ(packet1_sent_time + expected_pto_delay,
             manager_.GetRetransmissionTime());
 
@@ -3710,9 +3704,7 @@
       GetQuicReloadableFlag(quic_default_on_pto) ? 2 : 4;
   QuicTime::Delta expected_pto_delay =
       srtt + pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   EXPECT_EQ(packet1_sent_time + expected_pto_delay,
             manager_.GetRetransmissionTime());
 
@@ -3983,9 +3975,7 @@
   const QuicTime::Delta pto_delay =
       rtt_stats->smoothed_rtt() +
       pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   // Verify PTO is armed based on handshake data.
   EXPECT_EQ(packet2_sent_time + pto_delay, manager_.GetRetransmissionTime());
 }
@@ -4068,9 +4058,7 @@
       GetQuicReloadableFlag(quic_default_on_pto) ? 2 : 4;
   QuicTime::Delta expected_pto_delay =
       srtt + pto_rttvar_multiplier * rtt_stats->mean_deviation() +
-      (GetQuicReloadableFlag(quic_fix_pto_timeout)
-           ? QuicTime::Delta::Zero()
-           : QuicTime::Delta::FromMilliseconds(kDefaultDelayedAckTimeMs));
+      QuicTime::Delta::Zero();
   EXPECT_EQ(packet1_sent_time + expected_pto_delay,
             manager_.GetRetransmissionTime());