commit c6312d40bdb02f4f3d022d363781c7438709ab29
author fayang <fayang@google.com> Mon Jul 06 08:15:28 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 06 08:16:04 2020 -0700
tree 032b03cb6e3c49e7530af00a783d2e61bbc20f1e
parent 1765b6e83595624adf8c5420ee7fa5776dd1d9e1

Deprecate gfe2_reloadable_flag_quic_bundle_crypto_data_with_initial_ack.

PiperOrigin-RevId: 319781953
Change-Id: Iccb28774a778ab2b9c57be5c9b2e8e5ca65cb3ed

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 3263eb9..6d6c93a 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4234,19 +4234,15 @@
   QuicTime earliest_ack_timeout =
       uber_received_packet_manager_.GetEarliestAckTimeout();
   QUIC_BUG_IF(!earliest_ack_timeout.IsInitialized());
-  if (GetQuicReloadableFlag(quic_bundle_crypto_data_with_initial_ack)) {
-    // On the server side, sends INITIAL data with INITIAL ACK. On the client
-    // side, sends HANDSHAKE data (containing client Finished) with HANDSHAKE
-    // ACK.
-    PacketNumberSpace space =
-        perspective() == Perspective::IS_SERVER ? INITIAL_DATA : HANDSHAKE_DATA;
-    MaybeBundleCryptoDataWithAckOfSpace(space);
-    earliest_ack_timeout =
-        uber_received_packet_manager_.GetEarliestAckTimeout();
-    if (!earliest_ack_timeout.IsInitialized()) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_bundle_crypto_data_with_initial_ack);
-      return;
-    }
+  // On the server side, sends INITIAL data with INITIAL ACK. On the client
+  // side, sends HANDSHAKE data (containing client Finished) with HANDSHAKE
+  // ACK.
+  PacketNumberSpace space =
+      perspective() == Perspective::IS_SERVER ? INITIAL_DATA : HANDSHAKE_DATA;
+  MaybeBundleCryptoDataWithAckOfSpace(space);
+  earliest_ack_timeout = uber_received_packet_manager_.GetEarliestAckTimeout();
+  if (!earliest_ack_timeout.IsInitialized()) {
+    return;
   }
   // Latches current encryption level.
   const EncryptionLevel current_encryption_level = encryption_level_;

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index ace423a..b9f1fc5 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -11256,18 +11256,11 @@
   // Receives packet 1002 in initial data.
   ProcessCryptoPacketAtLevel(1002, ENCRYPTION_INITIAL);
   EXPECT_FALSE(writer_->ack_frames().empty());
-  if (GetQuicReloadableFlag(quic_bundle_crypto_data_with_initial_ack)) {
-    // Verify CRYPTO frame is bundled with INITIAL ACK.
-    EXPECT_FALSE(writer_->crypto_frames().empty());
-    // Verify PTO time changes.
-    EXPECT_NE(expected_pto_time,
-              connection_.sent_packet_manager().GetRetransmissionTime());
-  } else {
-    EXPECT_TRUE(writer_->crypto_frames().empty());
-    // Verify PTO time does not change.
-    EXPECT_EQ(expected_pto_time,
-              connection_.sent_packet_manager().GetRetransmissionTime());
-  }
+  // Verify CRYPTO frame is bundled with INITIAL ACK.
+  EXPECT_FALSE(writer_->crypto_frames().empty());
+  // Verify PTO time changes.
+  EXPECT_NE(expected_pto_time,
+            connection_.sent_packet_manager().GetRetransmissionTime());
 }
 
 TEST_P(QuicConnectionTest, ClientBundlesHandshakeDataWithHandshakeAck) {
@@ -11300,12 +11293,8 @@
   // Receives packet 1002 in handshake data.
   ProcessCryptoPacketAtLevel(1002, ENCRYPTION_HANDSHAKE);
   EXPECT_FALSE(writer_->ack_frames().empty());
-  if (GetQuicReloadableFlag(quic_bundle_crypto_data_with_initial_ack)) {
-    // Verify CRYPTO frame is bundled with HANDSHAKE ACK.
-    EXPECT_FALSE(writer_->crypto_frames().empty());
-  } else {
-    EXPECT_TRUE(writer_->crypto_frames().empty());
-  }
+  // Verify CRYPTO frame is bundled with HANDSHAKE ACK.
+  EXPECT_FALSE(writer_->crypto_frames().empty());
 }
 
 // Regresstion test for b/156232673.