Propagate probing cluster id to SendTimeHistory.

webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc

Index: webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
index b525813cdca123e51b43e435e06ca05e882f1240..73ee8f30a20abe08b9cc3abce16656e62139f423 100644
--- a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
@@ -33,9 +33,9 @@ class SendTimeHistoryTest : public ::testing::Test {
 
   void AddPacketWithSendTime(uint16_t sequence_number,
                              size_t length,
-                             bool was_paced,
+                             int probe_cluster_id,
                              int64_t send_time_ms) {
-    history_.AddAndRemoveOld(sequence_number, length, was_paced);
+    history_.AddAndRemoveOld(sequence_number, length, probe_cluster_id);
     history_.OnSentPacket(sequence_number, send_time_ms);
   }
 
@@ -53,18 +53,19 @@ class PacketInfo : public webrtc::PacketInfo {
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             bool was_paced)
+             int probe_cluster_id)
       : webrtc::PacketInfo(-1,
                            arrival_time_ms,
                            send_time_ms,
                            sequence_number,
                            payload_size,
-                           was_paced) {}
+                           probe_cluster_id) {}
   bool operator==(const PacketInfo& other) const {
     return arrival_time_ms == other.arrival_time_ms &&
            send_time_ms == other.send_time_ms &&
            sequence_number == other.sequence_number &&
-           payload_size == other.payload_size && was_paced == other.was_paced;
+           payload_size == other.payload_size &&
+           probe_cluster_id == other.probe_cluster_id;
   }
 };
 
@@ -90,9 +91,9 @@ TEST_F(SendTimeHistoryTest, PopulatesExpectedFields) {
   const int64_t kSendTime = 1000;
   const int64_t kReceiveTime = 2000;
   const size_t kPayloadSize = 42;
-  const bool kPaced = true;
+  const int kClusterId = 0;
 
-  AddPacketWithSendTime(kSeqNo, kPayloadSize, kPaced, kSendTime);
+  AddPacketWithSendTime(kSeqNo, kPayloadSize, kClusterId, kSendTime);
 
   PacketInfo info(kReceiveTime, kSeqNo);
   EXPECT_TRUE(history_.GetInfo(&info, true));
@@ -100,7 +101,7 @@ TEST_F(SendTimeHistoryTest, PopulatesExpectedFields) {
   EXPECT_EQ(kSendTime, info.send_time_ms);
   EXPECT_EQ(kSeqNo, info.sequence_number);
   EXPECT_EQ(kPayloadSize, info.payload_size);
-  EXPECT_EQ(kPaced, info.was_paced);
+  EXPECT_EQ(kClusterId, info.probe_cluster_id);
 }
 
 TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) {
@@ -121,7 +122,7 @@ TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) {
   for (size_t i = 0; i < num_items; ++i) {
     history_.AddAndRemoveOld(sent_packets[i].sequence_number,
                              sent_packets[i].payload_size,
-                             sent_packets[i].was_paced);
+                             sent_packets[i].probe_cluster_id);
   }
   for (size_t i = 0; i < num_items; ++i)
     history_.OnSentPacket(sent_packets[i].sequence_number,
@@ -211,15 +212,15 @@ TEST_F(SendTimeHistoryTest, InterlievedGetAndRemove) {
                            {0, kTimestamp + 2, kSeqNo + 2, 0, false}};
 
   AddPacketWithSendTime(packets[0].sequence_number, packets[0].payload_size,
-                        packets[0].was_paced, packets[0].send_time_ms);
+                        packets[0].probe_cluster_id, packets[0].send_time_ms);
   AddPacketWithSendTime(packets[1].sequence_number, packets[1].payload_size,
-                        packets[1].was_paced, packets[1].send_time_ms);
+                        packets[1].probe_cluster_id, packets[1].send_time_ms);
   PacketInfo info(0, 0, packets[0].sequence_number, 0, false);
   EXPECT_TRUE(history_.GetInfo(&info, true));
   EXPECT_EQ(packets[0], info);
 
   AddPacketWithSendTime(packets[2].sequence_number, packets[2].payload_size,
-                        packets[2].was_paced, packets[2].send_time_ms);
+                        packets[2].probe_cluster_id, packets[2].send_time_ms);
 
   PacketInfo info2(0, 0, packets[1].sequence_number, 0, false);
   EXPECT_TRUE(history_.GetInfo(&info2, true));