QUIC - expand server push test coverage and fix recent regression.

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 <stddef.h>
@@ skipping 134 matching lines @@
   MakeRequestHeadersPacketWithOffsetTracking(QuicPacketNumber packet_number,
                                              QuicStreamId stream_id,
                                              bool should_include_version,
                                              bool fin,
                                              SpdyPriority priority,
                                              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.
+  std::unique_ptr<QuicReceivedPacket> MakePushPromisePacket(
+      QuicPacketNumber packet_number,
+      QuicStreamId stream_id,
+      QuicStreamId promised_stream_id,
+      bool should_include_version,
+      bool fin,
+      SpdyHeaderBlock headers,
+      size_t* spdy_headers_frame_length,
+      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.
   std::unique_ptr<QuicReceivedPacket> MakeResponseHeadersPacket(
       QuicPacketNumber packet_number,
       QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
       SpdyHeaderBlock headers,
       size_t* spdy_headers_frame_length,
       QuicStreamOffset* offset);
 
   std::unique_ptr<QuicReceivedPacket> MakeResponseHeadersPacket(
@@ skipping 42 matching lines @@
   QuicPacketHeader header_;
   Perspective perspective_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestPacketMaker);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_