Propagate packet pacing information to SenTimeHistory

webrtc/modules/pacing/bitrate_prober_unittest.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
   const int kClusterSize = 5;
   const int kProbeSize = 1000;
   const int kMinProbeDurationMs = 15;
 
   prober.CreateProbeCluster(kTestBitrate1, now_ms);
   prober.CreateProbeCluster(kTestBitrate2, now_ms);
   EXPECT_FALSE(prober.IsProbing());
 
   prober.OnIncomingPacket(kProbeSize);
   EXPECT_TRUE(prober.IsProbing());
-  EXPECT_EQ(0, prober.CurrentClusterId());
+  EXPECT_EQ(0, prober.CurrentCluster().probe_cluster_id);
 
   // First packet should probe as soon as possible.
   EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
 
   for (int i = 0; i < kClusterSize; ++i) {
     now_ms += prober.TimeUntilNextProbe(now_ms);
     EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
-    EXPECT_EQ(0, prober.CurrentClusterId());
+    EXPECT_EQ(0, prober.CurrentCluster().probe_cluster_id);
     prober.ProbeSent(now_ms, kProbeSize);
   }
 
   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);
     EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
-    EXPECT_EQ(1, prober.CurrentClusterId());
+    EXPECT_EQ(1, prober.CurrentCluster().probe_cluster_id);
     prober.ProbeSent(now_ms, kProbeSize);
   }
 
   // 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);
 
@@ skipping 103 matching lines @@
   int bytes_sent = 0;
   while (bytes_sent < kExpectedBytesSent) {
     ASSERT_TRUE(prober.IsProbing());
     prober.ProbeSent(0, kSmallPacketSize);
     bytes_sent += kSmallPacketSize;
   }
 
   EXPECT_FALSE(prober.IsProbing());
 }
 }  // namespace webrtc