Remove channel ids from various interfaces.

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 21 matching lines @@
 // This test transport verifies that no functions get called.
 class TestTransport : public Transport,
                       public NullRtpData {
  public:
   explicit TestTransport()
       : rtcp_receiver_(NULL) {
   }
   void SetRTCPReceiver(RTCPReceiver* rtcp_receiver) {
     rtcp_receiver_ = rtcp_receiver;
   }
-  int SendPacket(int /*ch*/, const void* /*data*/, size_t /*len*/) override {
+  int SendPacket(const void* /*data*/, size_t /*len*/) override {
     ADD_FAILURE();  // FAIL() gives a compile error.
     return -1;
   }
 
-  // Injects an RTCP packet into the receiver.
-  int SendRTCPPacket(int /* ch */,
-                     const void* packet,
-                     size_t packet_len) override {
+  int SendRTCPPacket(const void* packet, size_t packet_len) override {
     ADD_FAILURE();
     return 0;
   }
 
   int OnReceivedPayloadData(const uint8_t* payloadData,
                             const size_t payloadSize,
                             const WebRtcRTPHeader* rtpHeader) override {
     ADD_FAILURE();
     return 0;
   }
   RTCPReceiver* rtcp_receiver_;
 };
 
 class RtcpReceiverTest : public ::testing::Test {
  protected:
   static const uint32_t kRemoteBitrateEstimatorMinBitrateBps = 30000;
 
   RtcpReceiverTest()
       : over_use_detector_options_(),
         system_clock_(1335900000),
         remote_bitrate_observer_(),
         remote_bitrate_estimator_(new RemoteBitrateEstimatorSingleStream(
             &remote_bitrate_observer_,
             &system_clock_,
             kRemoteBitrateEstimatorMinBitrateBps)) {
     test_transport_ = new TestTransport();
 
     RtpRtcp::Configuration configuration;
-    configuration.id = 0;
     configuration.audio = false;
     configuration.clock = &system_clock_;
     configuration.outgoing_transport = test_transport_;
     configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get();
     rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration);
-    rtcp_receiver_ = new RTCPReceiver(0, &system_clock_, false, NULL, NULL,
-                                      NULL, rtp_rtcp_impl_);
+    rtcp_receiver_ = new RTCPReceiver(&system_clock_, false, NULL, NULL, NULL,
+                                      rtp_rtcp_impl_);
     test_transport_->SetRTCPReceiver(rtcp_receiver_);
   }
   ~RtcpReceiverTest() {
     delete rtcp_receiver_;
     delete rtp_rtcp_impl_;
     delete test_transport_;
   }
 
   // Injects an RTCP packet into the receiver.
   // Returns 0 for OK, non-0 for failure.
@@ skipping 930 matching lines @@
   rr2.WithReportBlock(rb2);
   rtc::scoped_ptr<rtcp::RawPacket> p2(rr2.Build());
   EXPECT_EQ(0, InjectRtcpPacket(p2->Buffer(), p2->Length()));
   EXPECT_TRUE(callback.Matches(kSourceSsrc, kSequenceNumber, kFractionLoss,
                                kCumulativeLoss, kJitter));
 }
 
 }  // Anonymous namespace
 
 }  // namespace webrtc