Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

webrtc/p2p/base/jseptransport.h

 /*
  *  Copyright 2004 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 11 matching lines @@
 #include "webrtc/base/rtccertificate.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
 
 namespace cricket {
 
-class DtlsTransportInternal;
+class TransportChannelImpl;
+class TransportChannelImpl;
 enum class IceCandidatePairState;
 
 typedef std::vector<Candidate> Candidates;
 
 // TODO(deadbeef): Move all of these enums, POD types and utility methods to
 // another header file.
 
 // TODO(deadbeef): Unify with PeerConnectionInterface::IceConnectionState
 // once /talk/ and /webrtc/ are combined, and also switch to ENUM_NAME naming
 // style.
@@ skipping 196 matching lines @@
   // may be set before a local certificate is generated.
   JsepTransport(const std::string& mid,
                 const rtc::scoped_refptr<rtc::RTCCertificate>& certificate);
 
   // Returns the MID of this transport.
   const std::string& mid() const { return mid_; }
 
   // Add or remove channel that is affected when a local/remote transport
   // description is set on this transport. Need to add all channels before
   // setting a transport description.
-  bool AddChannel(DtlsTransportInternal* dtls, int component);
+  bool AddChannel(TransportChannelImpl* dtls, int component);
   bool RemoveChannel(int component);
   bool HasChannels() const;
 
   bool ready_for_remote_candidates() const {
     return local_description_set_ && remote_description_set_;
   }
 
   // Must be called before applying local session description.
   // Needed in order to verify the local fingerprint.
   void SetLocalCertificate(
@@ skipping 65 matching lines @@
   // Negotiates the transport parameters based on the current local and remote
   // transport description, such as the ICE role to use, and whether DTLS
   // should be activated.
   //
   // Called when an answer TransportDescription is applied.
   bool NegotiateTransportDescription(ContentAction local_role,
                                      std::string* error_desc);
 
   // Pushes down the transport parameters from the local description, such
   // as the ICE ufrag and pwd.
-  bool ApplyLocalTransportDescription(DtlsTransportInternal* dtls_transport,
+  bool ApplyLocalTransportDescription(TransportChannelImpl* channel,
                                       std::string* error_desc);
 
   // Pushes down the transport parameters from the remote description to the
   // transport channel.
-  bool ApplyRemoteTransportDescription(DtlsTransportInternal* dtls_transport,
+  bool ApplyRemoteTransportDescription(TransportChannelImpl* channel,
                                        std::string* error_desc);
 
   // Pushes down the transport parameters obtained via negotiation.
-  bool ApplyNegotiatedTransportDescription(
-      DtlsTransportInternal* dtls_transport,
-      std::string* error_desc);
+  bool ApplyNegotiatedTransportDescription(TransportChannelImpl* channel,
+                                           std::string* error_desc);
 
   const std::string mid_;
   // needs-ice-restart bit as described in JSEP.
   bool needs_ice_restart_ = false;
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::SSLRole secure_role_ = rtc::SSL_CLIENT;
   std::unique_ptr<rtc::SSLFingerprint> remote_fingerprint_;
   std::unique_ptr<TransportDescription> local_description_;
   std::unique_ptr<TransportDescription> remote_description_;
   bool local_description_set_ = false;
   bool remote_description_set_ = false;
 
   // Candidate component => DTLS channel
-  std::map<int, DtlsTransportInternal*> channels_;
+  std::map<int, TransportChannelImpl*> channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(JsepTransport);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_JSEPTRANSPORT_H_