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

webrtc/p2p/base/dtlstransportchannel.h

 /*
  *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
 #define WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
 
 #include <memory>
 #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"
 
+namespace rtc {
+struct PacketTransport;
+}
+
 namespace cricket {
 
 // 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(TransportChannel* channel);
 
   // Push in a packet; this gets pulled out from Read().
   bool OnPacketReceived(const char* data, size_t size);
@@ skipping 161 matching lines @@
 
   // Needed by DtlsTransport.
   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
   // has not yet been verified.
   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::PacketTransport* pt);
+  void OnReadPacket(rtc::PacketTransport* pt,
+                    const char* data,
+                    size_t size,
+                    const rtc::PacketTime& packet_time,
+                    int flags);
+  void OnSentPacket(rtc::PacketTransport* pt,
                     const rtc::SentPacket& sent_packet);
-  void OnReadyToSend(TransportChannel* channel);
+  void OnReadyToSend(rtc::PacketTransport* pt);

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

Can you call these "transport" instead of "pt"?  "pt" sounds like "payload type"
to me.  

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

Done.

   void OnReceivingState(TransportChannel* channel);
   void OnDtlsEvent(rtc::StreamInterface* stream_, int sig, int err);
   bool SetupDtls();
   void MaybeStartDtls();
   bool HandleDtlsPacket(const char* data, size_t size);
   void OnGatheringState(TransportChannelImpl* channel);
   void OnCandidateGathered(TransportChannelImpl* channel, const Candidate& c);
   void OnCandidatesRemoved(TransportChannelImpl* channel,
                            const Candidates& candidates);
   void OnRoleConflict(TransportChannelImpl* channel);
@@ skipping 24 matching lines @@
   // transport channel became writable, or before a remote fingerprint was
   // received.
   rtc::Buffer cached_client_hello_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DtlsTransportChannelWrapper);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_