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

webrtc/p2p/base/dtlstransportchannel_unittest.cc

 /*
  *  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.
  */
 
 #include <memory>
 #include <set>
 
 #include "webrtc/p2p/base/dtlstransport.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
+#include "webrtc/p2p/base/packettransportinterface.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/stringutils.h"
 
 #define MAYBE_SKIP_TEST(feature)                              \
@@ skipping 331 matching lines @@
     int num_matches = 0;
     for (size_t i = kPacketNumOffset; i < size; ++i) {
       if (static_cast<uint8_t>(data[i]) == (packet_num & 0xff)) {
         ++num_matches;
       }
     }
     return (num_matches < ((static_cast<int>(size) - 5) / 10));
   }
 
   // Transport channel callbacks
-  void OnTransportChannelWritableState(cricket::TransportChannel* channel) {
-    LOG(LS_INFO) << name_ << ": Channel '" << channel->component()
+  void OnTransportChannelWritableState(
+      rtc::PacketTransportInterface* transport) {
+    LOG(LS_INFO) << name_ << ": Channel '" << transport->debug_name()
                  << "' is writable";
   }
 
-  void OnTransportChannelReadPacket(cricket::TransportChannel* channel,
-                                    const char* data, size_t size,
+  void OnTransportChannelReadPacket(rtc::PacketTransportInterface* transport,
+                                    const char* data,
+                                    size_t size,
                                     const rtc::PacketTime& packet_time,
                                     int flags) {
     uint32_t packet_num = 0;
     ASSERT_TRUE(VerifyPacket(data, size, &packet_num));
     received_.insert(packet_num);
     // Only DTLS-SRTP packets should have the bypass flag set.
     int expected_flags =
         (certificate_ && IsRtpLeadByte(data[0])) ? cricket::PF_SRTP_BYPASS : 0;
     ASSERT_EQ(expected_flags, flags);
   }
 
-  void OnTransportChannelSentPacket(cricket::TransportChannel* channel,
+  void OnTransportChannelSentPacket(rtc::PacketTransportInterface* transport,
                                     const rtc::SentPacket& sent_packet) {
     sent_packet_ = sent_packet;
   }
 
   rtc::SentPacket sent_packet() const { return sent_packet_; }
 
   // Hook into the raw packet stream to make sure DTLS packets are encrypted.
-  void OnFakeTransportChannelReadPacket(cricket::TransportChannel* channel,
-                                        const char* data, size_t size,
-                                        const rtc::PacketTime& time,
-                                        int flags) {
+  void OnFakeTransportChannelReadPacket(
+      rtc::PacketTransportInterface* transport,
+      const char* data,
+      size_t size,
+      const rtc::PacketTime& time,
+      int flags) {
     // Flags shouldn't be set on the underlying TransportChannel packets.
     ASSERT_EQ(0, flags);
 
     // Look at the handshake packets to see what role we played.
     // Check that non-handshake packets are DTLS data or SRTP bypass.
     if (data[0] == 22 && size > 17) {
       if (data[13] == 1) {
         ++received_dtls_client_hellos_;
       } else if (data[13] == 2) {
         ++received_dtls_server_hellos_;
@@ skipping 759 matching lines @@
             std::vector<DtlsTransportEvent>{
                 CALLER_RECEIVES_CLIENTHELLO, CALLER_RECEIVES_FINGERPRINT,
                 CALLER_WRITABLE, HANDSHAKE_FINISHES},
             std::vector<DtlsTransportEvent>{
                 CALLER_RECEIVES_CLIENTHELLO, CALLER_WRITABLE,
                 CALLER_RECEIVES_FINGERPRINT, HANDSHAKE_FINISHES},
             std::vector<DtlsTransportEvent>{CALLER_RECEIVES_CLIENTHELLO,
                                             CALLER_WRITABLE, HANDSHAKE_FINISHES,
                                             CALLER_RECEIVES_FINGERPRINT}),
         ::testing::Bool()));