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 f2f5d3566947dedeb13fb341a64a44ee872fe8b7..91d8b5ceca32903c16df8268b0b15bf361cba166 100644 |
--- a/net/quic/test_tools/quic_test_packet_maker.cc |
+++ b/net/quic/test_tools/quic_test_packet_maker.cc |
@@ -365,18 +365,12 @@ QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket( |
const std::vector<std::string>& data_writes) { |
InitializeHeader(packet_number, should_include_version); |
SpdySerializedFrame spdy_frame; |
Bence
2016/11/21 17:50:45
Could you please combine this line with assignment
|
- if (spdy_request_framer_.protocol_version() == SPDY3) { |
- SpdySynStreamIR syn_stream(stream_id, std::move(headers)); |
- syn_stream.set_fin(fin); |
- syn_stream.set_priority(priority); |
- spdy_frame = spdy_request_framer_.SerializeSynStream(syn_stream); |
- } else { |
- SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
- headers_frame.set_fin(fin); |
- headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority)); |
- headers_frame.set_has_priority(true); |
- spdy_frame = spdy_request_framer_.SerializeFrame(headers_frame); |
- } |
+ SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
+ headers_frame.set_fin(fin); |
+ headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority)); |
+ headers_frame.set_has_priority(true); |
+ spdy_frame = spdy_request_framer_.SerializeFrame(headers_frame); |
+ |
if (spdy_headers_frame_length) { |
*spdy_headers_frame_length = spdy_frame.size(); |
} |
@@ -432,18 +426,12 @@ QuicTestPacketMaker::MakeRequestHeadersPacket(QuicPacketNumber packet_number, |
QuicStreamOffset* offset) { |
InitializeHeader(packet_number, should_include_version); |
SpdySerializedFrame spdy_frame; |
- if (spdy_request_framer_.protocol_version() == SPDY3) { |
- SpdySynStreamIR syn_stream(stream_id, std::move(headers)); |
- syn_stream.set_fin(fin); |
- syn_stream.set_priority(priority); |
- spdy_frame = spdy_request_framer_.SerializeSynStream(syn_stream); |
- } else { |
- SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
- headers_frame.set_fin(fin); |
- headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority)); |
- headers_frame.set_has_priority(true); |
- spdy_frame = spdy_request_framer_.SerializeFrame(headers_frame); |
- } |
+ SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
+ headers_frame.set_fin(fin); |
+ headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority)); |
+ headers_frame.set_has_priority(true); |
+ spdy_frame = spdy_request_framer_.SerializeFrame(headers_frame); |
+ |
if (spdy_headers_frame_length) { |
*spdy_headers_frame_length = spdy_frame.size(); |
} |
@@ -543,15 +531,10 @@ QuicTestPacketMaker::MakeResponseHeadersPacket( |
QuicStreamOffset* offset) { |
InitializeHeader(packet_number, should_include_version); |
SpdySerializedFrame spdy_frame; |
- if (spdy_response_framer_.protocol_version() == SPDY3) { |
- SpdySynReplyIR syn_reply(stream_id, std::move(headers)); |
- syn_reply.set_fin(fin); |
- spdy_frame = spdy_response_framer_.SerializeSynReply(syn_reply); |
- } else { |
- SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
- headers_frame.set_fin(fin); |
- spdy_frame = spdy_response_framer_.SerializeFrame(headers_frame); |
- } |
+ SpdyHeadersIR headers_frame(stream_id, std::move(headers)); |
+ headers_frame.set_fin(fin); |
+ spdy_frame = spdy_response_framer_.SerializeFrame(headers_frame); |
+ |
if (spdy_headers_frame_length) { |
*spdy_headers_frame_length = spdy_frame.size(); |
} |