Land Recent QUIC Changes.

net/quic/test_tools/quic_test_packet_maker.cc

Index: net/quic/test_tools/quic_test_packet_maker.cc
diff --git a/net/quic/test_tools/quic_test_packet_maker.cc b/net/quic/test_tools/quic_test_packet_maker.cc
index 69697409afbea563adc75fd5f6c852e1d7b7ba3a..1fadb29b54e216b9b60909849dec0bf20edcca46 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -71,6 +71,12 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
     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));
 
@@ -126,6 +132,13 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckPacket(
   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(