commit 02a2874218fa31a30f202e83ce2d1946fd34b926
author fayang <fayang@google.com> Wed Dec 04 07:09:38 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Dec 04 07:10:12 2019 -0800
tree 2a3becfaabe3d8f580d426e3f686366cddd23dbd
parent 3371b09895d17ce15d1390bb607f735ccb36086c

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_populate_nonretransmittable_frames.

PiperOrigin-RevId: 283749803
Change-Id: I1abe51429fb44942a25dc6a1d371d50669df6007

quic/core/quic_packet_creator.cc

diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index bb726e0..f95fe63 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -124,13 +124,8 @@
       next_transmission_type_(NOT_RETRANSMISSION),
       flusher_attached_(false),
       fully_pad_crypto_handshake_packets_(true),
-      latched_hard_max_packet_length_(0),
-      populate_nonretransmittable_frames_(
-          GetQuicReloadableFlag(quic_populate_nonretransmittable_frames)) {
+      latched_hard_max_packet_length_(0) {
   SetMaxPacketLength(kDefaultMaxPacketSize);
-  if (populate_nonretransmittable_frames_) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_populate_nonretransmittable_frames);
-  }
 }
 
 QuicPacketCreator::~QuicPacketCreator() {
@@ -1503,17 +1498,14 @@
       packet_.has_crypto_handshake = IS_HANDSHAKE;
     }
   } else {
-    if (populate_nonretransmittable_frames_ ||
-        framer_->version().CanSendCoalescedPackets()) {
-      if (frame.type == PADDING_FRAME &&
-          frame.padding_frame.num_padding_bytes == -1) {
-        // Populate the actual length of full padding frame, such that one can
-        // know how much padding is actually added.
-        packet_.nonretransmittable_frames.push_back(
-            QuicFrame(QuicPaddingFrame(frame_len)));
-      } else {
-        packet_.nonretransmittable_frames.push_back(frame);
-      }
+    if (frame.type == PADDING_FRAME &&
+        frame.padding_frame.num_padding_bytes == -1) {
+      // Populate the actual length of full padding frame, such that one can
+      // know how much padding is actually added.
+      packet_.nonretransmittable_frames.push_back(
+          QuicFrame(QuicPaddingFrame(frame_len)));
+    } else {
+      packet_.nonretransmittable_frames.push_back(frame);
     }
     queued_frames_.push_back(frame);
   }