Moving overhead counting to bitrate estimators.

webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

 /*
  *  Copyright (c) 2012 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 55 matching lines @@
 };
 
 class MockRtcpCallbackImpl : public RtcpStatisticsCallback {
  public:
   MOCK_METHOD2(StatisticsUpdated, void(const RtcpStatistics&, uint32_t));
   MOCK_METHOD2(CNameChanged, void(const char*, uint32_t));
 };
 
 class MockTransportFeedbackObserver : public TransportFeedbackObserver {
  public:
-  MOCK_METHOD3(AddPacket, void(uint32_t, uint16_t, size_t));
-  MOCK_METHOD4(AddPacket,
-               void(uint32_t, uint16_t, size_t, const PacedPacketInfo&));
+  // (not used method)   MOCK_METHOD3(AddPacket, void(uint32_t, uint16_t,
+  // size_t));
+  MOCK_METHOD5(
+      AddPacket,
+      void(uint32_t, uint16_t, size_t, size_t, const PacedPacketInfo&));
   MOCK_METHOD1(OnTransportFeedback, void(const rtcp::TransportFeedback&));
   MOCK_CONST_METHOD0(GetTransportFeedbackVector, std::vector<PacketFeedback>());
 };
 
 class MockRtcpBandwidthObserver : public RtcpBandwidthObserver {
  public:
   MOCK_METHOD1(OnReceivedEstimatedBitrate, void(uint32_t));
   MOCK_METHOD3(OnReceivedRtcpReceiverReport,
                void(const ReportBlockList&, int64_t, int64_t));
 };
@@ skipping 1154 matching lines @@
 
   rtcp::ExtendedReports xr;
   xr.SetTargetBitrate(bitrate);
 
   EXPECT_CALL(bitrate_allocation_observer_,
               OnBitrateAllocationUpdated(expected_allocation));
   InjectRtcpPacket(xr);
 }
 
 }  // namespace webrtc