commit 1f8619fa23bd8bd2861a78d3f655fba2f00b77c7
author fayang <fayang@google.com> Mon Mar 16 08:39:58 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 16 08:40:37 2020 -0700
tree 9a549e7495d48abc63a1596b0e4e8cb026c4b1d5
parent 639a4bf5ff46e4b49a6ccc3677fd0f8122419503

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_neuter_unencrypted_control_frames.

PiperOrigin-RevId: 301164611
Change-Id: I22981c5095149ba725b978c3f44b4849185fcbe1

quic/core/quic_sent_packet_manager_test.cc

diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index b47e528..93c36cd 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -3728,14 +3728,10 @@
   SendCryptoPacket(1);
   SendPingPacket(2, ENCRYPTION_INITIAL);
   // Crypto data has been discarded but ping does not.
-  if (GetQuicReloadableFlag(quic_neuter_unencrypted_control_frames)) {
-    EXPECT_CALL(notifier_, OnFrameAcked(_, _, _))
-        .Times(2)
-        .WillOnce(Return(false))
-        .WillOnce(Return(true));
-  } else {
-    EXPECT_CALL(notifier_, OnFrameAcked(_, _, _)).Times(0);
-  }
+  EXPECT_CALL(notifier_, OnFrameAcked(_, _, _))
+      .Times(2)
+      .WillOnce(Return(false))
+      .WillOnce(Return(true));
   EXPECT_CALL(notifier_, IsFrameOutstanding(_)).WillRepeatedly(Return(false));
   if (GetQuicReloadableFlag(
           quic_avoid_overestimate_bandwidth_with_aggregation)) {

quic/core/quic_unacked_packet_map.cc

diff --git a/quic/core/quic_unacked_packet_map.cc b/quic/core/quic_unacked_packet_map.cc
index efb8e65..8276f1c 100644
--- a/quic/core/quic_unacked_packet_map.cc
+++ b/quic/core/quic_unacked_packet_map.cc
@@ -222,16 +222,10 @@
       RemoveFromInFlight(packet_number);
       it->state = NEUTERED;
       neutered_packets.push_back(packet_number);
-      if (GetQuicReloadableFlag(quic_neuter_unencrypted_control_frames) ||
-          supports_multiple_packet_number_spaces_) {
-        if (GetQuicReloadableFlag(quic_neuter_unencrypted_control_frames)) {
-          QUIC_RELOADABLE_FLAG_COUNT(quic_neuter_unencrypted_control_frames);
-        }
-        // Notify session that the data has been delivered (but do not notify
-        // send algorithm).
-        // TODO(b/148868195): use NotifyFramesNeutered.
-        NotifyFramesAcked(*it, QuicTime::Delta::Zero(), QuicTime::Zero());
-      }
+      // Notify session that the data has been delivered (but do not notify
+      // send algorithm).
+      // TODO(b/148868195): use NotifyFramesNeutered.
+      NotifyFramesAcked(*it, QuicTime::Delta::Zero(), QuicTime::Zero());
       DCHECK(!HasRetransmittableFrames(*it));
     }
   }