Remove channel ids from various interfaces.

webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc

Index: webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
index 4fc89a9a84a7b454118a6938487e175a28a1e740..e1d5e07d1d4dd1e9203be707bc90aeef0a7bc12a 100644
--- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
+++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
@@ -55,8 +55,7 @@ class TestRtpFeedback : public NullRtpFeedback {
   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);
   }
 
@@ -69,7 +68,6 @@ class RtpRtcpRtcpTest : public ::testing::Test {
   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;
@@ -87,7 +85,6 @@ class RtpRtcpRtcpTest : public ::testing::Test {
     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();
@@ -104,11 +101,10 @@ class RtpRtcpRtcpTest : public ::testing::Test {
     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;
 
@@ -117,7 +113,7 @@ class RtpRtcpRtcpTest : public ::testing::Test {
     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(),
@@ -179,7 +175,6 @@ class RtpRtcpRtcpTest : public ::testing::Test {
     delete receiver;
   }
 
-  int test_id;
   rtc::scoped_ptr<TestRtpFeedback> rtp_feedback1_;
   rtc::scoped_ptr<TestRtpFeedback> rtp_feedback2_;
   rtc::scoped_ptr<ReceiveStatistics> receive_statistics1_;