commit 3c3e8905ad7ef0dded8d6231087fcc6e3b6a1051
author fayang <fayang@google.com> Wed Sep 30 05:41:20 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 30 05:41:49 2020 -0700
tree 0864f6e54e64ad22121f3c9c7e5a6166607d160a
parent b66dd3648b89b1cf9ec8342b42b71fb442484b35

Deprecate gfe2_reloadable_flag_quic_no_silent_close_for_idle_timeout.

PiperOrigin-RevId: 334579904
Change-Id: I249312f64db974e7b09c39c269dc19c62ed67191

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index ccc2166..e179981 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -538,9 +538,7 @@
       idle_timeout_connection_close_behavior_ = ConnectionCloseBehavior::
           SILENT_CLOSE_WITH_CONNECTION_CLOSE_PACKET_SERIALIZED;
     }
-    if (GetQuicReloadableFlag(quic_no_silent_close_for_idle_timeout) &&
-        config.HasClientRequestedIndependentOption(kNSLC, perspective_)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_no_silent_close_for_idle_timeout);
+    if (config.HasClientRequestedIndependentOption(kNSLC, perspective_)) {
       idle_timeout_connection_close_behavior_ =
           ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET;
     }

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 0921d95..3acac1c 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -10981,13 +10981,7 @@
   EXPECT_CALL(visitor_,
               OnConnectionClosed(_, ConnectionCloseSource::FROM_SELF));
   connection_.GetTimeoutAlarm()->Fire();
-  if (GetQuicReloadableFlag(quic_no_silent_close_for_idle_timeout)) {
-    TestConnectionCloseQuicErrorCode(QUIC_NETWORK_IDLE_TIMEOUT);
-  } else {
-    // Verify no connection close packet is serialized.
-    EXPECT_EQ(nullptr,
-              QuicConnectionPeer::GetConnectionClosePacket(&connection_));
-  }
+  TestConnectionCloseQuicErrorCode(QUIC_NETWORK_IDLE_TIMEOUT);
 }
 
 TEST_P(QuicConnectionTest, DonotSendPing) {