commit d6c5bd08c17abb85043d3c1eece283e2aec05d4a
author fayang <fayang@google.com> Mon Jun 29 07:25:34 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 29 07:26:15 2020 -0700
tree e1f865771850ccc458499a320f6ab25974a45022
parent 67bd25dfc81511ba2381f62c53be066fdfa940f5

Deprecate gfe2_reloadable_flag_quic_fix_checking_should_generate_packet.

PiperOrigin-RevId: 318809766
Change-Id: I85851225f8d47e7295b7db6dc0059f099a5dd950

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index d6544ee..68af365 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -1868,10 +1868,6 @@
     QUIC_BUG << "Attempt to send empty crypto frame";
     return 0;
   }
-  if (!GetQuicReloadableFlag(quic_fix_checking_should_generate_packet) &&
-      !ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA, IS_HANDSHAKE)) {
-    return 0;
-  }
   if (level == ENCRYPTION_INITIAL) {
     MaybeActivateLegacyVersionEncapsulation();
   }

quic/core/quic_packet_creator.cc

diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 56c3050..e6f01ea 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -1360,13 +1360,9 @@
 
   size_t total_bytes_consumed = 0;
 
-  while (total_bytes_consumed < write_length &&
-         (!GetQuicReloadableFlag(quic_fix_checking_should_generate_packet) ||
-          delegate_->ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA,
-                                          IS_HANDSHAKE))) {
-    if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_fix_checking_should_generate_packet);
-    }
+  while (
+      total_bytes_consumed < write_length &&
+      delegate_->ShouldGeneratePacket(HAS_RETRANSMITTABLE_DATA, IS_HANDSHAKE)) {
     QuicFrame frame;
     if (!ConsumeCryptoDataToFillCurrentPacket(
             level, write_length - total_bytes_consumed,

quic/core/quic_packet_creator_test.cc

diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 7c4416d..771a34a 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -2659,31 +2659,14 @@
        ConsumeCryptoDataCheckShouldGeneratePacket) {
   delegate_.SetCanNotWrite();
 
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    EXPECT_CALL(delegate_, OnSerializedPacket(_)).Times(0);
-  } else {
-    EXPECT_CALL(delegate_, OnSerializedPacket(_))
-        .WillOnce(
-            Invoke(this, &QuicPacketCreatorMultiplePacketsTest::SavePacket));
-  }
+  EXPECT_CALL(delegate_, OnSerializedPacket(_)).Times(0);
   std::string data = "crypto data";
   size_t consumed_bytes =
       creator_.ConsumeCryptoData(ENCRYPTION_INITIAL, data, 0);
   creator_.Flush();
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    EXPECT_EQ(0u, consumed_bytes);
-  } else {
-    EXPECT_EQ(data.length(), consumed_bytes);
-  }
+  EXPECT_EQ(0u, consumed_bytes);
   EXPECT_FALSE(creator_.HasPendingFrames());
   EXPECT_FALSE(creator_.HasPendingRetransmittableFrames());
-  if (GetQuicReloadableFlag(quic_fix_checking_should_generate_packet)) {
-    return;
-  }
-  PacketContents contents;
-  contents.num_crypto_frames = 1;
-  contents.num_padding_frames = 1;
-  CheckPacketContains(contents, 0);
 }
 
 TEST_F(QuicPacketCreatorMultiplePacketsTest, ConsumeData_NotWritable) {