Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Unified Diff: net/quic/test_tools/quic_test_packet_maker.cc

Issue 2515143002: Removing SPDY3 from the code base. (Closed)
Patch Set: Addressed a failure on windows. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/spdy/hpack/hpack_decoder_interface.h » ('j') | net/spdy/spdy_framer_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | net/spdy/hpack/hpack_decoder_interface.h » ('j') | net/spdy/spdy_framer_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698