Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc.

webrtc/pc/rtpreceiver.cc

Index: webrtc/pc/rtpreceiver.cc
diff --git a/webrtc/pc/rtpreceiver.cc b/webrtc/pc/rtpreceiver.cc
index f57babb4d4cf38343c8cffddd249901950f66b22..6073b15a9739872fa89fbdb212722d35238e6519 100644
--- a/webrtc/pc/rtpreceiver.cc
+++ b/webrtc/pc/rtpreceiver.cc
@@ -18,8 +18,7 @@
 
 namespace webrtc {
 
-AudioRtpReceiver::AudioRtpReceiver(MediaStreamInterface* stream,
-                                   const std::string& track_id,
+AudioRtpReceiver::AudioRtpReceiver(const std::string& track_id,
                                    uint32_t ssrc,
                                    cricket::VoiceChannel* channel)
     : id_(track_id),
@@ -34,7 +33,6 @@ AudioRtpReceiver::AudioRtpReceiver(MediaStreamInterface* stream,
   track_->RegisterObserver(this);
   track_->GetSource()->RegisterAudioObserver(this);
   Reconfigure();
-  stream->AddTrack(track_);
   if (channel_) {
     channel_->SignalFirstPacketReceived.connect(
         this, &AudioRtpReceiver::OnFirstPacketReceived);
@@ -137,8 +135,7 @@ void AudioRtpReceiver::OnFirstPacketReceived(cricket::BaseChannel* channel) {
   received_first_packet_ = true;
 }
 
-VideoRtpReceiver::VideoRtpReceiver(MediaStreamInterface* stream,
-                                   const std::string& track_id,
+VideoRtpReceiver::VideoRtpReceiver(const std::string& track_id,
                                    rtc::Thread* worker_thread,
                                    uint32_t ssrc,
                                    cricket::VideoChannel* channel)
@@ -164,7 +161,6 @@ VideoRtpReceiver::VideoRtpReceiver(MediaStreamInterface* stream,
       RTC_NOTREACHED();
     }
   }
-  stream->AddTrack(track_);
   if (channel_) {
     channel_->SignalFirstPacketReceived.connect(
         this, &VideoRtpReceiver::OnFirstPacketReceived);