deprecate FLAGS_quic_disable_pre_34

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index c97fe1f7696460ff1903731350b5dc4eab2801fb..0ad39f1f4e609a3014d5506b535d27c2b6c58b3c 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -38,24 +38,12 @@ namespace test {
 QuicAckFrame MakeAckFrame(QuicPacketNumber largest_observed) {
   QuicAckFrame ack;
   ack.largest_observed = largest_observed;
-  ack.entropy_hash = 0;
-  return ack;
-}
-
-QuicAckFrame MakeAckFrameWithNackRanges(size_t num_nack_ranges,
-                                        QuicPacketNumber least_unacked) {
-  QuicAckFrame ack = MakeAckFrame(2 * num_nack_ranges + least_unacked);
-  // Add enough missing packets to get num_nack_ranges nack ranges.
-  for (QuicPacketNumber i = 1; i < 2 * num_nack_ranges; i += 2) {
-    ack.packets.Add(least_unacked + i);
-  }
   return ack;
 }
 
 QuicAckFrame MakeAckFrameWithAckBlocks(size_t num_ack_blocks,
                                        QuicPacketNumber least_unacked) {
   QuicAckFrame ack = MakeAckFrame(2 * num_ack_blocks + least_unacked);
-  ack.missing = false;
   // Add enough received packets to get num_ack_blocks ack blocks.
   for (QuicPacketNumber i = 2; i < 2 * num_ack_blocks + 1; i += 2) {
     ack.packets.Add(least_unacked + i);
@@ -645,8 +633,6 @@ QuicEncryptedPacket* ConstructEncryptedPacket(
   header.public_header.packet_number_length = packet_number_length;
   header.path_id = path_id;
   header.packet_number = packet_number;
-  header.entropy_flag = false;
-  header.entropy_hash = 0;
   QuicStreamFrame stream_frame(1, false, 0, StringPiece(data));
   QuicFrame frame(&stream_frame);
   QuicFrames frames;
@@ -695,8 +681,6 @@ QuicEncryptedPacket* ConstructMisFramedEncryptedPacket(
   header.public_header.packet_number_length = packet_number_length;
   header.path_id = path_id;
   header.packet_number = packet_number;
-  header.entropy_flag = false;
-  header.entropy_hash = 0;
   QuicStreamFrame stream_frame(1, false, 0, StringPiece(data));
   QuicFrame frame(&stream_frame);
   QuicFrames frames;
@@ -708,20 +692,11 @@ QuicEncryptedPacket* ConstructMisFramedEncryptedPacket(
       BuildUnsizedDataPacket(&framer, header, frames));
   EXPECT_TRUE(packet != nullptr);
 
-  if (framer.version() <= QUIC_VERSION_33) {
-    // Now set the packet's private flags byte to 0xFF, which is an invalid
-    // value.
-    reinterpret_cast<unsigned char*>(
-        packet->mutable_data())[GetStartOfEncryptedData(
-        framer.version(), connection_id_length, version_flag, multipath_flag,
-        false /* no diversification nonce */, packet_number_length)] = 0xFF;
-  } else {
-    // Now set the frame type to 0x1F, which is an invalid frame type.
-    reinterpret_cast<unsigned char*>(
-        packet->mutable_data())[GetStartOfEncryptedData(
-        framer.version(), connection_id_length, version_flag, multipath_flag,
-        false /* no diversification nonce */, packet_number_length)] = 0x1F;
-  }
+  // Now set the frame type to 0x1F, which is an invalid frame type.
+  reinterpret_cast<unsigned char*>(
+      packet->mutable_data())[GetStartOfEncryptedData(
+      framer.version(), connection_id_length, version_flag, multipath_flag,
+      false /* no diversification nonce */, packet_number_length)] = 0x1F;
 
   char* buffer = new char[kMaxPacketSize];
   size_t encrypted_length = framer.EncryptPayload(
@@ -788,8 +763,6 @@ static QuicPacket* ConstructPacketFromHandshakeMessage(
   header.public_header.reset_flag = false;
   header.public_header.version_flag = should_include_version;
   header.packet_number = 1;
-  header.entropy_flag = false;
-  header.entropy_hash = 0;
 
   QuicStreamFrame stream_frame(kCryptoStreamId, false, 0,
                                data->AsStringPiece());
@@ -836,19 +809,6 @@ size_t GetPacketLengthForOneStream(QuicVersion version,
              include_diversification_nonce, packet_number_length, 0u);
 }
 
-TestEntropyCalculator::TestEntropyCalculator() {}
-
-TestEntropyCalculator::~TestEntropyCalculator() {}
-
-QuicPacketEntropyHash TestEntropyCalculator::EntropyHash(
-    QuicPacketNumber packet_number) const {
-  return 1u;
-}
-
-MockEntropyCalculator::MockEntropyCalculator() {}
-
-MockEntropyCalculator::~MockEntropyCalculator() {}
-
 QuicConfig DefaultQuicConfig() {
   QuicConfig config;
   config.SetInitialStreamFlowControlWindowToSend(