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..5442f6e82bd1c10d1f5e844fbc8cb445b5447a6f 100644
--- a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc
@@ -35,7 +35,8 @@ class SendTimeHistoryTest : public ::testing::Test {
                              size_t length,
                              bool was_paced,
                              int64_t send_time_ms) {
-    history_.AddAndRemoveOld(sequence_number, length, was_paced);
+    history_.AddAndRemoveOld(sequence_number, length, was_paced,
+                             PacketInfo::kNotAProbe);

[danilchap, 2016/05/31 13:06:49]

better propagate and test probe_cluster_id field too.

[philipel, 2016/05/31 14:34:58]

Integrated testing of cluster id into existing tests.

     history_.OnSentPacket(sequence_number, send_time_ms);
   }
 
@@ -46,7 +47,14 @@ class SendTimeHistoryTest : public ::testing::Test {
 // Help class extended so we can do EXPECT_EQ and collections.
 class PacketInfo : public webrtc::PacketInfo {
  public:
-  PacketInfo() : webrtc::PacketInfo(-1, 0, 0, 0, 0, false) {}
+  PacketInfo()
+      : webrtc::PacketInfo(-1,
+                           0,
+                           0,
+                           0,
+                           0,
+                           false,
+                           webrtc::PacketInfo::kNotAProbe) {}
   PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
       : PacketInfo(arrival_time_ms, 0, sequence_number, 0, false) {}
   PacketInfo(int64_t arrival_time_ms,
@@ -59,12 +67,14 @@ class PacketInfo : public webrtc::PacketInfo {
                            send_time_ms,
                            sequence_number,
                            payload_size,
-                           was_paced) {}
+                           was_paced,
+                           webrtc::PacketInfo::kNotAProbe) {}
   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 && was_paced == other.was_paced &&
+           probe_cluster_id == other.probe_cluster_id;
   }
 };
 
@@ -121,7 +131,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].was_paced, PacketInfo::kNotAProbe);

[danilchap, 2016/05/31 13:06:50]

sent_packets[i].probe_cluster_id

[philipel, 2016/05/31 14:34:58]

Done.

   }
   for (size_t i = 0; i < num_items; ++i)
     history_.OnSentPacket(sent_packets[i].sequence_number,