gfe-relnote: Deprecate gfe2_reloadable_flag_quic_bundle_retransmittable_with_pto_ack. PiperOrigin-RevId: 305067810 Change-Id: I480afc34fee4ef67f1377c97400eb68140ec7851
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc index 99e88c3..41e98cd 100644 --- a/quic/core/quic_connection.cc +++ b/quic/core/quic_connection.cc
@@ -466,8 +466,7 @@ framer_.set_process_timestamps(true); uber_received_packet_manager_.set_save_timestamps(true); } - if (GetQuicReloadableFlag(quic_bundle_retransmittable_with_pto_ack) && - config.HasClientSentConnectionOption(kEACK, perspective_)) { + if (config.HasClientSentConnectionOption(kEACK, perspective_)) { bundle_retransmittable_with_pto_ack_ = true; } if (config.HasReceivedMaxPacketSize()) { @@ -3997,7 +3996,6 @@ if (bundle_retransmittable_with_pto_ack_ && (sent_packet_manager_.GetConsecutiveRtoCount() > 0 || sent_packet_manager_.GetConsecutivePtoCount() > 0)) { - QUIC_RELOADABLE_FLAG_COUNT(quic_bundle_retransmittable_with_pto_ack); // Bundle a retransmittable frame with an ACK if the PTO or RTO has fired // in order to recover more quickly in cases of temporary network outage. return true;
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index ded114b..e887669 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -3019,7 +3019,6 @@ } TEST_P(QuicConnectionTest, AckNeedsRetransmittableFramesAfterPto) { - SetQuicReloadableFlag(quic_bundle_retransmittable_with_pto_ack, true); // Disable TLP so the RTO fires immediately. connection_.SetMaxTailLossProbes(0); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));