gfe-relnote: Deprecate gfe2_reloadable_flag_quic_add_upper_limit_of_buffered_control_frames3.
PiperOrigin-RevId: 278395039
Change-Id: I0a805cc7f577620e60f80ff358efc5931b52f232
diff --git a/quic/core/quic_control_frame_manager.cc b/quic/core/quic_control_frame_manager.cc
index 85b204b..3eed5e8 100644
--- a/quic/core/quic_control_frame_manager.cc
+++ b/quic/core/quic_control_frame_manager.cc
@@ -26,14 +26,7 @@
: last_control_frame_id_(kInvalidControlFrameId),
least_unacked_(1),
least_unsent_(1),
- session_(session),
- add_upper_limit_(GetQuicReloadableFlag(
- quic_add_upper_limit_of_buffered_control_frames3)) {
- if (add_upper_limit_) {
- QUIC_RELOADABLE_FLAG_COUNT(
- quic_add_upper_limit_of_buffered_control_frames3);
- }
-}
+ session_(session) {}
QuicControlFrameManager::~QuicControlFrameManager() {
while (!control_frames_.empty()) {
@@ -45,7 +38,7 @@
void QuicControlFrameManager::WriteOrBufferQuicFrame(QuicFrame frame) {
const bool had_buffered_frames = HasBufferedFrames();
control_frames_.emplace_back(frame);
- if (add_upper_limit_ && control_frames_.size() > kMaxNumControlFrames) {
+ if (control_frames_.size() > kMaxNumControlFrames) {
session_->connection()->CloseConnection(
QUIC_TOO_MANY_BUFFERED_CONTROL_FRAMES,
QuicStrCat("More than ", kMaxNumControlFrames,
@@ -125,7 +118,7 @@
}
control_frames_.emplace_back(
QuicFrame(QuicPingFrame(++last_control_frame_id_)));
- if (add_upper_limit_ && control_frames_.size() > kMaxNumControlFrames) {
+ if (control_frames_.size() > kMaxNumControlFrames) {
session_->connection()->CloseConnection(
QUIC_TOO_MANY_BUFFERED_CONTROL_FRAMES,
QuicStrCat("More than ", kMaxNumControlFrames,
diff --git a/quic/core/quic_control_frame_manager.h b/quic/core/quic_control_frame_manager.h
index 735b73c..a4c2678 100644
--- a/quic/core/quic_control_frame_manager.h
+++ b/quic/core/quic_control_frame_manager.h
@@ -146,9 +146,6 @@
// Last sent window update frame for each stream.
QuicSmallMap<QuicStreamId, QuicControlFrameId, 10> window_update_frames_;
-
- // Latched value of quic_add_upper_limit_of_buffered_control_frames3.
- const bool add_upper_limit_;
};
} // namespace quic
diff --git a/quic/core/quic_control_frame_manager_test.cc b/quic/core/quic_control_frame_manager_test.cc
index d1723a1..e76e09f 100644
--- a/quic/core/quic_control_frame_manager_test.cc
+++ b/quic/core/quic_control_frame_manager_test.cc
@@ -291,7 +291,6 @@
}
TEST_F(QuicControlFrameManagerTest, TooManyBufferedControlFrames) {
- SetQuicReloadableFlag(quic_add_upper_limit_of_buffered_control_frames3, true);
Initialize();
EXPECT_CALL(*connection_, SendControlFrame(_))
.Times(5)