Remove channel ids from various interfaces.

webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.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 37 matching lines @@
   virtual void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc) {};
  private:
   RtpRtcp* _rtpRtcpModule;
 };
 
 class TestRtpFeedback : public NullRtpFeedback {
  public:
   TestRtpFeedback(RtpRtcp* rtp_rtcp) : rtp_rtcp_(rtp_rtcp) {}
   virtual ~TestRtpFeedback() {}
 
-  virtual void OnIncomingSSRCChanged(const int32_t id,
-                                     const uint32_t ssrc) {
+  void OnIncomingSSRCChanged(const uint32_t ssrc) override {
     rtp_rtcp_->SetRemoteSSRC(ssrc);
   }
 
  private:
   RtpRtcp* rtp_rtcp_;
 };
 
 class RtpRtcpRtcpTest : public ::testing::Test {
  protected:
   RtpRtcpRtcpTest() : fake_clock(123456) {
     test_csrcs.push_back(1234);
     test_csrcs.push_back(2345);
-    test_id = 123;
     test_ssrc = 3456;
     test_timestamp = 4567;
     test_sequence_number = 2345;
   }
   ~RtpRtcpRtcpTest() {}
 
   virtual void SetUp() {
     receiver = new TestRtpReceiver();
     transport1 = new LoopBackTransport();
     transport2 = new LoopBackTransport();
     myRTCPFeedback1 = new RtcpCallback();
     myRTCPFeedback2 = new RtcpCallback();
 
     receive_statistics1_.reset(ReceiveStatistics::Create(&fake_clock));
     receive_statistics2_.reset(ReceiveStatistics::Create(&fake_clock));
 
     RtpRtcp::Configuration configuration;
-    configuration.id = test_id;
     configuration.audio = true;
     configuration.clock = &fake_clock;
     configuration.receive_statistics = receive_statistics1_.get();
     configuration.outgoing_transport = transport1;
     configuration.intra_frame_callback = myRTCPFeedback1;
 
     rtp_payload_registry1_.reset(new RTPPayloadRegistry(
             RTPPayloadStrategy::CreateStrategy(true)));
     rtp_payload_registry2_.reset(new RTPPayloadRegistry(
             RTPPayloadStrategy::CreateStrategy(true)));
 
     module1 = RtpRtcp::CreateRtpRtcp(configuration);
 
     rtp_feedback1_.reset(new TestRtpFeedback(module1));
 
     rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver(
-        test_id, &fake_clock, NULL, receiver, rtp_feedback1_.get(),
+        &fake_clock, NULL, receiver, rtp_feedback1_.get(),
         rtp_payload_registry1_.get()));
 
     configuration.receive_statistics = receive_statistics2_.get();
-    configuration.id = test_id + 1;
     configuration.outgoing_transport = transport2;
     configuration.intra_frame_callback = myRTCPFeedback2;
 
     module2 = RtpRtcp::CreateRtpRtcp(configuration);
 
     rtp_feedback2_.reset(new TestRtpFeedback(module2));
 
     rtp_receiver2_.reset(RtpReceiver::CreateAudioReceiver(
-        test_id + 1, &fake_clock, NULL, receiver, rtp_feedback2_.get(),
+        &fake_clock, NULL, receiver, rtp_feedback2_.get(),
         rtp_payload_registry2_.get()));
 
     transport1->SetSendModule(module2, rtp_payload_registry2_.get(),
                               rtp_receiver2_.get(), receive_statistics2_.get());
     transport2->SetSendModule(module1, rtp_payload_registry1_.get(),
                               rtp_receiver1_.get(), receive_statistics1_.get());
     myRTCPFeedback1->SetModule(module1);
     myRTCPFeedback2->SetModule(module2);
 
     module1->SetRTCPStatus(kRtcpCompound);
@@ skipping 41 matching lines @@
   virtual void TearDown() {
     delete module1;
     delete module2;
     delete myRTCPFeedback1;
     delete myRTCPFeedback2;
     delete transport1;
     delete transport2;
     delete receiver;
   }
 
-  int test_id;
   rtc::scoped_ptr<TestRtpFeedback> rtp_feedback1_;
   rtc::scoped_ptr<TestRtpFeedback> rtp_feedback2_;
   rtc::scoped_ptr<ReceiveStatistics> receive_statistics1_;
   rtc::scoped_ptr<ReceiveStatistics> receive_statistics2_;
   rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry1_;
   rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry2_;
   rtc::scoped_ptr<RtpReceiver> rtp_receiver1_;
   rtc::scoped_ptr<RtpReceiver> rtp_receiver2_;
   RtpRtcp* module1;
   RtpRtcp* module2;
@@ skipping 71 matching lines @@
 
   // |test_ssrc+1| is the SSRC of module2 that send the report.
   EXPECT_EQ(test_ssrc+1, report_blocks[0].remoteSSRC);
   EXPECT_EQ(test_ssrc, report_blocks[0].sourceSSRC);
 
   EXPECT_EQ(0u, report_blocks[0].cumulativeLost);
   EXPECT_LT(0u, report_blocks[0].delaySinceLastSR);
   EXPECT_EQ(test_sequence_number, report_blocks[0].extendedHighSeqNum);
   EXPECT_EQ(0u, report_blocks[0].fractionLost);
 }