Make P2PTransportChannel inherit from 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..b58bf7953bc9cbe3a3a6b71f0508280a5f0271b5 100644
--- a/webrtc/p2p/base/icetransportinternal.h
+++ b/webrtc/p2p/base/icetransportinternal.h
@@ -29,7 +29,7 @@ enum class TransportState {
   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
@@ -44,7 +44,7 @@ enum IceProtocolType {
 // the IceTransportInterface will be split from this class.
 class IceTransportInternal : public rtc::PacketTransportInterface {
  public:
-  virtual ~IceTransportInternal();
+  virtual ~IceTransportInternal(){};

[Taylor Brandstetter, 2016/12/20 03:37:26]

Does this destructor need a body?

[Zhi Huang, 2016/12/20 20:17:43]

Done.

 
   virtual TransportState GetState() const = 0;
 
@@ -95,6 +95,9 @@ class IceTransportInternal : public rtc::PacketTransportInterface {
 
   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.
@@ -119,11 +122,20 @@ class IceTransportInternal : public rtc::PacketTransportInterface {
   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 channel state changed.

[Taylor Brandstetter, 2016/12/20 03:37:26]

transport channel -> transport

[Zhi Huang, 2016/12/20 20:17:43]

Done.

+  sigslot::signal1<IceTransportInternal*> SignalStateChanged;
+
   // Invoked when the transport is being destroyed.
   sigslot::signal1<IceTransportInternal*> SignalDestroyed;
 
   // Debugging description of this transport.
-  std::string ToString() const;
+  virtual const std::string debug_name() const {

[Taylor Brandstetter, 2016/12/20 03:37:26]

nit: Doesn't need to return a const string.

[Zhi Huang, 2016/12/20 20:17:43]

I meant to override the PacketTransportInterface::debug_name().
I'll change it to 
 
   const std::string debug_name() const override {...}

Or do you think it's better to change the method signature in
PacketTransportInterface?

[Taylor Brandstetter, 2016/12/20 20:27:15]

Ah, I see. I think in PacketTransportInterface it was meant to return a const
ref. That's fine, although that would mean you can't construct the debug name in
this method, it would need to be stored as a member variable. Which means the
implementation should move to P2PTransportChannel/FakeIceTransport.

Or you can just return a string by value; since it's only used for debug log
statements, I don't think the performance overhead is important.

+    return transport_name() + " " + std::to_string(component());
+  }
 };
 
 }  // namespace cricket