Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/dtlstransportchannel.h

Index: webrtc/p2p/base/dtlstransportchannel.h
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
index a8d5d5bcfab720080f91830ab407a5f073724d13..5850813fcd6002d36b556572b31e9e1ead0b765d 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -15,13 +15,12 @@
 #include <string>
 #include <vector>
 
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/bufferqueue.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/stream.h"
-#include "webrtc/p2p/base/icetransportinternal.h"
-#include "webrtc/p2p/base/transportchannelimpl.h"
 
 namespace rtc {
 class PacketTransportInterface;
@@ -29,11 +28,11 @@
 
 namespace cricket {
 
-// A bridge between a packet-oriented/transport-type interface on
+// A bridge between a packet-oriented/channel-type interface on
 // the bottom and a StreamInterface on the top.
 class StreamInterfaceChannel : public rtc::StreamInterface {
  public:
-  explicit StreamInterfaceChannel(IceTransportInternal* channel);
+  explicit StreamInterfaceChannel(TransportChannel* channel);
 
   // Push in a packet; this gets pulled out from Read().
   bool OnPacketReceived(const char* data, size_t size);
@@ -51,7 +50,7 @@
                           int* error) override;
 
  private:
-  IceTransportInternal* channel_;  // owned by DtlsTransportChannelWrapper
+  TransportChannel* channel_;  // owned by DtlsTransportChannelWrapper
   rtc::StreamState state_;
   rtc::BufferQueue packets_;
 
@@ -89,7 +88,7 @@
  public:
   // The parameters here are:
   // channel -- the TransportChannel we are wrapping
-  explicit DtlsTransportChannelWrapper(IceTransportInternal* channel);
+  explicit DtlsTransportChannelWrapper(TransportChannelImpl* channel);
   ~DtlsTransportChannelWrapper() override;
 
   void SetIceRole(IceRole role) override { channel_->SetIceRole(role); }
@@ -162,7 +161,9 @@
   }
 
   // TransportChannelImpl calls.
-  IceTransportState GetState() const override { return channel_->GetState(); }
+  TransportChannelState GetState() const override {
+    return channel_->GetState();
+  }
   void SetIceTiebreaker(uint64_t tiebreaker) override {
     channel_->SetIceTiebreaker(tiebreaker);
   }
@@ -198,7 +199,7 @@
   }
 
   // Needed by DtlsTransport.
-  IceTransportInternal* channel() { return channel_; }
+  TransportChannelImpl* channel() { return channel_; }
 
   // For informational purposes. Tells if the DTLS handshake has finished.
   // This may be true even if writable() is false, if the remote fingerprint
@@ -220,23 +221,23 @@
   bool SetupDtls();
   void MaybeStartDtls();
   bool HandleDtlsPacket(const char* data, size_t size);
-  void OnGatheringState(IceTransportInternal* channel);
-  void OnCandidateGathered(IceTransportInternal* channel, const Candidate& c);
-  void OnCandidatesRemoved(IceTransportInternal* channel,
+  void OnGatheringState(TransportChannelImpl* channel);
+  void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c);
+  void OnCandidatesRemoved(TransportChannelImpl* channel,
                            const Candidates& candidates);
-  void OnRoleConflict(IceTransportInternal* channel);
-  void OnRouteChange(IceTransportInternal* channel, const Candidate& candidate);
+  void OnRoleConflict(TransportChannelImpl* channel);
+  void OnRouteChange(TransportChannel* channel, const Candidate& candidate);
   void OnSelectedCandidatePairChanged(
-      IceTransportInternal* channel,
+      TransportChannel* channel,
       CandidatePairInterface* selected_candidate_pair,
       int last_sent_packet_id,
       bool ready_to_send);
-  void OnChannelStateChanged(IceTransportInternal* channel);
+  void OnChannelStateChanged(TransportChannelImpl* channel);
   void OnDtlsHandshakeError(rtc::SSLHandshakeError error);
 
   rtc::Thread* network_thread_;  // Everything should occur on this thread.
   // Underlying channel, not owned by this class.
-  IceTransportInternal* const channel_;
+  TransportChannelImpl* const channel_;
   std::unique_ptr<rtc::SSLStreamAdapter> dtls_;  // The DTLS stream
   StreamInterfaceChannel* downward_;  // Wrapper for channel_, owned by dtls_.
   std::vector<int> srtp_ciphers_;     // SRTP ciphers to use with DTLS.