Remove the dependency of TransportChannel and TransportChannelImpl.

webrtc/p2p/base/jseptransport.h

Index: webrtc/p2p/base/jseptransport.h
diff --git a/webrtc/p2p/base/jseptransport.h b/webrtc/p2p/base/jseptransport.h
index ff0edebca63a4d1298d6205f3352cfcbc9b1ff88..5d715c106694edb8f85b71497edb7c0dad16427e 100644
--- a/webrtc/p2p/base/jseptransport.h
+++ b/webrtc/p2p/base/jseptransport.h
@@ -17,20 +17,19 @@
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/messagequeue.h"
 #include "webrtc/base/optional.h"
+#include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 
 namespace cricket {
 
-class TransportChannelImpl;
-class TransportChannelImpl;
+class DtlsTransportInternal;
 enum class IceCandidatePairState;
 
 typedef std::vector<Candidate> Candidates;
@@ -246,7 +245,7 @@ class JsepTransport : public sigslot::has_slots<> {
   // Add or remove channel that is affected when a local/remote transport
   // description is set on this transport. Need to add all channels before
   // setting a transport description.
-  bool AddChannel(TransportChannelImpl* dtls, int component);
+  bool AddChannel(DtlsTransportInternal* dtls, int component);
   bool RemoveChannel(int component);
   bool HasChannels() const;
 
@@ -322,8 +321,6 @@ class JsepTransport : public sigslot::has_slots<> {
                      std::string* error_desc) const;
 
  private:
-  TransportChannelImpl* GetChannel(int component);
-
   // Negotiates the transport parameters based on the current local and remote
   // transport description, such as the ICE role to use, and whether DTLS
   // should be activated.
@@ -334,17 +331,18 @@ class JsepTransport : public sigslot::has_slots<> {
 
   // Pushes down the transport parameters from the local description, such
   // as the ICE ufrag and pwd.
-  bool ApplyLocalTransportDescription(TransportChannelImpl* channel,
+  bool ApplyLocalTransportDescription(DtlsTransportInternal* dtls_transport,
                                       std::string* error_desc);
 
   // Pushes down the transport parameters from the remote description to the
   // transport channel.
-  bool ApplyRemoteTransportDescription(TransportChannelImpl* channel,
+  bool ApplyRemoteTransportDescription(DtlsTransportInternal* dtls_transport,
                                        std::string* error_desc);
 
   // Pushes down the transport parameters obtained via negotiation.
-  bool ApplyNegotiatedTransportDescription(TransportChannelImpl* channel,
-                                           std::string* error_desc);
+  bool ApplyNegotiatedTransportDescription(
+      DtlsTransportInternal* dtls_transport,
+      std::string* error_desc);
 
   const std::string mid_;
   // needs-ice-restart bit as described in JSEP.
@@ -358,7 +356,7 @@ class JsepTransport : public sigslot::has_slots<> {
   bool remote_description_set_ = false;
 
   // Candidate component => DTLS channel
-  std::map<int, TransportChannelImpl*> channels_;
+  std::map<int, DtlsTransportInternal*> channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(JsepTransport);
 };