Remove the dependency of TransportChannel and TransportChannelImpl.

webrtc/api/webrtcsession.cc

 /*
  *  Copyright 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 17 matching lines @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/call/call.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/sctp/sctptransportinternal.h"
 #include "webrtc/p2p/base/portallocator.h"
-#include "webrtc/p2p/base/transportchannel.h"
 #include "webrtc/pc/channel.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/mediasession.h"
 
 #ifdef HAVE_QUIC
 #include "webrtc/p2p/quic/quictransportchannel.h"
 #endif  // HAVE_QUIC
 
 using cricket::ContentInfo;
 using cricket::ContentInfos;
@@ skipping 1840 matching lines @@
           std::move(transport_stats);
     }
   }
   return session_stats;
 }
 
 bool WebRtcSession::CreateSctpTransport_n(const std::string& content_name,
                                           const std::string& transport_name) {
   RTC_DCHECK(network_thread_->IsCurrent());
   RTC_DCHECK(sctp_factory_);
-  cricket::TransportChannel* tc =
+  cricket::DtlsTransportInternal* tc =
       transport_controller_->CreateTransportChannel_n(
           transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
   sctp_transport_ = sctp_factory_->CreateSctpTransport(tc);
   RTC_DCHECK(sctp_transport_);
   sctp_invoker_.reset(new rtc::AsyncInvoker());
   sctp_transport_->SignalReadyToSendData.connect(
       this, &WebRtcSession::OnSctpTransportReadyToSendData_n);
   sctp_transport_->SignalDataReceived.connect(
       this, &WebRtcSession::OnSctpTransportDataReceived_n);
   sctp_transport_->SignalStreamClosedRemotely.connect(
       this, &WebRtcSession::OnSctpStreamClosedRemotely_n);
   sctp_transport_name_ = rtc::Optional<std::string>(transport_name);
   sctp_content_name_ = rtc::Optional<std::string>(content_name);
   return true;
 }
 
 void WebRtcSession::ChangeSctpTransport_n(const std::string& transport_name) {
   RTC_DCHECK(network_thread_->IsCurrent());
   RTC_DCHECK(sctp_transport_);
   RTC_DCHECK(sctp_transport_name_);
   std::string old_sctp_transport_name = *sctp_transport_name_;
   sctp_transport_name_ = rtc::Optional<std::string>(transport_name);
-  cricket::TransportChannel* tc =
+  cricket::DtlsTransportInternal* tc =
       transport_controller_->CreateTransportChannel_n(
           transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);

[pthatcher1, 2017/01/13 22:41:16]

If it returns a DtlsTransport, then we should rename the TransportController to
be CreateDtlsTransport.

[Zhi Huang, 2017/01/16 10:38:24]

Sure. There will be no concept of "channel" in P2P level. 
Done

   sctp_transport_->SetTransportChannel(tc);
   transport_controller_->DestroyTransportChannel_n(
       old_sctp_transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
 }
 
 void WebRtcSession::DestroySctpTransport_n() {
   RTC_DCHECK(network_thread_->IsCurrent());
   sctp_transport_.reset(nullptr);
   sctp_content_name_.reset();
   sctp_transport_name_.reset();
@@ skipping 377 matching lines @@
         return *sctp_transport_name_;
       }
     }
     // Return an empty string if failed to retrieve the transport name.
     return "";
   }
   return channel->transport_name();
 }
 
 }  // namespace webrtc