Moving overhead counting to bitrate estimators.

webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc

Index: webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
index 5686f57724ca79f63e9ecb0943d4503a51f21aec..2b3b728fb5dfbb2b247d132fd28d0ebcc744511b 100644
--- a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
+++ b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
@@ -23,6 +23,8 @@ namespace {
 constexpr int kInvalidBitrate = -1;
 constexpr int kDefaultMinProbes = 5;
 constexpr int kDefaultMinBytes = 5000;
+constexpr size_t kRtpHeadersSize = 12;
+constexpr size_t kTransportHeadersSize = 20;
 }  // anonymous namespace
 
 class TestProbeBitrateEstimator : public ::testing::Test {
@@ -32,14 +34,15 @@ class TestProbeBitrateEstimator : public ::testing::Test {
   // TODO(philipel): Use PacedPacketInfo when ProbeBitrateEstimator is rewritten
   //                 to use that information.
   void AddPacketFeedback(int probe_cluster_id,
-                         size_t size_bytes,
+                         size_t payload_size_bytes,
                          int64_t send_time_ms,
                          int64_t arrival_time_ms,
                          int min_probes = kDefaultMinProbes,
                          int min_bytes = kDefaultMinBytes) {
     PacedPacketInfo pacing_info(probe_cluster_id, min_probes, min_bytes);
-    PacketFeedback packet_feedback(arrival_time_ms, send_time_ms, 0, size_bytes,
-                                   pacing_info);
+    PacketFeedback packet_feedback(arrival_time_ms, send_time_ms, 0,
+                                   payload_size_bytes, kRtpHeadersSize,
+                                   kTransportHeadersSize, pacing_info);
     measured_bps_ =
         probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(packet_feedback);
   }