Prepare to introduce the IceTransportInternal.

webrtc/p2p/base/icetransportinternal.h

Index: webrtc/p2p/base/icetransportinternal.h
diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h
index 4c47a140a5145103bf1d259ccecdf5368d4fd7ea..94556fd4270fb8a2ab8d1707770983fc03f41152 100644
--- a/webrtc/p2p/base/icetransportinternal.h
+++ b/webrtc/p2p/base/icetransportinternal.h
@@ -11,120 +11,11 @@
 #ifndef WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
 #define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
 
-#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;
-}
+#include "webrtc/p2p/base/transportchannel.h"

[Taylor Brandstetter, 2016/12/23 07:12:51]

Does this need to include transportchannelimpl.h?

[Zhi Huang, 2016/12/27 19:10:14]

I only included the transportchannelimpl.h since TransportChannel is the base
class.

 
 namespace cricket {
-
-enum class TransportState {
-  STATE_INIT,
-  STATE_CONNECTING,  // Will enter this state once a connection is created
-  STATE_COMPLETED,
-  STATE_FAILEDs
-};

[Taylor Brandstetter, 2016/12/23 07:12:51]

Again, I'd suggest leaving this code, but commented out (/* ... */). That will
make the diffs clearer later.

[Zhi Huang, 2016/12/27 19:10:14]

Done.

-
-// 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 TransportState 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;
-
-  // TODO(zhihuang): Remove this once it's no longer called in
-  // remoting/protocol/libjingle_transport_factory.cc
-  virtual void SetIceProtocolType(IceProtocolType type) {}
-
-  virtual void SetIceCredentials(const std::string& ice_ufrag,
-                                 const std::string& ice_pwd) {
-    SetIceParameters(IceParameters(ice_ufrag, ice_pwd, false));
-  }
-
-  virtual void SetRemoteIceCredentials(const std::string& ice_ufrag,
-                                       const std::string& ice_pwd) {
-    SetRemoteIceParameters(IceParameters(ice_ufrag, ice_pwd, false));
-  }
-
-  // The ufrag and pwd in |ice_params| must be set
-  // before candidate gathering can start.
-  virtual void SetIceParameters(const IceParameters& ice_params) = 0;
-
-  virtual void SetRemoteIceParameters(const IceParameters& ice_params) = 0;
-
-  virtual void SetRemoteIceMode(IceMode mode) = 0;
-
-  virtual void SetIceConfig(const IceConfig& config) = 0;
-
-  // Start gathering candidates if not already started, or if an ICE restart
-  // occurred.
-  virtual void MaybeStartGathering() = 0;
-
-  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;
-
-  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 the transport is being destroyed.
-  sigslot::signal1<IceTransportInternal*> SignalDestroyed;
-
-  // Debugging description of this transport.
-  std::string ToString() const;
-};
+typedef TransportChannel IceTransportInternal;
+typedef TransportChannelImpl IceTransportInternal2;
 
 }  // namespace cricket