Deprecate gfe2_reloadable_flag_quic_sent_packet_manager_cleanup.
gfe-relnote: n/a (Flag deprecation)
PiperOrigin-RevId: 277057068
Change-Id: I7a9f46306476c905093b4ded8ce5da626884f608
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index e86d950..9567fc4 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -1956,11 +1956,8 @@
EXPECT_EQ(QuicTime::Delta::FromMicroseconds(100002),
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
- // Send two packets, and the TLP should be 2 us or 1ms.
- QuicTime::Delta expected_tlp_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMilliseconds(1)
- : QuicTime::Delta::FromMicroseconds(2);
+ // Send two packets, and the TLP should be 1ms.
+ QuicTime::Delta expected_tlp_delay = QuicTime::Delta::FromMilliseconds(1);
SendDataPacket(1);
SendDataPacket(2);
EXPECT_EQ(expected_tlp_delay,
@@ -1991,11 +1988,8 @@
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
EXPECT_EQ(QuicTime::Delta::FromMicroseconds(100002),
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
- // Send two packets, and the TLP should be 2 us or 1ms.
- QuicTime::Delta expected_tlp_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMilliseconds(1)
- : QuicTime::Delta::FromMicroseconds(2);
+ // Send two packets, and the TLP should be 1ms.
+ QuicTime::Delta expected_tlp_delay = QuicTime::Delta::FromMilliseconds(1);
SendDataPacket(1);
SendDataPacket(2);
EXPECT_EQ(expected_tlp_delay,
@@ -2004,69 +1998,6 @@
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
}
-TEST_F(QuicSentPacketManagerTest, NegotiateIETFTLPFromOptionsAtServer) {
- if (GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)) {
- return;
- }
- QuicConfig config;
- QuicTagVector options;
-
- options.push_back(kMAD4);
- QuicConfigPeer::SetReceivedConnectionOptions(&config, options);
- EXPECT_CALL(*network_change_visitor_, OnCongestionChange());
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- manager_.SetFromConfig(config);
- // Provide an RTT measurement of 100ms.
- RttStats* rtt_stats = const_cast<RttStats*>(manager_.GetRttStats());
- rtt_stats->UpdateRtt(QuicTime::Delta::FromMilliseconds(100),
- QuicTime::Delta::Zero(), QuicTime::Zero());
- // Expect 1.5x * SRTT + 0ms MAD
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(150),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(150),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
- // Expect 1.5x * SRTT + 50ms MAD
- rtt_stats->UpdateRtt(QuicTime::Delta::FromMilliseconds(150),
- QuicTime::Delta::FromMilliseconds(50), QuicTime::Zero());
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(100), rtt_stats->smoothed_rtt());
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(200),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(200),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
-}
-
-TEST_F(QuicSentPacketManagerTest, NegotiateIETFTLPFromOptionsAtClient) {
- if (GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)) {
- return;
- }
- QuicConfig client_config;
- QuicTagVector options;
-
- options.push_back(kMAD4);
- QuicSentPacketManagerPeer::SetPerspective(&manager_, Perspective::IS_CLIENT);
- client_config.SetConnectionOptionsToSend(options);
- EXPECT_CALL(*network_change_visitor_, OnCongestionChange());
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- manager_.SetFromConfig(client_config);
- // Provide an RTT measurement of 100ms.
- RttStats* rtt_stats = const_cast<RttStats*>(manager_.GetRttStats());
- rtt_stats->UpdateRtt(QuicTime::Delta::FromMilliseconds(100),
- QuicTime::Delta::Zero(), QuicTime::Zero());
- // Expect 1.5x * SRTT + 0ms MAD
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(150),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(150),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
- // Expect 1.5x * SRTT + 50ms MAD
- rtt_stats->UpdateRtt(QuicTime::Delta::FromMilliseconds(150),
- QuicTime::Delta::FromMilliseconds(50), QuicTime::Zero());
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(100), rtt_stats->smoothed_rtt());
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(200),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
- EXPECT_EQ(QuicTime::Delta::FromMilliseconds(200),
- QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_, 0));
-}
-
TEST_F(QuicSentPacketManagerTest, NegotiateNoMinRTOFromOptionsAtServer) {
QuicConfig config;
QuicTagVector options;
@@ -2080,19 +2011,13 @@
RttStats* rtt_stats = const_cast<RttStats*>(manager_.GetRttStats());
rtt_stats->UpdateRtt(QuicTime::Delta::FromMicroseconds(1),
QuicTime::Delta::Zero(), QuicTime::Zero());
- QuicTime::Delta expected_rto_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMilliseconds(1)
- : QuicTime::Delta::FromMicroseconds(1);
+ QuicTime::Delta expected_rto_delay = QuicTime::Delta::FromMilliseconds(1);
EXPECT_EQ(expected_rto_delay,
QuicSentPacketManagerPeer::GetRetransmissionDelay(&manager_));
EXPECT_EQ(expected_rto_delay,
QuicSentPacketManagerPeer::GetRetransmissionDelay(&manager_, 0));
// The TLP with fewer than 2 packets outstanding includes 1/2 min RTO(0ms).
- QuicTime::Delta expected_tlp_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMicroseconds(502)
- : QuicTime::Delta::FromMicroseconds(2);
+ QuicTime::Delta expected_tlp_delay = QuicTime::Delta::FromMicroseconds(502);
EXPECT_EQ(expected_tlp_delay,
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
EXPECT_EQ(expected_tlp_delay,
@@ -2113,19 +2038,13 @@
RttStats* rtt_stats = const_cast<RttStats*>(manager_.GetRttStats());
rtt_stats->UpdateRtt(QuicTime::Delta::FromMicroseconds(1),
QuicTime::Delta::Zero(), QuicTime::Zero());
- QuicTime::Delta expected_rto_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMilliseconds(1)
- : QuicTime::Delta::FromMicroseconds(1);
+ QuicTime::Delta expected_rto_delay = QuicTime::Delta::FromMilliseconds(1);
EXPECT_EQ(expected_rto_delay,
QuicSentPacketManagerPeer::GetRetransmissionDelay(&manager_));
EXPECT_EQ(expected_rto_delay,
QuicSentPacketManagerPeer::GetRetransmissionDelay(&manager_, 0));
// The TLP with fewer than 2 packets outstanding includes 1/2 min RTO(0ms).
- QuicTime::Delta expected_tlp_delay =
- GetQuicReloadableFlag(quic_sent_packet_manager_cleanup)
- ? QuicTime::Delta::FromMicroseconds(502)
- : QuicTime::Delta::FromMicroseconds(2);
+ QuicTime::Delta expected_tlp_delay = QuicTime::Delta::FromMicroseconds(502);
EXPECT_EQ(expected_tlp_delay,
QuicSentPacketManagerPeer::GetTailLossProbeDelay(&manager_));
EXPECT_EQ(expected_tlp_delay,
