Removing SPDY3 from the code base.

net/quic/test_tools/quic_test_packet_maker.cc

 // 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.
 
 #include "net/quic/test_tools/quic_test_packet_maker.h"
 
 #include <list>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 346 matching lines @@
 QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket(
     QuicPacketNumber packet_number,
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
     SpdyPriority priority,
     SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length,
     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 below in line 372?

-  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();
   }
   QuicStreamFrame frame(
       kHeadersStreamId, false, 0,
       base::StringPiece(spdy_frame.data(), spdy_frame.size()));
 
   QuicFrames frames;
   frames.push_back(QuicFrame(&frame));
 
@@ skipping 35 matching lines @@
 QuicTestPacketMaker::MakeRequestHeadersPacket(QuicPacketNumber packet_number,
                                               QuicStreamId stream_id,
                                               bool should_include_version,
                                               bool fin,
                                               SpdyPriority priority,
                                               SpdyHeaderBlock headers,
                                               size_t* spdy_headers_frame_length,
                                               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();
   }
   if (offset != nullptr) {
     QuicStreamFrame frame(
         kHeadersStreamId, false, *offset,
         base::StringPiece(spdy_frame.data(), spdy_frame.size()));
     *offset += spdy_frame.size();
     return MakePacket(header_, QuicFrame(&frame));
   } else {
@@ skipping 79 matching lines @@
 QuicTestPacketMaker::MakeResponseHeadersPacket(
     QuicPacketNumber packet_number,
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
     SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length,
     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();
   }
   if (offset != nullptr) {
     QuicStreamFrame frame(
         kHeadersStreamId, false, *offset,
         base::StringPiece(spdy_frame.data(), spdy_frame.size()));
     *offset += spdy_frame.size();
     return MakePacket(header_, QuicFrame(&frame));
   } else {
@@ skipping 90 matching lines @@
   header_.public_header.connection_id = connection_id_;
   header_.public_header.reset_flag = false;
   header_.public_header.version_flag = should_include_version;
   header_.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header_.packet_number = packet_number;
   header_.entropy_flag = false;
 }
 
 }  // namespace test
 }  // namespace net