Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/media/sctp/sctptransport.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 21 matching lines @@
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"  // For IsRtpPacket
 #include "webrtc/media/base/streamparams.h"
-#include "webrtc/p2p/base/dtlstransportinternal.h"  // For PF_NORMAL
 
 namespace {
 
 // The biggest SCTP packet. Starting from a 'safe' wire MTU value of 1280,
 // take off 80 bytes for DTLS/TURN/TCP/IP overhead.
 static constexpr size_t kSctpMtu = 1200;
 
 // The size of the SCTP association send buffer.  256kB, the usrsctp default.
 static constexpr int kSendBufferSize = 262144;
 
@@ skipping 325 matching lines @@
           << "SendThresholdCallback: Failed to get transport for socket "
           << sock;
       return 0;
     }
     transport->OnSendThresholdCallback();
     return 0;
   }
 };
 
 SctpTransport::SctpTransport(rtc::Thread* network_thread,
-                             rtc::PacketTransportInterface* channel)
+                             TransportChannel* channel)
     : network_thread_(network_thread),
       transport_channel_(channel),
       was_ever_writable_(channel->writable()) {
   RTC_DCHECK(network_thread_);
   RTC_DCHECK(transport_channel_);
   RTC_DCHECK_RUN_ON(network_thread_);
   ConnectTransportChannelSignals();
 }
 
 SctpTransport::~SctpTransport() {
   // Close abruptly; no reset procedure.
   CloseSctpSocket();
 }
 
-void SctpTransport::SetTransportChannel(
-    rtc::PacketTransportInterface* channel) {
+void SctpTransport::SetTransportChannel(cricket::TransportChannel* channel) {
   RTC_DCHECK_RUN_ON(network_thread_);
   RTC_DCHECK(channel);
   DisconnectTransportChannelSignals();
   transport_channel_ = channel;
   ConnectTransportChannelSignals();
   if (!was_ever_writable_ && channel->writable()) {
     was_ever_writable_ = true;
     // New channel is writable, now we can start the SCTP connection if Start
     // was called already.
     if (started_) {
@@ skipping 668 matching lines @@
       }
     }
   }
 
   // Always try to send the queued RESET because this call indicates that the
   // last local RESET or remote RESET has made some progress.
   SendQueuedStreamResets();
 }
 
 }  // namespace cricket