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 99c2ca4be9d0620f2edddb59000ee8132ba526e7..2fa60a5fe446d716d2ad6318e48d4d493dfa1d9b 100644 |
--- a/net/quic/test_tools/quic_test_packet_maker.cc |
+++ b/net/quic/test_tools/quic_test_packet_maker.cc |
@@ -176,7 +176,8 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket( |
bool should_include_version, |
bool fin, |
QuicPriority priority, |
- const SpdyHeaderBlock& headers) { |
+ const SpdyHeaderBlock& headers, |
+ size_t* spdy_headers_frame_length) { |
InitializeHeader(packet_number, should_include_version); |
scoped_ptr<SpdySerializedFrame> spdy_frame; |
if (spdy_request_framer_.protocol_version() == SPDY3) { |
@@ -193,18 +194,34 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket( |
headers_frame.set_has_priority(true); |
spdy_frame.reset(spdy_request_framer_.SerializeFrame(headers_frame)); |
} |
+ if (spdy_headers_frame_length) { |
+ *spdy_headers_frame_length = spdy_frame->size(); |
+ } |
QuicStreamFrame frame( |
kHeadersStreamId, false, 0, |
base::StringPiece(spdy_frame->data(), spdy_frame->size())); |
return MakePacket(header_, QuicFrame(&frame)); |
} |
-scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket( |
+scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket( |
QuicPacketNumber packet_number, |
QuicStreamId stream_id, |
bool should_include_version, |
bool fin, |
+ QuicPriority priority, |
const SpdyHeaderBlock& headers) { |
+ return MakeRequestHeadersPacket(packet_number, stream_id, |
+ should_include_version, fin, priority, |
+ headers, nullptr); |
+} |
+ |
+scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket( |
+ QuicPacketNumber packet_number, |
+ QuicStreamId stream_id, |
+ bool should_include_version, |
+ bool fin, |
+ const SpdyHeaderBlock& headers, |
+ size_t* spdy_headers_frame_length) { |
InitializeHeader(packet_number, should_include_version); |
scoped_ptr<SpdySerializedFrame> spdy_frame; |
if (spdy_request_framer_.protocol_version() == SPDY3) { |
@@ -218,12 +235,25 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket( |
headers_frame.set_fin(fin); |
spdy_frame.reset(spdy_request_framer_.SerializeFrame(headers_frame)); |
} |
+ if (spdy_headers_frame_length) { |
+ *spdy_headers_frame_length = spdy_frame->size(); |
+ } |
QuicStreamFrame frame( |
kHeadersStreamId, false, 0, |
base::StringPiece(spdy_frame->data(), spdy_frame->size())); |
return MakePacket(header_, QuicFrame(&frame)); |
} |
+scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket( |
+ QuicPacketNumber packet_number, |
+ QuicStreamId stream_id, |
+ bool should_include_version, |
+ bool fin, |
+ const SpdyHeaderBlock& headers) { |
+ return MakeResponseHeadersPacket( |
+ packet_number, stream_id, should_include_version, fin, headers, nullptr); |
+} |
+ |
SpdyHeaderBlock QuicTestPacketMaker::GetRequestHeaders( |
const std::string& method, |
const std::string& scheme, |