Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/test_tools/quic_test_packet_maker.cc

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 7590208e09722e812ad54145b5fc9bbb2f578a34..f2f5d3566947dedeb13fb341a64a44ee872fe8b7 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -47,7 +47,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakePingPacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicPingFrame ping;
   return std::unique_ptr<QuicReceivedPacket>(
@@ -75,7 +74,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeRstPacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicRstStreamFrame rst(stream_id, error_code, bytes_written);
   DVLOG(1) << "Adding frame: " << QuicFrame(&rst);
@@ -99,7 +97,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = QuicTime::Delta::Zero();
@@ -151,7 +148,6 @@ QuicTestPacketMaker::MakeAckAndConnectionClosePacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = ack_delay_time;
@@ -199,7 +195,6 @@ QuicTestPacketMaker::MakeConnectionClosePacket(QuicPacketNumber num) {
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicConnectionCloseFrame close;
   close.error_code = QUIC_CRYPTO_VERSION_NOT_SUPPORTED;
@@ -219,7 +214,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeGoAwayPacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = num;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicGoAwayFrame goaway;
   goaway.error_code = error_code;
@@ -253,7 +247,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket(
   header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header.packet_number = packet_number;
   header.entropy_flag = false;
-  header.fec_flag = false;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = QuicTime::Delta::Zero();
@@ -665,7 +658,6 @@ void QuicTestPacketMaker::InitializeHeader(QuicPacketNumber packet_number,
   header_.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header_.packet_number = packet_number;
   header_.entropy_flag = false;
-  header_.fec_flag = false;
 }
 
 }  // namespace test