Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/dtlstransportchannel.cc

Index: webrtc/p2p/base/dtlstransportchannel.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index 56bd1e57e4e11902cf6dc994cd0db3980d7af655..6221057da43ef51d218ebf65fbafe61f38326911 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -50,10 +50,11 @@
   return (len >= kMinRtpPacketLen && (u[0] & 0xC0) == 0x80);
 }
 
-StreamInterfaceChannel::StreamInterfaceChannel(IceTransportInternal* channel)
+StreamInterfaceChannel::StreamInterfaceChannel(TransportChannel* channel)
     : channel_(channel),
       state_(rtc::SS_OPEN),
-      packets_(kMaxPendingPackets, kMaxDtlsPacketLen) {}
+      packets_(kMaxPendingPackets, kMaxDtlsPacketLen) {
+}
 
 rtc::StreamResult StreamInterfaceChannel::Read(void* buffer,
                                                      size_t buffer_len,
@@ -102,7 +103,7 @@
 }
 
 DtlsTransportChannelWrapper::DtlsTransportChannelWrapper(
-    IceTransportInternal* channel)
+    TransportChannelImpl* channel)
     : TransportChannelImpl(channel->transport_name(), channel->component()),
       network_thread_(rtc::Thread::Current()),
       channel_(channel),
@@ -683,39 +684,39 @@
 }
 
 void DtlsTransportChannelWrapper::OnGatheringState(
-    IceTransportInternal* channel) {
+    TransportChannelImpl* channel) {
   ASSERT(channel == channel_);
   SignalGatheringState(this);
 }
 
 void DtlsTransportChannelWrapper::OnCandidateGathered(
-    IceTransportInternal* channel,
+    TransportChannelImpl* channel,
     const Candidate& c) {
   ASSERT(channel == channel_);
   SignalCandidateGathered(this, c);
 }
 
 void DtlsTransportChannelWrapper::OnCandidatesRemoved(
-    IceTransportInternal* channel,
+    TransportChannelImpl* channel,
     const Candidates& candidates) {
   ASSERT(channel == channel_);
   SignalCandidatesRemoved(this, candidates);
 }
 
 void DtlsTransportChannelWrapper::OnRoleConflict(
-    IceTransportInternal* channel) {
+    TransportChannelImpl* channel) {
   ASSERT(channel == channel_);
   SignalRoleConflict(this);
 }
 
-void DtlsTransportChannelWrapper::OnRouteChange(IceTransportInternal* channel,
-                                                const Candidate& candidate) {
+void DtlsTransportChannelWrapper::OnRouteChange(
+    TransportChannel* channel, const Candidate& candidate) {
   ASSERT(channel == channel_);
   SignalRouteChange(this, candidate);
 }
 
 void DtlsTransportChannelWrapper::OnSelectedCandidatePairChanged(
-    IceTransportInternal* channel,
+    TransportChannel* channel,
     CandidatePairInterface* selected_candidate_pair,
     int last_sent_packet_id,
     bool ready_to_send) {
@@ -725,7 +726,7 @@
 }
 
 void DtlsTransportChannelWrapper::OnChannelStateChanged(
-    IceTransportInternal* channel) {
+    TransportChannelImpl* channel) {
   ASSERT(channel == channel_);
   SignalStateChanged(this);
 }