Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/transportchannel.h

Index: webrtc/p2p/base/transportchannel.h
diff --git a/webrtc/p2p/base/transportchannel.h b/webrtc/p2p/base/transportchannel.h
index 64155453afb4400e9105e624ceb6bfc8fc6b46a2..c7c3c755f3a97e193689170f7cea6ba047bf3fc8 100644
--- a/webrtc/p2p/base/transportchannel.h
+++ b/webrtc/p2p/base/transportchannel.h
@@ -15,20 +15,19 @@
 #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 {
 
@@ -39,6 +38,14 @@
   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
@@ -56,13 +63,13 @@
 
   // 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());
   }