Land Recent QUIC Changes.

net/quic/test_tools/quic_test_packet_maker.h

 // 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.
 //
 // Provides a simple interface for QUIC tests to create a variety of packets.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
 class QuicTestPacketMaker {
  public:
   QuicTestPacketMaker(QuicVersion version, QuicGuid guid);
   ~QuicTestPacketMaker();
 
   scoped_ptr<QuicEncryptedPacket> MakeRstPacket(
       QuicPacketSequenceNumber num,
       bool include_version,
       QuicStreamId stream_id,
       QuicRstStreamErrorCode error_code);
+  scoped_ptr<QuicEncryptedPacket> MakeAckAndRstPacket(
+      QuicPacketSequenceNumber num,
+      bool include_version,
+      QuicStreamId stream_id,
+      QuicRstStreamErrorCode error_code,
+      QuicPacketSequenceNumber largest_received,
+      QuicPacketSequenceNumber least_unacked,
+      bool send_feedback);
   scoped_ptr<QuicEncryptedPacket> MakeConnectionClosePacket(
       QuicPacketSequenceNumber num);
   scoped_ptr<QuicEncryptedPacket> MakeAckPacket(
       QuicPacketSequenceNumber sequence_number,
       QuicPacketSequenceNumber largest_received,
       QuicPacketSequenceNumber least_unacked,
       bool send_feedback);
   scoped_ptr<QuicEncryptedPacket> MakeDataPacket(
       QuicPacketSequenceNumber sequence_number,
       QuicStreamId stream_id,
@@ skipping 42 matching lines @@
   QuicPacketHeader header_;
   QuicSpdyCompressor compressor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestPacketMaker);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_