commit 44fa92fb2b36c617ce74e63e4cfc1a53d1788573
author fayang <fayang@google.com> Mon Jul 01 07:32:14 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 02 19:31:08 2019 -0700
tree 292202227ff9be80a67b08bed31dfea2cc69319f
parent 978573522275f7c493ebf2eba329577770a5ccba

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_fix_has_pending_crypto_data.

PiperOrigin-RevId: 255951014
Change-Id: Ibf4d9f94a2e2693cacca5bbc6ce0f8d57f59c644

quic/core/quic_crypto_stream_test.cc

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_,

quic/core/quic_session.cc

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 {