gfe-relnote: Deprecate gfe2_reloadable_flag_quic_fix_get_packet_header_size
PiperOrigin-RevId: 268463387
Change-Id: I5ba9d04c9b4a6b439c85e17e199d8ff76ec7ffa7
diff --git a/quic/core/quic_crypto_client_stream_test.cc b/quic/core/quic_crypto_client_stream_test.cc
index 7df73ce..f0a60e0 100644
--- a/quic/core/quic_crypto_client_stream_test.cc
+++ b/quic/core/quic_crypto_client_stream_test.cc
@@ -315,7 +315,6 @@
}
TEST_F(QuicCryptoClientStreamTest, PreferredVersion) {
- SetQuicReloadableFlag(quic_fix_get_packet_header_size, true);
// This mimics the case where client receives version negotiation packet, such
// that, the preferred version is different from the packets' version.
connection_ = new PacketSavingConnection(
diff --git a/quic/core/quic_crypto_stream.cc b/quic/core/quic_crypto_stream.cc
index e1ee5bf..3081516 100644
--- a/quic/core/quic_crypto_stream.cc
+++ b/quic/core/quic_crypto_stream.cc
@@ -52,11 +52,9 @@
VARIABLE_LENGTH_INTEGER_LENGTH_1;
QuicVariableLengthIntegerLength length_length =
VARIABLE_LENGTH_INTEGER_LENGTH_2;
- if (!QuicVersionHasLongHeaderLengths(version) &&
- GetQuicReloadableFlag(quic_fix_get_packet_header_size)) {
+ if (!QuicVersionHasLongHeaderLengths(version)) {
retry_token_length_length = VARIABLE_LENGTH_INTEGER_LENGTH_0;
length_length = VARIABLE_LENGTH_INTEGER_LENGTH_0;
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_fix_get_packet_header_size, 2, 3);
}
return QuicPacketCreator::StreamFramePacketOverhead(
version, static_cast<QuicConnectionIdLength>(connection_id.length()),
diff --git a/quic/core/quic_crypto_stream_test.cc b/quic/core/quic_crypto_stream_test.cc
index 0661c19..095e2b7 100644
--- a/quic/core/quic_crypto_stream_test.cc
+++ b/quic/core/quic_crypto_stream_test.cc
@@ -515,7 +515,6 @@
// Regression test for bugfix of GetPacketHeaderSize.
TEST_F(QuicCryptoStreamTest, CryptoMessageFramingOverhead) {
- SetQuicReloadableFlag(quic_fix_get_packet_header_size, true);
for (auto version : AllSupportedTransportVersions()) {
SCOPED_TRACE(version);
QuicByteCount expected_overhead = 48;
diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 70d5ccb..0b7a9f2 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -84,9 +84,7 @@
false),
pending_padding_bytes_(0),
needs_full_padding_(false),
- can_set_transmission_type_(false),
- fix_get_packet_header_size_(
- GetQuicReloadableFlag(quic_fix_get_packet_header_size)) {
+ can_set_transmission_type_(false) {
SetMaxPacketLength(kDefaultMaxPacketSize);
}
@@ -1100,9 +1098,7 @@
if (framer_->perspective() == Perspective::IS_CLIENT) {
length_length = VARIABLE_LENGTH_INTEGER_LENGTH_2;
}
- if (!QuicVersionHasLongHeaderLengths(framer_->transport_version()) &&
- fix_get_packet_header_size_) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_fix_get_packet_header_size, 3, 3);
+ if (!QuicVersionHasLongHeaderLengths(framer_->transport_version())) {
length_length = VARIABLE_LENGTH_INTEGER_LENGTH_0;
}
const size_t packet_header_size = GetPacketHeaderSize(
diff --git a/quic/core/quic_packet_creator.h b/quic/core/quic_packet_creator.h
index affc15c..8e3ea3f 100644
--- a/quic/core/quic_packet_creator.h
+++ b/quic/core/quic_packet_creator.h
@@ -432,9 +432,6 @@
// If true, packet_'s transmission type is only set by
// SetPacketTransmissionType and does not get cleared in ClearPacket.
bool can_set_transmission_type_;
-
- // Latched value of quic_fix_get_packet_header_size flag.
- bool fix_get_packet_header_size_;
};
} // namespace quic
diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 5b58b5f..e7c82d1 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -154,7 +154,6 @@
data_("foo"),
creator_(connection_id_, &client_framer_, &delegate_, &producer_),
serialized_packet_(creator_.NoPacket()) {
- QuicPacketCreatorPeer::EnableGetPacketHeaderSizeBugFix(&creator_);
EXPECT_CALL(delegate_, GetPacketBuffer()).WillRepeatedly(Return(nullptr));
creator_.SetEncrypter(ENCRYPTION_HANDSHAKE, std::make_unique<NullEncrypter>(
Perspective::IS_CLIENT));
diff --git a/quic/core/quic_packets.cc b/quic/core/quic_packets.cc
index c4ef81a..0352056 100644
--- a/quic/core/quic_packets.cc
+++ b/quic/core/quic_packets.cc
@@ -127,12 +127,9 @@
size += kConnectionIdLengthSize;
}
DCHECK(QuicVersionHasLongHeaderLengths(version) ||
- !GetQuicReloadableFlag(quic_fix_get_packet_header_size) ||
retry_token_length_length + retry_token_length + length_length ==
0);
- if (QuicVersionHasLongHeaderLengths(version) ||
- !GetQuicReloadableFlag(quic_fix_get_packet_header_size)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_fix_get_packet_header_size, 1, 3);
+ if (QuicVersionHasLongHeaderLengths(version)) {
size += retry_token_length_length + retry_token_length + length_length;
}
return size;
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc
index 8896404..dc9f151 100644
--- a/quic/quartc/quartc_factory.cc
+++ b/quic/quartc/quartc_factory.cc
@@ -82,9 +82,6 @@
SetQuicReloadableFlag(quic_bbr_less_probe_rtt, true); // Enable BBR6,7,8.
SetQuicReloadableFlag(quic_unified_iw_options, true); // Enable IWXX opts.
SetQuicReloadableFlag(quic_bbr_flexible_app_limited, true); // Enable BBR9.
-
- // Fix GetPacketHeaderSize
- SetQuicReloadableFlag(quic_fix_get_packet_header_size, true);
}
QuicConfig CreateQuicConfig(const QuartcSessionConfig& quartc_session_config) {
diff --git a/quic/test_tools/quic_packet_creator_peer.cc b/quic/test_tools/quic_packet_creator_peer.cc
index d4dc008..d4e5598 100644
--- a/quic/test_tools/quic_packet_creator_peer.cc
+++ b/quic/test_tools/quic_packet_creator_peer.cc
@@ -139,11 +139,5 @@
return creator->framer_;
}
-// static
-void QuicPacketCreatorPeer::EnableGetPacketHeaderSizeBugFix(
- QuicPacketCreator* creator) {
- creator->fix_get_packet_header_size_ = true;
-}
-
} // namespace test
} // namespace quic
diff --git a/quic/test_tools/quic_packet_creator_peer.h b/quic/test_tools/quic_packet_creator_peer.h
index f8f3d59..e040090 100644
--- a/quic/test_tools/quic_packet_creator_peer.h
+++ b/quic/test_tools/quic_packet_creator_peer.h
@@ -57,7 +57,6 @@
static EncryptionLevel GetEncryptionLevel(QuicPacketCreator* creator);
static QuicFramer* framer(QuicPacketCreator* creator);
- static void EnableGetPacketHeaderSizeBugFix(QuicPacketCreator* creator);
};
} // namespace test
