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

webrtc/p2p/base/transportcontroller.h

 /*
  *  Copyright 2015 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_TRANSPORTCONTROLLER_H_
 #define WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/transport.h"
 
 namespace rtc {
 class Thread;
+struct PacketTransport;
 }
 namespace webrtc {
 class MetricsObserverInterface;
 }
 
 namespace cricket {
 
 class TransportController : public sigslot::has_slots<>,
                             public rtc::MessageHandler {
  public:
@@ skipping 160 matching lines @@
                                        std::string* err);
   void MaybeStartGathering_n();
   bool AddRemoteCandidates_n(const std::string& transport_name,
                              const Candidates& candidates,
                              std::string* err);
   bool RemoveRemoteCandidates_n(const Candidates& candidates, std::string* err);
   bool ReadyForRemoteCandidates_n(const std::string& transport_name);
   bool GetStats_n(const std::string& transport_name, TransportStats* stats);
 
   // Handlers for signals from Transport.
-  void OnChannelWritableState_n(TransportChannel* channel);
+  void OnChannelWritableState_n(rtc::PacketTransport* pt);

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

This could probably still be a TransportChannel*.  All the others are, and the
method is "OnChannelX".

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

Acknowledged.

   void OnChannelReceivingState_n(TransportChannel* channel);
   void OnChannelGatheringState_n(TransportChannelImpl* channel);
   void OnChannelCandidateGathered_n(TransportChannelImpl* channel,
                                     const Candidate& candidate);
   void OnChannelCandidatesRemoved(const Candidates& candidates);
   void OnChannelCandidatesRemoved_n(TransportChannelImpl* channel,
                                     const Candidates& candidates);
   void OnChannelRoleConflict_n(TransportChannelImpl* channel);
   void OnChannelStateChanged_n(TransportChannelImpl* channel);
 
@@ skipping 25 matching lines @@
   rtc::AsyncInvoker invoker_;
   // True if QUIC is used instead of DTLS.
   bool quic_ = false;
 
   webrtc::MetricsObserverInterface* metrics_observer_ = nullptr;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_