Remove the dependency of TransportChannel and TransportChannelImpl.

webrtc/p2p/base/transportcontroller.h

Index: webrtc/p2p/base/transportcontroller.h
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index 147d568a2e2b52f0949003df0766ba917f43edb1..d1d3f731cde362b5fd18a05c405339c016648e27 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -113,16 +113,16 @@ class TransportController : public sigslot::has_slots<>,
 
   // Creates a channel if it doesn't exist. Otherwise, increments a reference
   // count and returns an existing channel.
-  TransportChannel* CreateTransportChannel(const std::string& transport_name,
-                                           int component);
-  virtual TransportChannel* CreateTransportChannel_n(
+  DtlsTransportInternal* CreateDtlsTransport(const std::string& transport_name,
+                                             int component);
+  virtual DtlsTransportInternal* CreateDtlsTransport_n(
       const std::string& transport_name,
       int component);
 
   // Decrements a channel's reference count, and destroys the channel if
   // nothing is referencing it.
-  virtual void DestroyTransportChannel_n(const std::string& transport_name,
-                                         int component);
+  virtual void DestroyDtlsTransport_n(const std::string& transport_name,
+                                      int component);
 
   void use_quic() { quic_ = true; }
   bool quic() const { return quic_; }
@@ -133,8 +133,8 @@ class TransportController : public sigslot::has_slots<>,
     return certificate_;
   }
   std::vector<std::string> transport_names_for_testing();
-  std::vector<TransportChannelImpl*> channels_for_testing();
-  TransportChannelImpl* get_channel_for_testing(
+  std::vector<DtlsTransportInternal*> channels_for_testing();
+  DtlsTransportInternal* get_channel_for_testing(
       const std::string& transport_name,
       int component);
 
@@ -169,7 +169,7 @@ class TransportController : public sigslot::has_slots<>,
   virtual IceTransportInternal* CreateIceTransportChannel_n(
       const std::string& transport_name,
       int component);
-  virtual TransportChannelImpl* CreateDtlsTransportChannel_n(
+  virtual DtlsTransportInternal* CreateDtlsTransportChannel_n(
       const std::string& transport_name,
       int component,
       IceTransportInternal* ice);
@@ -231,14 +231,14 @@ class TransportController : public sigslot::has_slots<>,
   // Handlers for signals from Transport.
   void OnChannelWritableState_n(rtc::PacketTransportInterface* transport);
   void OnChannelReceivingState_n(rtc::PacketTransportInterface* transport);
-  void OnChannelGatheringState_n(TransportChannelImpl* channel);
-  void OnChannelCandidateGathered_n(TransportChannelImpl* channel,
+  void OnChannelGatheringState_n(IceTransportInternal* channel);
+  void OnChannelCandidateGathered_n(IceTransportInternal* channel,
                                     const Candidate& candidate);
   void OnChannelCandidatesRemoved(const Candidates& candidates);
-  void OnChannelCandidatesRemoved_n(TransportChannelImpl* channel,
+  void OnChannelCandidatesRemoved_n(IceTransportInternal* channel,
                                     const Candidates& candidates);
-  void OnChannelRoleConflict_n(TransportChannelImpl* channel);
-  void OnChannelStateChanged_n(TransportChannelImpl* channel);
+  void OnChannelRoleConflict_n(IceTransportInternal* channel);
+  void OnChannelStateChanged_n(IceTransportInternal* channel);
 
   void UpdateAggregateStates_n();