commit 34dfef064510cb17d30ddb1ef5b5b10e19b5148b
author fayang <fayang@google.com> Tue Jul 16 08:55:54 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 16 11:02:07 2019 -0700
tree e738f1b77db382acff4f8339187a2313e46f2f91
parent 034010285bb0aee60882eac7b34f78e8dacf0b85

gfe-relnote: Deprecate  gfe2_reloadable_flag_quic_check_connected_before_flush.

PiperOrigin-RevId: 258375905
Change-Id: Icb06e69235db4f62c042cadde8d926efb4b26709

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 5ef9720..1ad2ddb 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -1709,8 +1709,7 @@
 }
 
 void QuicConnection::OnCanWrite() {
-  if (GetQuicReloadableFlag(quic_check_connected_before_flush) && !connected_) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_check_connected_before_flush, 2, 2);
+  if (!connected_) {
     return;
   }
   DCHECK(!writer_->IsWriteBlocked());
@@ -2903,12 +2902,7 @@
 }
 
 QuicConnection::ScopedPacketFlusher::~ScopedPacketFlusher() {
-  if (connection_ == nullptr) {
-    return;
-  }
-  if (GetQuicReloadableFlag(quic_check_connected_before_flush) &&
-      !connection_->connected()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_check_connected_before_flush, 1, 2);
+  if (connection_ == nullptr || !connection_->connected()) {
     return;
   }
 

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 7506c17..f04d142 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -1972,11 +1972,7 @@
 
   EXPECT_EQ(0u, connection_.GetStats().packets_discarded);
   connection_.OnCanWrite();
-  if (GetQuicReloadableFlag(quic_check_connected_before_flush)) {
-    EXPECT_EQ(0u, connection_.GetStats().packets_discarded);
-  } else {
-    EXPECT_EQ(1u, connection_.GetStats().packets_discarded);
-  }
+  EXPECT_EQ(0u, connection_.GetStats().packets_discarded);
 }
 
 TEST_P(QuicConnectionTest, ReceiveConnectivityProbingAtServer) {
@@ -8502,12 +8498,8 @@
   EXPECT_TRUE(ack_alarm->IsSet());
   ProcessFramePacketWithAddresses(QuicFrame(connection_close_frame.get()),
                                   kSelfAddress, kPeerAddress);
-  if (GetQuicReloadableFlag(quic_check_connected_before_flush)) {
-    // Verify ack alarm is not set.
-    EXPECT_FALSE(ack_alarm->IsSet());
-  } else {
-    EXPECT_TRUE(ack_alarm->IsSet());
-  }
+  // Verify ack alarm is not set.
+  EXPECT_FALSE(ack_alarm->IsSet());
 }
 
 }  // namespace