gfe-relnote: Deprecate gfe2_reloadable_flag_quic_fix_has_pending_crypto_data.
PiperOrigin-RevId: 255951014
Change-Id: Ibf4d9f94a2e2693cacca5bbc6ce0f8d57f59c644
diff --git a/quic/core/quic_crypto_stream_test.cc b/quic/core/quic_crypto_stream_test.cc
index f5ab413..96b2760 100644
--- a/quic/core/quic_crypto_stream_test.cc
+++ b/quic/core/quic_crypto_stream_test.cc
@@ -484,8 +484,7 @@
EXPECT_FALSE(stream_->IsWaitingForAcks());
// Although there is no outstanding data, verify session has pending crypto
// data.
- EXPECT_EQ(GetQuicReloadableFlag(quic_fix_has_pending_crypto_data),
- session_.HasUnackedCryptoData());
+ EXPECT_TRUE(session_.HasUnackedCryptoData());
EXPECT_CALL(
session_,
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 5c5d9a6..d7aa91e 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1746,15 +1746,7 @@
bool QuicSession::HasUnackedCryptoData() const {
const QuicCryptoStream* crypto_stream = GetCryptoStream();
- if (crypto_stream->IsWaitingForAcks()) {
- return true;
- }
- if (GetQuicReloadableFlag(quic_fix_has_pending_crypto_data) &&
- crypto_stream->HasBufferedData()) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_fix_has_pending_crypto_data);
- return true;
- }
- return false;
+ return crypto_stream->IsWaitingForAcks() || crypto_stream->HasBufferedData();
}
bool QuicSession::HasUnackedStreamData() const {
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc
index 4a85e57..53eb34b 100644
--- a/quic/quartc/quartc_factory.cc
+++ b/quic/quartc/quartc_factory.cc
@@ -65,9 +65,6 @@
// Enable version 47 to enable variable-length connection ids.
SetQuicReloadableFlag(quic_enable_version_47, true);
- // Fix for inconsistent reporting of crypto handshake.
- SetQuicReloadableFlag(quic_fix_has_pending_crypto_data, true);
-
// Ensure that we don't drop data because QUIC streams refuse to buffer it.
// TODO(b/120099046): Replace this with correct handling of WriteMemSlices().
SetQuicFlag(FLAGS_quic_buffered_data_threshold,
