TransportFeedbackPacketLossTracker to receive std::vector<PacketFeedback> in place of the entire fe…

webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc

Index: webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
index f3b202a3cf628fb66748517590208c54f199c142..996072f1e94a064283171cf6a00526a935c0d410 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
@@ -28,8 +29,6 @@ constexpr int64_t kDefaultMaxWindowSizeMs = 500 * kDefaultSendInterval;
 
 class TransportFeedbackPacketLossTrackerTest
     : public ::testing::TestWithParam<uint16_t> {
-  using TransportFeedback = webrtc::rtcp::TransportFeedback;
-
  public:
   TransportFeedbackPacketLossTrackerTest() = default;
   virtual ~TransportFeedbackPacketLossTrackerTest() = default;
@@ -75,28 +74,19 @@ class TransportFeedbackPacketLossTrackerTest
       TransportFeedbackPacketLossTracker* tracker,
       uint16_t base_sequence_num,
       const std::vector<bool>& reception_status_vec) {
-    const int64_t kBaseTimeUs = 1234;  // Irrelevant to this test.
-    TransportFeedback test_feedback;
-    test_feedback.SetBase(base_sequence_num, kBaseTimeUs);
-    uint16_t sequence_num = base_sequence_num;
-    for (bool status : reception_status_vec) {
-      if (status)
-        test_feedback.AddReceivedPacket(sequence_num, kBaseTimeUs);
-      ++sequence_num;
-    }
-
-    // TransportFeedback imposes some limitations on what constitutes a legal
-    // status vector. For instance, the vector cannot terminate in a lost
-    // packet. Make sure all limitations are abided by.
-    RTC_CHECK_EQ(base_sequence_num, test_feedback.GetBaseSequence());
-    const auto& vec = test_feedback.GetStatusVector();
-    RTC_CHECK_EQ(reception_status_vec.size(), vec.size());
-    for (size_t i = 0; i < reception_status_vec.size(); i++) {
-      RTC_CHECK_EQ(reception_status_vec[i],
-                   vec[i] != TransportFeedback::StatusSymbol::kNotReceived);
+    // Any positive integer signals reception. kNotReceived signals loss.
+    // Other values are just illegal.
+    constexpr int64_t kArrivalTimeMs = 1234;
+
+    std::vector<PacketFeedback> packet_feedbacks;
+    uint16_t seq_num = base_sequence_num;
+    for (bool received : reception_status_vec) {
+      packet_feedbacks.emplace_back(PacketFeedback(
+          received ? kArrivalTimeMs : PacketFeedback::kNotReceived, seq_num));
+      ++seq_num;
     }
 
-    tracker->OnReceivedTransportFeedback(test_feedback);
+    tracker->OnPacketFeedbacks(packet_feedbacks);
     tracker->Validate();
   }