deprecate FLAGS_quic_disable_pre_34

net/quic/core/quic_received_packet_manager_test.cc

Index: net/quic/core/quic_received_packet_manager_test.cc
diff --git a/net/quic/core/quic_received_packet_manager_test.cc b/net/quic/core/quic_received_packet_manager_test.cc
index 65f0a84890e9dbb33dae73a623ce1363d58a00c8..4ea5968f6f586341c7e7a317902a7518982f1b6f 100644
--- a/net/quic/core/quic_received_packet_manager_test.cc
+++ b/net/quic/core/quic_received_packet_manager_test.cc
@@ -15,174 +15,8 @@
 
 namespace net {
 namespace test {
-
-class EntropyTrackerPeer {
- public:
-  static QuicPacketNumber first_gap(
-      const QuicReceivedPacketManager::EntropyTracker& tracker) {
-    return tracker.first_gap_;
-  }
-  static QuicPacketNumber largest_observed(
-      const QuicReceivedPacketManager::EntropyTracker& tracker) {
-    return tracker.largest_observed_;
-  }
-  static int packets_entropy_size(
-      const QuicReceivedPacketManager::EntropyTracker& tracker) {
-    return tracker.packets_entropy_.size();
-  }
-  static bool IsTrackingPacket(
-      const QuicReceivedPacketManager::EntropyTracker& tracker,
-      QuicPacketNumber packet_number) {
-    return packet_number >= tracker.first_gap_ &&
-           packet_number <
-               (tracker.first_gap_ + tracker.packets_entropy_.size()) &&
-           tracker.packets_entropy_[packet_number - tracker.first_gap_].second;
-  }
-};
-
 namespace {
 
-// Entropy of individual packets is not tracked if there are no gaps.
-TEST(EntropyTrackerTest, NoGaps) {
-  QuicReceivedPacketManager::EntropyTracker tracker;
-
-  tracker.RecordPacketEntropyHash(1, 23);
-  tracker.RecordPacketEntropyHash(2, 42);
-
-  EXPECT_EQ(23 ^ 42, tracker.EntropyHash(2));
-  EXPECT_EQ(3u, EntropyTrackerPeer::first_gap(tracker));
-
-  EXPECT_EQ(2u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(0, EntropyTrackerPeer::packets_entropy_size(tracker));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 1));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 2));
-}
-
-// Entropy of individual packets is tracked as long as there are gaps.
-// Filling the first gap results in entropy getting garbage collected.
-TEST(EntropyTrackerTest, FillGaps) {
-  QuicReceivedPacketManager::EntropyTracker tracker;
-
-  tracker.RecordPacketEntropyHash(2, 5);
-  tracker.RecordPacketEntropyHash(5, 17);
-  tracker.RecordPacketEntropyHash(6, 23);
-  tracker.RecordPacketEntropyHash(9, 42);
-
-  EXPECT_EQ(1u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(9, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(5, tracker.EntropyHash(2));
-  EXPECT_EQ(5 ^ 17, tracker.EntropyHash(5));
-  EXPECT_EQ(5 ^ 17 ^ 23, tracker.EntropyHash(6));
-  EXPECT_EQ(5 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 1));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 2));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 5));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 6));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 9));
-
-  // Fill the gap at 1.
-  tracker.RecordPacketEntropyHash(1, 2);
-
-  EXPECT_EQ(3u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(7, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(2 ^ 5 ^ 17, tracker.EntropyHash(5));
-  EXPECT_EQ(2 ^ 5 ^ 17 ^ 23, tracker.EntropyHash(6));
-  EXPECT_EQ(2 ^ 5 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 1));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 2));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 5));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 6));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 9));
-
-  // Fill the gap at 4.
-  tracker.RecordPacketEntropyHash(4, 2);
-
-  EXPECT_EQ(3u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(7, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(5, tracker.EntropyHash(4));
-  EXPECT_EQ(5 ^ 17, tracker.EntropyHash(5));
-  EXPECT_EQ(5 ^ 17 ^ 23, tracker.EntropyHash(6));
-  EXPECT_EQ(5 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 3));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 4));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 5));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 6));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 9));
-
-  // Fill the gap at 3.  Entropy for packets 3 to 6 are forgotten.
-  tracker.RecordPacketEntropyHash(3, 2);
-
-  EXPECT_EQ(7u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(3, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(2 ^ 5 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 3));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 4));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 5));
-  EXPECT_FALSE(EntropyTrackerPeer::IsTrackingPacket(tracker, 6));
-  EXPECT_TRUE(EntropyTrackerPeer::IsTrackingPacket(tracker, 9));
-
-  // Fill in the rest.
-  tracker.RecordPacketEntropyHash(7, 2);
-  tracker.RecordPacketEntropyHash(8, 2);
-
-  EXPECT_EQ(10u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(0, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(2 ^ 5 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-}
-
-TEST(EntropyTrackerTest, SetCumulativeEntropyUpTo) {
-  QuicReceivedPacketManager::EntropyTracker tracker;
-
-  tracker.RecordPacketEntropyHash(2, 5);
-  tracker.RecordPacketEntropyHash(5, 17);
-  tracker.RecordPacketEntropyHash(6, 23);
-  tracker.RecordPacketEntropyHash(9, 42);
-
-  EXPECT_EQ(1u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(9, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  // Inform the tracker about value of the hash at a gap.
-  tracker.SetCumulativeEntropyUpTo(3, 7);
-  EXPECT_EQ(3u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(7, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(7 ^ 17, tracker.EntropyHash(5));
-  EXPECT_EQ(7 ^ 17 ^ 23, tracker.EntropyHash(6));
-  EXPECT_EQ(7 ^ 17 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  // Inform the tracker about value of the hash at a known location.
-  tracker.SetCumulativeEntropyUpTo(6, 1);
-  EXPECT_EQ(7u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(3, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(1 ^ 23 ^ 42, tracker.EntropyHash(9));
-
-  // Inform the tracker about value of the hash at the last location.
-  tracker.SetCumulativeEntropyUpTo(9, 21);
-  EXPECT_EQ(10u, EntropyTrackerPeer::first_gap(tracker));
-  EXPECT_EQ(9u, EntropyTrackerPeer::largest_observed(tracker));
-  EXPECT_EQ(0, EntropyTrackerPeer::packets_entropy_size(tracker));
-
-  EXPECT_EQ(42 ^ 21, tracker.EntropyHash(9));
-}
-
 struct TestParams {
   explicit TestParams(QuicVersion version) : version(version) {}
 
@@ -206,21 +40,16 @@ std::vector<TestParams> GetTestParams() {
 class QuicReceivedPacketManagerTest
     : public ::testing::TestWithParam<TestParams> {
  protected:
-  QuicReceivedPacketManagerTest() : received_manager_(&stats_) {
-    received_manager_.SetVersion(GetParam().version);
-  }
+  QuicReceivedPacketManagerTest() : received_manager_(&stats_) {}
 
-  void RecordPacketReceipt(QuicPacketNumber packet_number,
-                           QuicPacketEntropyHash entropy_hash) {
-    RecordPacketReceipt(packet_number, entropy_hash, QuicTime::Zero());
+  void RecordPacketReceipt(QuicPacketNumber packet_number) {
+    RecordPacketReceipt(packet_number, QuicTime::Zero());
   }
 
   void RecordPacketReceipt(QuicPacketNumber packet_number,
-                           QuicPacketEntropyHash entropy_hash,
                            QuicTime receipt_time) {
     QuicPacketHeader header;
     header.packet_number = packet_number;
-    header.entropy_hash = entropy_hash;
     received_manager_.RecordPacketReceived(header, receipt_time);
   }
 
@@ -232,96 +61,6 @@ INSTANTIATE_TEST_CASE_P(QuicReceivedPacketManagerTest,
                         QuicReceivedPacketManagerTest,
                         ::testing::ValuesIn(GetTestParams()));
 
-TEST_P(QuicReceivedPacketManagerTest, ReceivedPacketEntropyHash) {
-  if (GetParam().version > QUIC_VERSION_33) {
-    return;
-  }
-  std::vector<std::pair<QuicPacketNumber, QuicPacketEntropyHash>> entropies;
-  entropies.push_back(std::make_pair(1, 12));
-  entropies.push_back(std::make_pair(7, 1));
-  entropies.push_back(std::make_pair(2, 33));
-  entropies.push_back(std::make_pair(5, 3));
-  entropies.push_back(std::make_pair(8, 34));
-
-  for (size_t i = 0; i < entropies.size(); ++i) {
-    RecordPacketReceipt(entropies[i].first, entropies[i].second);
-  }
-
-  std::sort(entropies.begin(), entropies.end());
-
-  QuicPacketEntropyHash hash = 0;
-  size_t index = 0;
-  for (size_t i = 1; i <= (*entropies.rbegin()).first; ++i) {
-    if (entropies[index].first == i) {
-      hash ^= entropies[index].second;
-      ++index;
-    }
-    if (i < 3)
-      continue;
-    EXPECT_EQ(hash, received_manager_.EntropyHash(i));
-  }
-  // Reorder by 5 when 2 is received after 7.
-  EXPECT_EQ(5u, stats_.max_sequence_reordering);
-  EXPECT_EQ(0, stats_.max_time_reordering_us);
-  EXPECT_EQ(2u, stats_.packets_reordered);
-}
-
-TEST_P(QuicReceivedPacketManagerTest, EntropyHashBelowLeastObserved) {
-  if (GetParam().version > QUIC_VERSION_33) {
-    return;
-  }
-  EXPECT_EQ(0, received_manager_.EntropyHash(0));
-  RecordPacketReceipt(4, 5);
-  EXPECT_EQ(0, received_manager_.EntropyHash(3));
-}
-
-TEST_P(QuicReceivedPacketManagerTest, EntropyHashAboveLargestObserved) {
-  if (GetParam().version > QUIC_VERSION_33) {
-    return;
-  }
-  EXPECT_EQ(0, received_manager_.EntropyHash(0));
-  RecordPacketReceipt(4, 5);
-  EXPECT_EQ(0, received_manager_.EntropyHash(3));
-}
-
-TEST_P(QuicReceivedPacketManagerTest, SetCumulativeEntropyUpTo) {
-  if (GetParam().version > QUIC_VERSION_33) {
-    return;
-  }
-  std::vector<std::pair<QuicPacketNumber, QuicPacketEntropyHash>> entropies;
-  entropies.push_back(std::make_pair(1, 12));
-  entropies.push_back(std::make_pair(2, 1));
-  entropies.push_back(std::make_pair(3, 33));
-  entropies.push_back(std::make_pair(4, 3));
-  entropies.push_back(std::make_pair(6, 34));
-  entropies.push_back(std::make_pair(7, 29));
-
-  QuicPacketEntropyHash entropy_hash = 0;
-  for (size_t i = 0; i < entropies.size(); ++i) {
-    RecordPacketReceipt(entropies[i].first, entropies[i].second);
-    entropy_hash ^= entropies[i].second;
-  }
-  EXPECT_EQ(entropy_hash, received_manager_.EntropyHash(7));
-
-  // Now set the entropy hash up to 5 to be 100.
-  entropy_hash ^= 100;
-  for (size_t i = 0; i < 4; ++i) {
-    entropy_hash ^= entropies[i].second;
-  }
-  QuicReceivedPacketManagerPeer::SetCumulativeEntropyUpTo(&received_manager_, 5,
-                                                          100);
-  EXPECT_EQ(entropy_hash, received_manager_.EntropyHash(7));
-
-  QuicReceivedPacketManagerPeer::SetCumulativeEntropyUpTo(&received_manager_, 1,
-                                                          50);
-  EXPECT_EQ(entropy_hash, received_manager_.EntropyHash(7));
-
-  // No reordering.
-  EXPECT_EQ(0u, stats_.max_sequence_reordering);
-  EXPECT_EQ(0, stats_.max_time_reordering_us);
-  EXPECT_EQ(0u, stats_.packets_reordered);
-}
-
 TEST_P(QuicReceivedPacketManagerTest, DontWaitForPacketsBefore) {
   QuicPacketHeader header;
   header.packet_number = 2u;
@@ -377,10 +116,10 @@ TEST_P(QuicReceivedPacketManagerTest, GetUpdatedAckFrame) {
 
 TEST_P(QuicReceivedPacketManagerTest, UpdateReceivedConnectionStats) {
   EXPECT_FALSE(received_manager_.ack_frame_updated());
-  RecordPacketReceipt(1, 0);
+  RecordPacketReceipt(1);
   EXPECT_TRUE(received_manager_.ack_frame_updated());
-  RecordPacketReceipt(6, 0);
-  RecordPacketReceipt(2, 0,
+  RecordPacketReceipt(6);
+  RecordPacketReceipt(2,
                       QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(1));
 
   EXPECT_EQ(4u, stats_.max_sequence_reordering);