Introduce rtc::PacketTransportInterface and let cricket::TransportChannel inherit.

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 81802fd21d4e1508c2d9364f0f397004a08593e0..916945e0f4f77ba438a77e72d285dd10ade3857e 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -22,6 +22,10 @@
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/stream.h"
 
+namespace rtc {
+struct PacketTransportInterface;

[Taylor Brandstetter, 2016/10/17 23:24:50]

If you change "struct" to "class", remember to change here as well.

[johan, 2016/10/18 09:17:08]

Done.

+}
+
 namespace cricket {
 
 // A bridge between a packet-oriented/channel-type interface on
@@ -203,12 +207,15 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
   bool IsDtlsConnected();
 
  private:
-  void OnWritableState(TransportChannel* channel);
-  void OnReadPacket(TransportChannel* channel, const char* data, size_t size,
-                    const rtc::PacketTime& packet_time, int flags);
-  void OnSentPacket(TransportChannel* channel,
+  void OnWritableState(rtc::PacketTransportInterface* transport);
+  void OnReadPacket(rtc::PacketTransportInterface* transport,
+                    const char* data,
+                    size_t size,
+                    const rtc::PacketTime& packet_time,
+                    int flags);
+  void OnSentPacket(rtc::PacketTransportInterface* transport,
                     const rtc::SentPacket& sent_packet);
-  void OnReadyToSend(TransportChannel* channel);
+  void OnReadyToSend(rtc::PacketTransportInterface* transport);
   void OnReceivingState(TransportChannel* channel);
   void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err);
   bool SetupDtls();