Deprecate --gfe2_reloadable_flag_quic_rpm_trim_ack_ranges_early.
PiperOrigin-RevId: 556874037
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 322ced0..f95556e 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -29,8 +29,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
// If true, QuicGsoBatchWriter will support release time if it is available and the process has the permission to do so.
QUIC_FLAG(quic_restart_flag_quic_support_release_time_for_gso, false)
-// If true, QuicReceivedPacketManager will trim ack ranges when packet is received.
-QUIC_FLAG(quic_reloadable_flag_quic_rpm_trim_ack_ranges_early, true)
// If true, ack frequency frame can be sent from server to client.
QUIC_FLAG(quic_reloadable_flag_quic_can_send_ack_frequency, true)
// If true, allow client to enable BBRv2 on server via connection option \'B2ON\'.
diff --git a/quiche/quic/core/quic_received_packet_manager.cc b/quiche/quic/core/quic_received_packet_manager.cc
index afabb27..46cc259 100644
--- a/quiche/quic/core/quic_received_packet_manager.cc
+++ b/quiche/quic/core/quic_received_packet_manager.cc
@@ -154,14 +154,8 @@
}
void QuicReceivedPacketManager::MaybeTrimAckRanges() {
- if (!trim_ack_ranges_early_) {
- return;
- }
-
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_rpm_trim_ack_ranges_early, 1, 2);
while (max_ack_ranges_ > 0 &&
ack_frame_.packets.NumIntervals() > max_ack_ranges_) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_rpm_trim_ack_ranges_early, 2, 2);
ack_frame_.packets.RemoveSmallestInterval();
}
}
diff --git a/quiche/quic/core/quic_received_packet_manager.h b/quiche/quic/core/quic_received_packet_manager.h
index 79e55af..d16d37d 100644
--- a/quiche/quic/core/quic_received_packet_manager.h
+++ b/quiche/quic/core/quic_received_packet_manager.h
@@ -206,9 +206,6 @@
// Whether the most recent packet was missing before it was received.
bool was_last_packet_missing_;
- const bool trim_ack_ranges_early_ =
- GetQuicReloadableFlag(quic_rpm_trim_ack_ranges_early);
-
// Last sent largest acked, which gets updated when ACK was successfully sent.
QuicPacketNumber last_sent_largest_acked_;
diff --git a/quiche/quic/core/quic_received_packet_manager_test.cc b/quiche/quic/core/quic_received_packet_manager_test.cc
index bcb7e65..c09c219 100644
--- a/quiche/quic/core/quic_received_packet_manager_test.cc
+++ b/quiche/quic/core/quic_received_packet_manager_test.cc
@@ -189,8 +189,7 @@
received_manager_.set_max_ack_ranges(kMaxAckRanges);
for (size_t i = 0; i < kMaxAckRanges + 10; ++i) {
RecordPacketReceipt(1 + 2 * i);
- if (i < kMaxAckRanges ||
- !GetQuicReloadableFlag(quic_rpm_trim_ack_ranges_early)) {
+ if (i < kMaxAckRanges) {
EXPECT_EQ(i + 1, received_manager_.ack_frame().packets.NumIntervals());
} else {
EXPECT_EQ(kMaxAckRanges,
