Remove obsolete fields in quic_protocol and their current usage in QUIC. Reorders QuicAckFrame fie…

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 08aca3aac2a3902979185673f6ad6b6ad48b4e58..6b969de0ae9dbf7415ce6d73606f8b3745e2556a 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -48,7 +48,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakePingPacket(
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicPingFrame ping;
   return std::unique_ptr<QuicReceivedPacket>(
@@ -77,7 +76,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeRstPacket(
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicRstStreamFrame rst(stream_id, error_code, bytes_written);
   DVLOG(1) << "Adding frame: " << QuicFrame(&rst);
@@ -102,7 +100,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = QuicTime::Delta::Zero();
@@ -155,7 +152,6 @@ QuicTestPacketMaker::MakeAckAndConnectionClosePacket(
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = ack_delay_time;
@@ -204,7 +200,6 @@ QuicTestPacketMaker::MakeConnectionClosePacket(QuicPacketNumber num) {
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicConnectionCloseFrame close;
   close.error_code = QUIC_CRYPTO_VERSION_NOT_SUPPORTED;
@@ -225,7 +220,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeGoAwayPacket(
   header.packet_number = num;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicGoAwayFrame goaway;
   goaway.error_code = error_code;
@@ -260,7 +254,6 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket(
   header.packet_number = packet_number;
   header.entropy_flag = false;
   header.fec_flag = false;
-  header.fec_group = 0;
 
   QuicAckFrame ack(MakeAckFrame(largest_received));
   ack.ack_delay_time = QuicTime::Delta::Zero();
@@ -622,7 +615,6 @@ void QuicTestPacketMaker::InitializeHeader(QuicPacketNumber packet_number,
   header_.public_header.version_flag = should_include_version;
   header_.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
   header_.packet_number = packet_number;
-  header_.fec_group = 0;
   header_.entropy_flag = false;
   header_.fec_flag = false;
 }