commit e426d62cebb7dbe9c3c5496b5320aeb418db7e1b
author renjietang <renjietang@google.com> Thu Jan 02 11:58:46 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Jan 02 11:59:28 2020 -0800
tree a56c696142609ff372b00676be532655a1a66721
parent 6c2dbdb95570b7f566b0a49dc0422015169d4cc5

gfe-relnote: deprecate gfe2_restart_flag_quic_coalesce_stream_frames_2

PiperOrigin-RevId: 287871462
Change-Id: Ibc97d2acc253dc3c72a8246798df4098f81cbf2e

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 0134fb6..cbf18a4 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -316,10 +316,6 @@
     if (level != ENCRYPTION_INITIAL && level != ENCRYPTION_HANDSHAKE) {
       frames_.push_back(QuicFrame(
           QuicStreamFrame(stream_id, false, 0u, quiche::QuicheStringPiece())));
-      if (!GetQuicRestartFlag(quic_coalesce_stream_frames_2)) {
-        frames_.push_back(QuicFrame(
-            QuicStreamFrame(stream_id, true, 0u, quiche::QuicheStringPiece())));
-      }
     }
     SerializedPacket serialized = SerializeAllFrames(frames_);
     EXPECT_EQ(level, serialized.encryption_level);
@@ -342,9 +338,6 @@
           .WillOnce(Return(true));
       if (level != ENCRYPTION_INITIAL && level != ENCRYPTION_HANDSHAKE) {
         EXPECT_CALL(framer_visitor_, OnStreamFrame(_));
-        if (!GetQuicRestartFlag(quic_coalesce_stream_frames_2)) {
-          EXPECT_CALL(framer_visitor_, OnStreamFrame(_));
-        }
       }
       if (client_framer_.version().HasHeaderProtection()) {
         EXPECT_CALL(framer_visitor_, OnPaddingFrame(_))
@@ -2002,7 +1995,6 @@
   if (!GetParam().version_serialization) {
     creator_.StopSendingVersion();
   }
-  SetQuicRestartFlag(quic_coalesce_stream_frames_2, true);
   const size_t max_plaintext_size =
       client_framer_.GetMaxPlaintextSize(creator_.max_packet_length());
   EXPECT_FALSE(creator_.HasPendingFrames());
@@ -2816,8 +2808,7 @@
   EXPECT_FALSE(creator_.HasPendingRetransmittableFrames());
 
   PacketContents contents;
-  contents.num_stream_frames =
-      GetQuicRestartFlag(quic_coalesce_stream_frames_2) ? 1 : 2;
+  contents.num_stream_frames = 1;
   CheckPacketContains(contents, 0);
 }