Remove channel ids from various interfaces.

webrtc/modules/rtp_rtcp/source/rtcp_format_remb_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 13 matching lines @@
 
 using namespace webrtc;
 
 
 class TestTransport : public Transport {
  public:
   TestTransport(RTCPReceiver* rtcp_receiver) :
     rtcp_receiver_(rtcp_receiver) {
   }
 
-  int SendPacket(int /*channel*/,
-                 const void* /*data*/,
-                 size_t /*len*/) override {
-    return -1;
-  }
-  int SendRTCPPacket(int /*channel*/,
-                     const void* packet,
-                     size_t packetLength) override {
+  int SendPacket(const void* /*data*/, size_t /*len*/) override { return -1; }
+  int SendRTCPPacket(const void* packet, size_t packetLength) override {
     RTCPUtility::RTCPParserV2 rtcpParser((uint8_t*)packet,
                                          packetLength,
                                          true); // Allow non-compound RTCP
 
     EXPECT_TRUE(rtcpParser.IsValid());
     RTCPHelp::RTCPPacketInformation rtcpPacketInformation;
     EXPECT_EQ(0, rtcp_receiver_->IncomingRTCPPacket(rtcpPacketInformation,
                                                     &rtcpParser));
 
     EXPECT_EQ((uint32_t)kRtcpRemb,
@@ skipping 29 matching lines @@
   rtc::scoped_ptr<ReceiveStatistics> receive_statistics_;
   RTCPSender* rtcp_sender_;
   RTCPReceiver* rtcp_receiver_;
   TestTransport* test_transport_;
   MockRemoteBitrateObserver remote_bitrate_observer_;
   rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
 };
 
 void RtcpFormatRembTest::SetUp() {
   RtpRtcp::Configuration configuration;
-  configuration.id = 0;
   configuration.audio = false;
   configuration.clock = system_clock_;
   configuration.remote_bitrate_estimator = remote_bitrate_estimator_.get();
   dummy_rtp_rtcp_impl_ = new ModuleRtpRtcpImpl(configuration);
-  rtcp_sender_ = new RTCPSender(0, false, system_clock_,
-                                receive_statistics_.get(), NULL);
-  rtcp_receiver_ = new RTCPReceiver(0, system_clock_, false, NULL, NULL, NULL,
+  rtcp_sender_ =
+      new RTCPSender(false, system_clock_, receive_statistics_.get(), NULL);
+  rtcp_receiver_ = new RTCPReceiver(system_clock_, false, NULL, NULL, NULL,
                                     dummy_rtp_rtcp_impl_);
   test_transport_ = new TestTransport(rtcp_receiver_);
 
   EXPECT_EQ(0, rtcp_sender_->RegisterSendTransport(test_transport_));
 }
 
 void RtcpFormatRembTest::TearDown() {
   delete rtcp_sender_;
   delete rtcp_receiver_;
   delete dummy_rtp_rtcp_impl_;
@@ skipping 19 matching lines @@
 
 TEST_F(RtcpFormatRembTest, TestCompund) {
   uint32_t SSRCs[2] = {456789, 98765};
   rtcp_sender_->SetRTCPStatus(kRtcpCompound);
   rtcp_sender_->SetREMBData(1234, std::vector<uint32_t>(SSRCs, SSRCs + 2));
   RTCPSender::FeedbackState feedback_state =
       dummy_rtp_rtcp_impl_->GetFeedbackState();
   EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpRemb));
 }
 }  // namespace