commit 98669f5736efe8ff3350ce1f16cb100c4051cb33
author wub <wub@google.com> Thu Apr 18 10:49:18 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 18 11:40:22 2019 -0700
tree 3b8e5a475515215613d5316aea93f8420b86fbf5
parent 881af2bceb9e41e6bf4fa63185d248486ea0ab9a

gfe-relnote: (n/a) Deprecate --gfe2_reloadable_flag_quic_set_transmission_type_for_next_frame.

PiperOrigin-RevId: 244216881
Change-Id: Ie570b14c4d019acb3df7e000eb1209e2d32dddb6

quic/core/quic_packet_creator.cc

diff --git a/quic/core/quic_packet_creator.cc b/quic/core/quic_packet_creator.cc
index 96b5bc6..548b504 100644
--- a/quic/core/quic_packet_creator.cc
+++ b/quic/core/quic_packet_creator.cc
@@ -82,9 +82,7 @@
               false),
       pending_padding_bytes_(0),
       needs_full_padding_(false),
-      can_set_transmission_type_(false),
-      set_transmission_type_for_next_frame_(
-          GetQuicReloadableFlag(quic_set_transmission_type_for_next_frame)) {
+      can_set_transmission_type_(false) {
   SetMaxPacketLength(kDefaultMaxPacketSize);
 }
 
@@ -395,9 +393,7 @@
   packet_.has_crypto_handshake = NOT_HANDSHAKE;
   packet_.num_padding_bytes = 0;
   packet_.original_packet_number.Clear();
-  if (!can_set_transmission_type_ || ShouldSetTransmissionTypeForNextFrame()) {
-    packet_.transmission_type = NOT_RETRANSMISSION;
-  }
+  packet_.transmission_type = NOT_RETRANSMISSION;
   packet_.encrypted_buffer = nullptr;
   packet_.encrypted_length = 0;
   DCHECK(packet_.retransmittable_frames.empty());
@@ -468,9 +464,7 @@
     return;
   }
 
-  if (ShouldSetTransmissionTypeForNextFrame()) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_set_transmission_type_for_next_frame, 1,
-                                 2);
+  if (can_set_transmission_type()) {
     packet_.transmission_type = transmission_type;
   }
 
@@ -892,10 +886,8 @@
 
   // Packet transmission type is determined by the last added retransmittable
   // frame.
-  if (ShouldSetTransmissionTypeForNextFrame() &&
+  if (can_set_transmission_type() &&
       QuicUtils::IsRetransmittableFrame(frame.type)) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(quic_set_transmission_type_for_next_frame, 2,
-                                 2);
     packet_.transmission_type = transmission_type;
   }
   return true;
@@ -977,7 +969,7 @@
 void QuicPacketCreator::SetTransmissionType(TransmissionType type) {
   DCHECK(can_set_transmission_type_);
 
-  if (!ShouldSetTransmissionTypeForNextFrame()) {
+  if (!can_set_transmission_type()) {
     QUIC_DVLOG_IF(1, type != packet_.transmission_type)
         << ENDPOINT << "Setting Transmission type to "
         << QuicUtils::TransmissionTypeToString(type);