commit b94ffb210540c85c6776b438db2137bed7c51034
author fayang <fayang@google.com> Tue Aug 25 14:00:09 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Aug 25 14:00:42 2020 -0700
tree 60fa8a2fee205a047c4a3abe30b737a14ffcf785
parent 7cd1d82a3d9c1ef576aba9c075596a2aff4f232c

Deprecate gfe2_reloadable_flag_quic_retransmit_handshake_data_early.

PiperOrigin-RevId: 328398697
Change-Id: I33175a557b7a1d9b2291903c356d08e0f460d855

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 4677258..f0769fd 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4318,23 +4318,15 @@
 
 void QuicConnection::MaybeBundleCryptoDataWithAcks() {
   DCHECK(SupportsMultiplePacketNumberSpaces());
-  if (GetQuicReloadableFlag(quic_retransmit_handshake_data_early) &&
-      IsHandshakeConfirmed()) {
+  if (IsHandshakeConfirmed()) {
     return;
   }
   PacketNumberSpace space = HANDSHAKE_DATA;
-  if (perspective() == Perspective::IS_SERVER) {
-    // On the server side, sends INITIAL data with INITIAL ACK. On the client
-    // side, sends HANDSHAKE data (containing client Finished) with HANDSHAKE
-    // ACK.
+  if (perspective() == Perspective::IS_SERVER &&
+      framer_.HasEncrypterOfEncryptionLevel(ENCRYPTION_INITIAL)) {
+    // On the server side, sends INITIAL data with INITIAL ACK if initial key is
+    // available.
     space = INITIAL_DATA;
-    if (GetQuicReloadableFlag(quic_retransmit_handshake_data_early)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_retransmit_handshake_data_early);
-      if (!framer_.HasEncrypterOfEncryptionLevel(ENCRYPTION_INITIAL)) {
-        // Retransmit HANDSHAKE data early.
-        space = HANDSHAKE_DATA;
-      }
-    }
   }
   const QuicTime ack_timeout =
       uber_received_packet_manager_.GetAckTimeout(space);

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 3dd3cc2..0f1a8dc 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -11442,12 +11442,8 @@
   clock_.AdvanceTime(kAlarmGranularity);
   connection_.GetAckAlarm()->Fire();
   EXPECT_FALSE(writer_->ack_frames().empty());
-  if (GetQuicReloadableFlag(quic_retransmit_handshake_data_early)) {
-    // Verify handshake data gets retransmitted early.
-    EXPECT_FALSE(writer_->crypto_frames().empty());
-  } else {
-    EXPECT_TRUE(writer_->crypto_frames().empty());
-  }
+  // Verify handshake data gets retransmitted early.
+  EXPECT_FALSE(writer_->crypto_frames().empty());
 }
 
 // Regression test for b/161228202