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 a46ce00dbc329a8f4627cca1318d06139572a476..31cf8871b076229d3c56dfacd6dd24097aebd949 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -113,7 +113,7 @@ class TransportController : public sigslot::has_slots<>,
 
   // Creates a channel if it doesn't exist. Otherwise, increments a reference
   // count and returns an existing channel.
-  virtual TransportChannel* CreateTransportChannel_n(
+  virtual DtlsTransportInternal* CreateTransportChannel_n(
       const std::string& transport_name,
       int component);
 
@@ -131,8 +131,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);
 
@@ -164,13 +164,13 @@ class TransportController : public sigslot::has_slots<>,
   // TODO(deadbeef): Get rid of these virtual methods. Used by
   // FakeTransportController currently, but FakeTransportController shouldn't
   // even be functioning by subclassing TransportController.
-  virtual TransportChannelImpl* CreateIceTransportChannel_n(
+  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,
-      TransportChannelImpl* ice);
+      IceTransportInternal* ice);
 
  private:
   void OnMessage(rtc::Message* pmsg) override;
@@ -229,14 +229,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();