gfe-relnote: Deprecate gfe2_reloadable_flag_quic_rpm_decides_when_to_send_acks.
PiperOrigin-RevId: 254188898
Change-Id: Ied75fc45a0dd45457928664648ff96d41738d0c4
diff --git a/quic/core/quic_received_packet_manager_test.cc b/quic/core/quic_received_packet_manager_test.cc
index a9cc387..86ac933 100644
--- a/quic/core/quic_received_packet_manager_test.cc
+++ b/quic/core/quic_received_packet_manager_test.cc
@@ -82,13 +82,11 @@
}
bool HasPendingAck() {
- DCHECK(received_manager_.decide_when_to_send_acks());
return received_manager_.ack_timeout().IsInitialized();
}
void MaybeUpdateAckTimeout(bool should_last_packet_instigate_acks,
uint64_t last_received_packet_number) {
- DCHECK(received_manager_.decide_when_to_send_acks());
received_manager_.MaybeUpdateAckTimeout(
should_last_packet_instigate_acks,
QuicPacketNumber(last_received_packet_number), clock_.ApproximateNow(),
@@ -136,9 +134,7 @@
EXPECT_TRUE(received_manager_.ack_frame_updated());
QuicFrame ack = received_manager_.GetUpdatedAckFrame(QuicTime::Zero());
- if (received_manager_.decide_when_to_send_acks()) {
- received_manager_.ResetAckStates();
- }
+ received_manager_.ResetAckStates();
EXPECT_FALSE(received_manager_.ack_frame_updated());
// When UpdateReceivedPacketInfo with a time earlier than the time of the
// largest observed packet, make sure that the delta is 0, not negative.
@@ -147,9 +143,7 @@
QuicTime four_ms = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(4);
ack = received_manager_.GetUpdatedAckFrame(four_ms);
- if (received_manager_.decide_when_to_send_acks()) {
- received_manager_.ResetAckStates();
- }
+ received_manager_.ResetAckStates();
EXPECT_FALSE(received_manager_.ack_frame_updated());
// When UpdateReceivedPacketInfo after not having received a new packet,
// the delta should still be accurate.
@@ -166,9 +160,7 @@
received_manager_.RecordPacketReceived(header, two_ms);
EXPECT_TRUE(received_manager_.ack_frame_updated());
ack = received_manager_.GetUpdatedAckFrame(two_ms);
- if (received_manager_.decide_when_to_send_acks()) {
- received_manager_.ResetAckStates();
- }
+ received_manager_.ResetAckStates();
EXPECT_FALSE(received_manager_.ack_frame_updated());
// UpdateReceivedPacketInfo should discard any times which can't be
// expressed on the wire.
@@ -244,9 +236,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, OutOfOrderReceiptCausesAckSent) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
RecordPacketReceipt(3, clock_.ApproximateNow());
@@ -270,9 +259,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, OutOfOrderAckReceiptCausesNoAck) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
RecordPacketReceipt(2, clock_.ApproximateNow());
@@ -285,9 +271,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, AckReceiptCausesAckSend) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
RecordPacketReceipt(1, clock_.ApproximateNow());
@@ -315,9 +298,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, AckSentEveryNthPacket) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
received_manager_.set_ack_frequency_before_ack_decimation(3);
@@ -334,9 +314,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, AckDecimationReducesAcks) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_,
ACK_DECIMATION_WITH_REORDERING);
@@ -372,9 +349,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, SendDelayedAfterQuiescence) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetFastAckAfterQuiescence(&received_manager_,
true);
@@ -408,9 +382,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, SendDelayedAckDecimation) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_, ACK_DECIMATION);
// The ack time should be based on min_rtt * 1/4, since it's less than the
@@ -444,9 +415,6 @@
TEST_P(QuicReceivedPacketManagerTest,
SendDelayedAckAckDecimationAfterQuiescence) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_, ACK_DECIMATION);
QuicReceivedPacketManagerPeer::SetFastAckAfterQuiescence(&received_manager_,
@@ -514,9 +482,6 @@
TEST_P(QuicReceivedPacketManagerTest,
SendDelayedAckDecimationUnlimitedAggregation) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicConfig config;
QuicTagVector connection_options;
@@ -557,9 +522,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, SendDelayedAckDecimationEighthRtt) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_, ACK_DECIMATION);
QuicReceivedPacketManagerPeer::SetAckDecimationDelay(&received_manager_,
@@ -595,9 +557,6 @@
}
TEST_P(QuicReceivedPacketManagerTest, SendDelayedAckDecimationWithReordering) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_,
ACK_DECIMATION_WITH_REORDERING);
@@ -641,9 +600,6 @@
TEST_P(QuicReceivedPacketManagerTest,
SendDelayedAckDecimationWithLargeReordering) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_,
ACK_DECIMATION_WITH_REORDERING);
@@ -689,9 +645,6 @@
TEST_P(QuicReceivedPacketManagerTest,
SendDelayedAckDecimationWithReorderingEighthRtt) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_,
ACK_DECIMATION_WITH_REORDERING);
@@ -733,9 +686,6 @@
TEST_P(QuicReceivedPacketManagerTest,
SendDelayedAckDecimationWithLargeReorderingEighthRtt) {
- if (!received_manager_.decide_when_to_send_acks()) {
- return;
- }
EXPECT_FALSE(HasPendingAck());
QuicReceivedPacketManagerPeer::SetAckMode(&received_manager_,
ACK_DECIMATION_WITH_REORDERING);
