| Index: net/quic/test_tools/quic_test_packet_maker.h | 
| diff --git a/net/quic/test_tools/quic_test_packet_maker.h b/net/quic/test_tools/quic_test_packet_maker.h | 
| index a63bbfa4d3efb5eecca62b6972e4f2594bc9ca13..9769770100dd4dd14e7c9f564a47a8474d47a46b 100644 | 
| --- a/net/quic/test_tools/quic_test_packet_maker.h | 
| +++ b/net/quic/test_tools/quic_test_packet_maker.h | 
| @@ -58,6 +58,12 @@ class QuicTestPacketMaker { | 
| QuicPacketNumber largest_received, | 
| QuicPacketNumber least_unacked, | 
| bool send_feedback); | 
| +  scoped_ptr<QuicEncryptedPacket> MakeAckPacket( | 
| +      QuicPacketNumber packet_number, | 
| +      QuicPacketNumber largest_received, | 
| +      QuicPacketNumber ack_least_unacked, | 
| +      QuicPacketNumber stop_least_unacked, | 
| +      bool send_feedback); | 
| scoped_ptr<QuicEncryptedPacket> MakeDataPacket(QuicPacketNumber packet_number, | 
| QuicStreamId stream_id, | 
| bool should_include_version, | 
| @@ -76,15 +82,26 @@ class QuicTestPacketMaker { | 
| const SpdyHeaderBlock& headers, | 
| size_t* spdy_headers_frame_length); | 
|  | 
| +  scoped_ptr<QuicEncryptedPacket> MakeRequestHeadersPacket( | 
| +      QuicPacketNumber packet_number, | 
| +      QuicStreamId stream_id, | 
| +      bool should_include_version, | 
| +      bool fin, | 
| +      SpdyPriority priority, | 
| +      const SpdyHeaderBlock& headers, | 
| +      size_t* spdy_headers_frame_length, | 
| +      QuicStreamOffset* offset); | 
| + | 
| // Convenience method for calling MakeRequestHeadersPacket with nullptr for | 
| // |spdy_headers_frame_length|. | 
| -  scoped_ptr<QuicEncryptedPacket> MakeRequestHeadersPacket( | 
| +  scoped_ptr<QuicEncryptedPacket> MakeRequestHeadersPacketWithOffsetTracking( | 
| QuicPacketNumber packet_number, | 
| QuicStreamId stream_id, | 
| bool should_include_version, | 
| bool fin, | 
| SpdyPriority priority, | 
| -      const SpdyHeaderBlock& headers); | 
| +      const SpdyHeaderBlock& headers, | 
| +      QuicStreamOffset* offset); | 
|  | 
| // If |spdy_headers_frame_length| is non-null, it will be set to the size of | 
| // the SPDY headers frame created for this packet. | 
| @@ -94,22 +111,35 @@ class QuicTestPacketMaker { | 
| bool should_include_version, | 
| bool fin, | 
| const SpdyHeaderBlock& headers, | 
| +      size_t* spdy_headers_frame_length, | 
| +      QuicStreamOffset* offset); | 
| + | 
| +  scoped_ptr<QuicEncryptedPacket> MakeResponseHeadersPacket( | 
| +      QuicPacketNumber packet_number, | 
| +      QuicStreamId stream_id, | 
| +      bool should_include_version, | 
| +      bool fin, | 
| +      const SpdyHeaderBlock& headers, | 
| size_t* spdy_headers_frame_length); | 
|  | 
| // Convenience method for calling MakeResponseHeadersPacket with nullptr for | 
| // |spdy_headers_frame_length|. | 
| -  scoped_ptr<QuicEncryptedPacket> MakeResponseHeadersPacket( | 
| +  scoped_ptr<QuicEncryptedPacket> MakeResponseHeadersPacketWithOffsetTracking( | 
| QuicPacketNumber packet_number, | 
| QuicStreamId stream_id, | 
| bool should_include_version, | 
| bool fin, | 
| -      const SpdyHeaderBlock& headers); | 
| +      const SpdyHeaderBlock& headers, | 
| +      QuicStreamOffset* offset); | 
|  | 
| SpdyHeaderBlock GetRequestHeaders(const std::string& method, | 
| const std::string& scheme, | 
| const std::string& path); | 
| SpdyHeaderBlock GetResponseHeaders(const std::string& status); | 
|  | 
| +  SpdyHeaderBlock GetResponseHeaders(const std::string& status, | 
| +                                     const std::string& alt_svc); | 
| + | 
| private: | 
| scoped_ptr<QuicEncryptedPacket> MakePacket(const QuicPacketHeader& header, | 
| const QuicFrame& frame); | 
|  |