commit 9fa2be314ae8b59537af30d51c6e4fa12b331d79
author zhongyi <zhongyi@google.com> Tue Sep 10 12:39:01 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 12 11:47:31 2019 -0700
tree ebf6b99895ce1c1728a933dba32f92b65cb67242
parent 16df2a541ae9bd54de31fee74567ebf5f49563a3

gfe-relnote: deprecate quic_ignore_tlpr_if_no_pending_stream_data.

PiperOrigin-RevId: 268284975
Change-Id: I9e22888285453fa081e9ed44493c0e6aebe71de9

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index cc4899b..85489bc 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -4081,14 +4081,9 @@
   QuicTime::Delta min_rto_timeout =
       QuicTime::Delta::FromMilliseconds(kMinRetransmissionTimeMs);
   srtt = manager_->GetRttStats()->SmoothedOrInitialRtt();
-  if (GetQuicReloadableFlag(quic_ignore_tlpr_if_no_pending_stream_data)) {
-    // First TLP without unacked stream data will no longer use TLPR.
-    expected_delay = std::max(2 * srtt, 1.5 * srtt + 0.5 * min_rto_timeout);
-  } else {
-    expected_delay =
-        std::max(QuicTime::Delta::FromMilliseconds(kMinTailLossProbeTimeoutMs),
-                 srtt * 0.5);
-  }
+
+  // First TLP without unacked stream data will no longer use TLPR.
+  expected_delay = std::max(2 * srtt, 1.5 * srtt + 0.5 * min_rto_timeout);
   EXPECT_EQ(expected_delay,
             connection_.GetRetransmissionAlarm()->deadline() - clock_.Now());
 
@@ -4119,14 +4114,8 @@
   ProcessAckPacket(&ack);
 
   // Verify the retransmission delay.
-  if (GetQuicReloadableFlag(quic_ignore_tlpr_if_no_pending_stream_data)) {
-    // First TLP without unacked stream data will no longer use TLPR.
-    expected_delay = std::max(2 * srtt, 1.5 * srtt + 0.5 * min_rto_timeout);
-  } else {
-    expected_delay =
-        std::max(QuicTime::Delta::FromMilliseconds(kMinTailLossProbeTimeoutMs),
-                 srtt * 0.5);
-  }
+  // First TLP without unacked stream data will no longer use TLPR.
+  expected_delay = std::max(2 * srtt, 1.5 * srtt + 0.5 * min_rto_timeout);
   expected_delay = expected_delay - QuicTime::Delta::FromMilliseconds(5);
   EXPECT_EQ(expected_delay,
             connection_.GetRetransmissionAlarm()->deadline() - clock_.Now());