Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/transportchannel.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.
  */
 
 #ifndef WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_
 #define WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/candidatepairinterface.h"
+#include "webrtc/p2p/base/packettransportinterface.h"
+#include "webrtc/p2p/base/jseptransport.h"
+#include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/candidatepairinterface.h"
-#include "webrtc/p2p/base/jseptransport.h"
-#include "webrtc/p2p/base/icetransportinternal.h"
-#include "webrtc/p2p/base/packettransportinterface.h"
-#include "webrtc/p2p/base/transportdescription.h"
 
 namespace cricket {
 
 class Candidate;
 
 // Flags for SendPacket/SignalReadPacket.
 enum PacketFlags {
   PF_NORMAL       = 0x00,  // A normal packet.
   PF_SRTP_BYPASS  = 0x01,  // An encrypted SRTP packet; bypass any additional
                            // crypto provided by the transport (e.g. DTLS)
 };
 
+// Used to indicate channel's connection state.
+enum TransportChannelState {
+  STATE_INIT,
+  STATE_CONNECTING,  // Will enter this state once a connection is created
+  STATE_COMPLETED,
+  STATE_FAILED
+};
+
 // A TransportChannel represents one logical stream of packets that are sent
 // between the two sides of a session.
 // TODO(deadbeef): This interface currently represents the unity of an ICE
 // transport and a DTLS transport. They need to be separated apart.
 class TransportChannel : public rtc::PacketTransportInterface {
  public:
   TransportChannel(const std::string& transport_name, int component)
       : transport_name_(transport_name),
         component_(component),
         writable_(false),
         receiving_(false) {}
   virtual ~TransportChannel() {}
 
   // TODO(guoweis) - Make this pure virtual once all subclasses of
   // TransportChannel have this defined.
-  virtual IceTransportState GetState() const {
-    return IceTransportState::STATE_CONNECTING;
+  virtual TransportChannelState GetState() const {
+    return TransportChannelState::STATE_CONNECTING;
   }
 
   const std::string& transport_name() const { return transport_name_; }
   int component() const { return component_; }
-  std::string debug_name() const override {
+  const std::string debug_name() const override {
     return transport_name() + " " + std::to_string(component());
   }
 
   // Returns the states of this channel.  Each time one of these states changes,
   // a signal is raised.  These states are aggregated by the TransportManager.
   bool writable() const override { return writable_; }
   bool receiving() const override { return receiving_; }
   DtlsTransportState dtls_state() const { return dtls_state_; }
   // Emitted whenever DTLS-SRTP is setup which will require setting up a new
   // SRTP context.
@@ skipping 78 matching lines @@
   bool writable_;
   bool receiving_;
   DtlsTransportState dtls_state_ = DTLS_TRANSPORT_NEW;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_