Land Recent QUIC Changes.

net/quic/test_tools/quic_test_packet_maker.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/quic_test_packet_maker.h"
 
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_http_utils.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
@@ skipping 53 matching lines @@
   QuicFrames frames;
   frames.push_back(QuicFrame(&ack));
   if (send_feedback) {
     QuicCongestionFeedbackFrame feedback;
     feedback.type = kTCP;
     feedback.tcp.receive_window = 256000;
 
     frames.push_back(QuicFrame(&feedback));
   }
 
+  if (version_ > QUIC_VERSION_15) {
+    QuicStopWaitingFrame stop_waiting;
+    stop_waiting.least_unacked = least_unacked;
+    frames.push_back(QuicFrame(&stop_waiting));
+  }
+
   QuicRstStreamFrame rst(stream_id, error_code, 0);
   frames.push_back(QuicFrame(&rst));
 
   QuicFramer framer(SupportedVersions(version_), QuicTime::Zero(), false);
   scoped_ptr<QuicPacket> packet(
       framer.BuildUnsizedDataPacket(header, frames).packet);
   return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
       ENCRYPTION_NONE, header.packet_sequence_number, *packet));
 }
 
@@ skipping 35 matching lines @@
   QuicCongestionFeedbackFrame feedback;
   feedback.type = kTCP;
   feedback.tcp.receive_window = 256000;
 
   QuicFramer framer(SupportedVersions(version_), QuicTime::Zero(), false);
   QuicFrames frames;
   frames.push_back(QuicFrame(&ack));
   if (send_feedback) {
     frames.push_back(QuicFrame(&feedback));
   }
+
+  if (version_ > QUIC_VERSION_15) {
+    QuicStopWaitingFrame stop_waiting;
+    stop_waiting.least_unacked = least_unacked;
+    frames.push_back(QuicFrame(&stop_waiting));
+  }
+
   scoped_ptr<QuicPacket> packet(
       framer.BuildUnsizedDataPacket(header, frames).packet);
   return scoped_ptr<QuicEncryptedPacket>(framer.EncryptPacket(
       ENCRYPTION_NONE, header.packet_sequence_number, *packet));
 }
 
 // Returns a newly created packet to send kData on stream 1.
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeDataPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
@@ skipping 108 matching lines @@
 
 std::string QuicTestPacketMaker::SerializeHeaderBlock(
     const SpdyHeaderBlock& headers) {
   QuicSpdyCompressor compressor;
   return compressor.CompressHeadersWithPriority(
       ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY), headers);
 }
 
 }  // namespace test
 }  // namespace net