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

webrtc/pc/webrtcsession.cc

Index: webrtc/pc/webrtcsession.cc
diff --git a/webrtc/pc/webrtcsession.cc b/webrtc/pc/webrtcsession.cc
index def02d408bca8abe484e5ad73036c7d7748da359..752dd10796a9e1cb9b4f65d9d7dd89a27df6bb81 100644
--- a/webrtc/pc/webrtcsession.cc
+++ b/webrtc/pc/webrtcsession.cc
@@ -1799,8 +1799,8 @@ bool WebRtcSession::CreateVoiceChannel(const cricket::ContentInfo* content,
 
   voice_channel_.reset(channel_manager_->CreateVoiceChannel(
       media_controller_, rtp_dtls_transport, rtcp_dtls_transport,
-      transport_controller_->signaling_thread(), content->name,
-      bundle_transport, require_rtcp_mux, SrtpRequired(), audio_options_));
+      transport_controller_->signaling_thread(), content->name, SrtpRequired(),
+      audio_options_));
   if (!voice_channel_) {
     transport_controller_->DestroyDtlsTransport(
         transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
@@ -1841,8 +1841,8 @@ bool WebRtcSession::CreateVideoChannel(const cricket::ContentInfo* content,
 
   video_channel_.reset(channel_manager_->CreateVideoChannel(
       media_controller_, rtp_dtls_transport, rtcp_dtls_transport,
-      transport_controller_->signaling_thread(), content->name,
-      bundle_transport, require_rtcp_mux, SrtpRequired(), video_options_));
+      transport_controller_->signaling_thread(), content->name, SrtpRequired(),
+      video_options_));
 
   if (!video_channel_) {
     transport_controller_->DestroyDtlsTransport(
@@ -1907,7 +1907,7 @@ bool WebRtcSession::CreateDataChannel(const cricket::ContentInfo* content,
     rtp_data_channel_.reset(channel_manager_->CreateRtpDataChannel(
         media_controller_, rtp_dtls_transport, rtcp_dtls_transport,
         transport_controller_->signaling_thread(), content->name,
-        bundle_transport, require_rtcp_mux, SrtpRequired()));
+        SrtpRequired()));
 
     if (!rtp_data_channel_) {
       transport_controller_->DestroyDtlsTransport(