Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

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 43 matching lines @@
                                                  QuicStreamOffset offset,
                                                  base::StringPiece data);
 
   // If |spdy_headers_frame_length| is non-null, it will be set to the size of
   // the SPDY headers frame created for this packet.
   scoped_ptr<QuicEncryptedPacket> MakeRequestHeadersPacket(
       QuicPacketNumber packet_number,
       QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      QuicPriority priority,
+      SpdyPriority priority,
       const SpdyHeaderBlock& headers,
       size_t* spdy_headers_frame_length);
 
   // Convenience method for calling MakeRequestHeadersPacket with nullptr for
   // |spdy_headers_frame_length|.
   scoped_ptr<QuicEncryptedPacket> MakeRequestHeadersPacket(
       QuicPacketNumber packet_number,
       QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
-      QuicPriority priority,
+      SpdyPriority priority,
       const SpdyHeaderBlock& headers);
 
   // If |spdy_headers_frame_length| is non-null, it will be set to the size of
   // the SPDY headers frame created for this packet.
   scoped_ptr<QuicEncryptedPacket> MakeResponseHeadersPacket(
       QuicPacketNumber packet_number,
       QuicStreamId stream_id,
       bool should_include_version,
       bool fin,
       const SpdyHeaderBlock& headers,
@@ skipping 30 matching lines @@
   MockRandom random_generator_;
   QuicPacketHeader header_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestPacketMaker);
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PACKET_MAKER_H_