Deprecate gfe2_reloadable_flag_quic_fix_server_pto_timeout.
PiperOrigin-RevId: 320959889
Change-Id: I64851bfeb19eb73e796645e8309d8785457d845d
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index c961b89..a1c63c2 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -199,7 +199,6 @@
AddToCache("/foo", 200, kFooResponseBody);
AddToCache("/bar", 200, kBarResponseBody);
// Enable fixes for bugs found in tests and prod.
- SetQuicReloadableFlag(quic_fix_server_pto_timeout, true);
SetQuicReloadableFlag(quic_fix_undecryptable_packets, true);
SetQuicReloadableFlag(quic_fix_packet_number_length, true);
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 4ff4927..8e0922b 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -1067,13 +1067,11 @@
return QuicTime::Zero();
}
PacketNumberSpace packet_number_space;
- if (GetQuicReloadableFlag(quic_fix_server_pto_timeout) &&
- supports_multiple_packet_number_spaces() &&
+ if (supports_multiple_packet_number_spaces() &&
unacked_packets_.perspective() == Perspective::IS_SERVER &&
!GetEarliestPacketSentTimeForPto(&packet_number_space).IsInitialized()) {
// Do not set the timer on the server side if the only in flight packets are
// half RTT data.
- QUIC_RELOADABLE_FLAG_COUNT(quic_fix_server_pto_timeout);
return QuicTime::Zero();
}
switch (GetRetransmissionMode()) {
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index c55eff3..1724a39 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -4020,17 +4020,8 @@
EXPECT_EQ(PACKETS_NEWLY_ACKED,
manager_.OnAckFrameEnd(clock_.Now(), QuicPacketNumber(4),
ENCRYPTION_HANDSHAKE));
- if (GetQuicReloadableFlag(quic_fix_server_pto_timeout)) {
- // Verify PTO will not be armed.
- EXPECT_EQ(QuicTime::Zero(), manager_.GetRetransmissionTime());
- return;
- }
- // PTO fires but there is nothing to send.
- EXPECT_NE(QuicTime::Zero(), manager_.GetRetransmissionTime());
- manager_.OnRetransmissionTimeout();
- EXPECT_QUIC_BUG(manager_.MaybeSendProbePackets(),
- "earlist_sent_time not initialized when trying to send PTO "
- "retransmissions");
+ // Verify PTO will not be armed.
+ EXPECT_EQ(QuicTime::Zero(), manager_.GetRetransmissionTime());
}
TEST_F(QuicSentPacketManagerTest, MaybeRetransmitInitialData) {
