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

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index 6ea54194fbb8bf908cfd9d2e52f6ed76f0a7819e..17ea51f07255cd9c6420b6a316643a8637461447 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -39,6 +39,10 @@
 #include "webrtc/pc/rtcpmuxfilter.h"
 #include "webrtc/pc/srtpfilter.h"
 
+namespace rtc {
+struct PacketTransport;
+}
+
 namespace webrtc {
 class AudioSinkInterface;
 }  // namespace webrtc
@@ -233,13 +237,13 @@ class BaseChannel
                 const rtc::PacketOptions& options) override;
 
   // From TransportChannel
-  void OnWritableState(TransportChannel* channel);
-  virtual void OnChannelRead(TransportChannel* channel,
+  void OnWritableState(rtc::PacketTransport* pt);
+  virtual void OnChannelRead(rtc::PacketTransport* pt,
                              const char* data,
                              size_t len,
                              const rtc::PacketTime& packet_time,
                              int flags);

[pthatcher1, 2016/10/13 20:26:38]

OnChannelRead should probably be renamed to OnPacketRead.

[johan, 2016/10/14 16:09:33]

Acknowledged.

-  void OnReadyToSend(TransportChannel* channel);
+  void OnReadyToSend(rtc::PacketTransport* pt);
 
   void OnDtlsState(TransportChannel* channel, DtlsTransportState state);
 
@@ -356,7 +360,7 @@ class BaseChannel
   bool InitNetwork_n(const std::string* bundle_transport_name);
   void DisconnectTransportChannels_n();
   void DestroyTransportChannels_n();
-  void SignalSentPacket_n(TransportChannel* channel,
+  void SignalSentPacket_n(rtc::PacketTransport* pt,
                           const rtc::SentPacket& sent_packet);
   void SignalSentPacket_w(const rtc::SentPacket& sent_packet);
   bool IsReadyToSendMedia_n() const;
@@ -376,6 +380,7 @@ class BaseChannel
   // Expected to be true (as of typing this) for everything except data
   // channels.
   const bool rtcp_enabled_;
+  // TODO(johan): replace TransportChannel* by rtc::PacketTransport*.
   TransportChannel* transport_channel_ = nullptr;
   std::vector<std::pair<rtc::Socket::Option, int> > socket_options_;
   TransportChannel* rtcp_transport_channel_ = nullptr;
@@ -484,7 +489,7 @@ class VoiceChannel : public BaseChannel {
 
  private:
   // overrides from BaseChannel
-  void OnChannelRead(TransportChannel* channel,
+  void OnChannelRead(rtc::PacketTransport* pt,
                      const char* data,
                      size_t len,
                      const rtc::PacketTime& packet_time,