gfe-relnote: False deprecate gfe2_reloadable_flag_quic_fix_adaptive_time_loss.

PiperOrigin-RevId: 268007471
Change-Id: Iaacdf80ce8ed09b2995362ab096bc5b50eeba765

quic/core/congestion_control/general_loss_algorithm.cc

diff --git a/quic/core/congestion_control/general_loss_algorithm.cc b/quic/core/congestion_control/general_loss_algorithm.cc
index 56b24f7..02b2129 100644
--- a/quic/core/congestion_control/general_loss_algorithm.cc
+++ b/quic/core/congestion_control/general_loss_algorithm.cc
@@ -194,14 +194,6 @@
   // Increase the reordering fraction until enough time would be allowed.
   QuicTime::Delta max_rtt =
       std::max(rtt_stats.previous_srtt(), rtt_stats.latest_rtt());
-  if (GetQuicReloadableFlag(quic_fix_adaptive_time_loss)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_fix_adaptive_time_loss);
-    while ((max_rtt >> reordering_shift_) <= extra_time_needed &&
-           reordering_shift_ > 0) {
-      --reordering_shift_;
-    }
-    return;
-  }
 
   if (largest_sent_on_spurious_retransmit_.IsInitialized() &&
       spurious_retransmission <= largest_sent_on_spurious_retransmit_) {

quic/core/congestion_control/general_loss_algorithm.h

diff --git a/quic/core/congestion_control/general_loss_algorithm.h b/quic/core/congestion_control/general_loss_algorithm.h
index 1dd5b2a..089387f 100644
--- a/quic/core/congestion_control/general_loss_algorithm.h
+++ b/quic/core/congestion_control/general_loss_algorithm.h
@@ -62,8 +62,6 @@
   QuicTime loss_detection_timeout_;
   // Largest sent packet when a spurious retransmit is detected.
   // Prevents increasing the reordering threshold multiple times per epoch.
-  // TODO(ianswett): Deprecate when quic_fix_adaptive_time_loss flag is
-  // deprecated.
   QuicPacketNumber largest_sent_on_spurious_retransmit_;
   LossDetectionType loss_type_;
   // Fraction of a max(SRTT, latest_rtt) to permit reordering before declaring

quic/core/congestion_control/general_loss_algorithm_test.cc

diff --git a/quic/core/congestion_control/general_loss_algorithm_test.cc b/quic/core/congestion_control/general_loss_algorithm_test.cc
index f6e203e..c03ad90 100644
--- a/quic/core/congestion_control/general_loss_algorithm_test.cc
+++ b/quic/core/congestion_control/general_loss_algorithm_test.cc
@@ -514,11 +514,6 @@
   // Advance the time 1/4 RTT and indicate the loss was spurious.
   // The new threshold should be 1/2 RTT.
   clock_.AdvanceTime(rtt_stats_.smoothed_rtt() * (1.0f / 4));
-  if (GetQuicReloadableFlag(quic_fix_adaptive_time_loss)) {
-    // The flag fixes an issue where adaptive time loss would increase the
-    // reordering threshold by an extra factor of two.
-    clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(1));
-  }
   loss_algorithm_.SpuriousRetransmitDetected(unacked_packets_, clock_.Now(),
                                              rtt_stats_, QuicPacketNumber(11));
   EXPECT_EQ(1, loss_algorithm_.reordering_shift());