Revert of make the DtlsTransportWrapper inherit form DtlsTransportInternal

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.
  */
 
@@ skipping 95 matching lines @@
   bool RemoveRemoteCandidates(const Candidates& candidates, std::string* err);
   bool ReadyForRemoteCandidates(const std::string& transport_name) const;
   // TODO(deadbeef): GetStats isn't const because all the way down to
   // OpenSSLStreamAdapter,
   // GetSslCipherSuite and GetDtlsSrtpCryptoSuite are not const. Fix this.
   bool GetStats(const std::string& transport_name, TransportStats* stats);
   void SetMetricsObserver(webrtc::MetricsObserverInterface* metrics_observer);
 
   // Creates a channel if it doesn't exist. Otherwise, increments a reference
   // count and returns an existing channel.
-  DtlsTransportInternal* CreateDtlsTransport(const std::string& transport_name,
-                                             int component);
-  virtual DtlsTransportInternal* CreateDtlsTransport_n(
+  TransportChannel* CreateTransportChannel(const std::string& transport_name,
+                                           int component);
+  virtual TransportChannel* CreateTransportChannel_n(
       const std::string& transport_name,
       int component);
 
   // Decrements a channel's reference count, and destroys the channel if
   // nothing is referencing it.
-  virtual void DestroyDtlsTransport(const std::string& transport_name,
-                                    int component);
-  virtual void DestroyDtlsTransport_n(const std::string& transport_name,
-                                      int component);
+  virtual void DestroyTransportChannel(const std::string& transport_name,
+                                       int component);
+  virtual void DestroyTransportChannel_n(const std::string& transport_name,
+                                         int component);
 
   void use_quic() { quic_ = true; }
   bool quic() const { return quic_; }
 
   // TODO(deadbeef): Remove all for_testing methods!
   const rtc::scoped_refptr<rtc::RTCCertificate>& certificate_for_testing()
       const {
     return certificate_;
   }
   std::vector<std::string> transport_names_for_testing();
-  std::vector<DtlsTransportInternal*> channels_for_testing();
-  DtlsTransportInternal* get_channel_for_testing(
+  std::vector<TransportChannelImpl*> channels_for_testing();
+  TransportChannelImpl* get_channel_for_testing(
       const std::string& transport_name,
       int component);
 
   // All of these signals are fired on the signalling thread.
 
   // If any transport failed => failed,
   // Else if all completed => completed,
   // Else if all connected => connected,
   // Else => connecting
   sigslot::signal1<IceConnectionState> SignalConnectionState;
@@ skipping 14 matching lines @@
 
   sigslot::signal1<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
 
  protected:
   // TODO(deadbeef): Get rid of these virtual methods. Used by
   // FakeTransportController currently, but FakeTransportController shouldn't
   // even be functioning by subclassing TransportController.
   virtual IceTransportInternal* CreateIceTransportChannel_n(
       const std::string& transport_name,
       int component);
-  virtual DtlsTransportInternal* CreateDtlsTransportChannel_n(
+  virtual TransportChannelImpl* CreateDtlsTransportChannel_n(
       const std::string& transport_name,
       int component,
       IceTransportInternal* ice);
 
  private:
   void OnMessage(rtc::Message* pmsg) override;
 
   class ChannelPair;
   typedef rtc::RefCountedObject<ChannelPair> RefCountedChannel;
 
@@ skipping 41 matching lines @@
                              const Candidates& candidates,
                              std::string* err);
   bool RemoveRemoteCandidates_n(const Candidates& candidates, std::string* err);
   bool ReadyForRemoteCandidates_n(const std::string& transport_name) const;
   bool GetStats_n(const std::string& transport_name, TransportStats* stats);
   void SetMetricsObserver_n(webrtc::MetricsObserverInterface* metrics_observer);
 
   // Handlers for signals from Transport.
   void OnChannelWritableState_n(rtc::PacketTransportInterface* transport);
   void OnChannelReceivingState_n(rtc::PacketTransportInterface* transport);
-  void OnChannelGatheringState_n(IceTransportInternal* channel);
-  void OnChannelCandidateGathered_n(IceTransportInternal* channel,
+  void OnChannelGatheringState_n(TransportChannelImpl* channel);
+  void OnChannelCandidateGathered_n(TransportChannelImpl* channel,
                                     const Candidate& candidate);
   void OnChannelCandidatesRemoved(const Candidates& candidates);
-  void OnChannelCandidatesRemoved_n(IceTransportInternal* channel,
+  void OnChannelCandidatesRemoved_n(TransportChannelImpl* channel,
                                     const Candidates& candidates);
-  void OnChannelRoleConflict_n(IceTransportInternal* channel);
-  void OnChannelStateChanged_n(IceTransportInternal* channel);
+  void OnChannelRoleConflict_n(TransportChannelImpl* channel);
+  void OnChannelStateChanged_n(TransportChannelImpl* channel);
 
   void UpdateAggregateStates_n();
 
   void OnDtlsHandshakeError(rtc::SSLHandshakeError error);
 
   rtc::Thread* const signaling_thread_ = nullptr;
   rtc::Thread* const network_thread_ = nullptr;
   PortAllocator* const port_allocator_ = nullptr;
 
   std::map<std::string, std::unique_ptr<JsepTransport>> transports_;
@@ skipping 15 matching lines @@
   bool quic_ = false;
 
   webrtc::MetricsObserverInterface* metrics_observer_ = nullptr;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportController);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_