Remove the dependency of TransportChannel and TransportChannelImpl.

webrtc/p2p/base/icetransportinternal.h

 /*
  *  Copyright 2016 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_ICETRANSPORTINTERNAL_H_
 #define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
 
-#include "webrtc/p2p/base/transportchannelimpl.h"
-
-namespace cricket {
-
-typedef TransportChannel IceTransportInternal;
-typedef TransportChannelImpl IceTransportInternal2;
-
-}  // namespace cricket
-
-/*
 #include <string>
 
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/packettransportinterface.h"
 #include "webrtc/p2p/base/transportdescription.h"
 
 namespace webrtc {
 class MetricsObserverInterface;
 }
 
 namespace cricket {
 
-enum class TransportState {
+class IceTransportInternal;
+typedef IceTransportInternal IceTransportInternal2;

[pthatcher1, 2017/01/13 22:41:16]

IceTransportInternal2?  What is that?

[Taylor Brandstetter, 2017/01/13 23:49:54]

Long story. Basically it's part of what we decided is the least painful  dance
for replacing "TransportChannel"/"TransportChannelImpl" with
"IceTransportInternal" given that the former are used by remoting. It will be
cleaned up in a follow up chromium CL/webrtc CL.

+
+// TODO(zhihuang): replace it with PeerConnectionInterface::IceConnectionState.

[pthatcher1, 2017/01/13 22:41:16]

"replace it" => "Replace this"

[Zhi Huang, 2017/01/16 10:38:24]

Done.

+enum class IceTransportState {
   STATE_INIT,
   STATE_CONNECTING,  // Will enter this state once a connection is created
   STATE_COMPLETED,
-  STATE_FAILEDs
+  STATE_FAILED
 };
 
 // TODO(zhihuang): Remove this once it's no longer used in
 // remoting/protocol/libjingle_transport_factory.cc
 enum IceProtocolType {
   ICEPROTO_RFC5245  // Standard RFC 5245 version of ICE.
 };
 
 // IceTransportInternal is an internal abstract class that does ICE.
 // Once the public interface is supported,
 // (https://www.w3.org/TR/webrtc/#rtcicetransport-interface)
 // the IceTransportInterface will be split from this class.
 class IceTransportInternal : public rtc::PacketTransportInterface {
  public:
-  virtual ~IceTransportInternal();
+  virtual ~IceTransportInternal(){};
 
-  virtual TransportState GetState() const = 0;
+  virtual IceTransportState GetState() const = 0;
 
   virtual const std::string& transport_name() const = 0;
 
   virtual int component() const = 0;
 
   virtual IceRole GetIceRole() const = 0;
 
   virtual void SetIceRole(IceRole role) = 0;
 
   virtual void SetIceTiebreaker(uint64_t tiebreaker) = 0;
@@ skipping 28 matching lines @@
 
   virtual void SetMetricsObserver(
       webrtc::MetricsObserverInterface* observer) = 0;
 
   virtual void AddRemoteCandidate(const Candidate& candidate) = 0;
 
   virtual void RemoveRemoteCandidate(const Candidate& candidate) = 0;
 
   virtual IceGatheringState gathering_state() const = 0;
 
+  // Returns the current stats for this connection.
+  virtual bool GetStats(ConnectionInfos* infos) = 0;
+
   sigslot::signal1<IceTransportInternal*> SignalGatheringState;
 
   // Handles sending and receiving of candidates.
   sigslot::signal2<IceTransportInternal*, const Candidate&>
       SignalCandidateGathered;
 
   sigslot::signal2<IceTransportInternal*, const Candidates&>
       SignalCandidatesRemoved;
 
   // Deprecated by SignalSelectedCandidatePairChanged
   // This signal occurs when there is a change in the way that packets are
   // being routed, i.e. to a different remote location. The candidate
   // indicates where and how we are currently sending media.
   sigslot::signal2<IceTransportInternal*, const Candidate&> SignalRouteChange;
 
   // Signalled when the current selected candidate pair has changed.
   // The first parameter is the transport that signals the event.
   // The second parameter is the new selected candidate pair. The third
   // parameter is the last packet id sent on the previous candidate pair.
   // The fourth parameter is a boolean which is true if the Transport
   // is ready to send with this candidate pair.
   sigslot::signal4<IceTransportInternal*, CandidatePairInterface*, int, bool>
       SignalSelectedCandidatePairChanged;
 
+  // Invoked when there is conflict in the ICE role between local and remote
+  // agents.
+  sigslot::signal1<IceTransportInternal*> SignalRoleConflict;
+
+  // Emitted whenever the transport state changed.
+  sigslot::signal1<IceTransportInternal*> SignalStateChanged;
+
   // Invoked when the transport is being destroyed.
   sigslot::signal1<IceTransportInternal*> SignalDestroyed;
 
   // Debugging description of this transport.
-  std::string ToString() const;
+  std::string debug_name() const override {
+    return transport_name() + " " + std::to_string(component());
+  }
 };
 
 }  // namespace cricket
-*/
+
 #endif  // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_