Revert of Fix BitrateProber to match the requested bitrate more precisely

webrtc/modules/pacing/bitrate_prober_unittest.cc

Index: webrtc/modules/pacing/bitrate_prober_unittest.cc
diff --git a/webrtc/modules/pacing/bitrate_prober_unittest.cc b/webrtc/modules/pacing/bitrate_prober_unittest.cc
index 9ada11462572fda41178b0e05b0ecd2046ca2655..8ac352de0e0d27facf2d610e84051b19831653bd 100644
--- a/webrtc/modules/pacing/bitrate_prober_unittest.cc
+++ b/webrtc/modules/pacing/bitrate_prober_unittest.cc
@@ -21,52 +21,34 @@
   int64_t now_ms = 0;
   EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
 
-  const int kTestBitrate1 = 900000;
-  const int kTestBitrate2 = 1800000;
-  const int kClusterSize = 5;
-  const int kProbeSize = 1000;
-  const int kMinProbeDurationMs = 15;
-
-  prober.CreateProbeCluster(kTestBitrate1);
-  prober.CreateProbeCluster(kTestBitrate2);
+  prober.CreateProbeCluster(900000);
+  prober.CreateProbeCluster(1800000);
   EXPECT_FALSE(prober.IsProbing());
 
-  prober.OnIncomingPacket(kProbeSize);
+  prober.OnIncomingPacket(1000);
   EXPECT_TRUE(prober.IsProbing());
   EXPECT_EQ(0, prober.CurrentClusterId());
 
   // First packet should probe as soon as possible.
   EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
+  prober.ProbeSent(now_ms, 1000);
 
-  for (int i = 0; i < kClusterSize; ++i) {
-    now_ms += prober.TimeUntilNextProbe(now_ms);
+  for (int i = 0; i < 4; ++i) {
+    EXPECT_EQ(8, prober.TimeUntilNextProbe(now_ms));
+    now_ms += 4;
+    EXPECT_EQ(4, prober.TimeUntilNextProbe(now_ms));
+    now_ms += 4;
     EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
     EXPECT_EQ(0, prober.CurrentClusterId());
-    prober.ProbeSent(now_ms, kProbeSize);
+    prober.ProbeSent(now_ms, 1000);
   }
-
-  EXPECT_GE(now_ms, kMinProbeDurationMs);
-  // Verify that the actual bitrate is withing 10% of the target.
-  double bitrate = kProbeSize * (kClusterSize - 1) * 8 * 1000.0 / now_ms;
-  EXPECT_GT(bitrate, kTestBitrate1 * 0.9);
-  EXPECT_LT(bitrate,  kTestBitrate1 * 1.1);
-
-  now_ms += prober.TimeUntilNextProbe(now_ms);
-  int64_t probe2_started = now_ms;
-
-  for (int i = 0; i < kClusterSize; ++i) {
-    now_ms += prober.TimeUntilNextProbe(now_ms);
+  for (int i = 0; i < 5; ++i) {
+    EXPECT_EQ(4, prober.TimeUntilNextProbe(now_ms));
+    now_ms += 4;
     EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
     EXPECT_EQ(1, prober.CurrentClusterId());
-    prober.ProbeSent(now_ms, kProbeSize);
+    prober.ProbeSent(now_ms, 1000);
   }
-
-  // Verify that the actual bitrate is withing 10% of the target.
-  int duration = now_ms - probe2_started;
-  EXPECT_GE(duration, kMinProbeDurationMs);
-  bitrate = kProbeSize * (kClusterSize - 1) * 8 * 1000.0 / duration;
-  EXPECT_GT(bitrate, kTestBitrate2 * 0.9);
-  EXPECT_LT(bitrate,  kTestBitrate2 * 1.1);
 
   EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
   EXPECT_FALSE(prober.IsProbing());