TransportController refactoring

webrtc/p2p/base/transportchannelimpl.h

Index: webrtc/p2p/base/transportchannelimpl.h
diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h
index 705550b52a846c263a30f93ab55148eb49424c26..098e23eec6da00b8188bc4f1d619190edd7b5861 100644
--- a/webrtc/p2p/base/transportchannelimpl.h
+++ b/webrtc/p2p/base/transportchannelimpl.h
@@ -57,11 +57,7 @@ class TransportChannelImpl : public TransportChannel {
   // Begins the process of attempting to make a connection to the other client.
   virtual void Connect() = 0;
 
-  // Allows an individual channel to request signaling and be notified when it
-  // is ready.  This is useful if the individual named channels have need to
-  // send their own transport-info stanzas.
-  sigslot::signal1<TransportChannelImpl*> SignalRequestSignaling;
-  virtual void OnSignalingReady() = 0;
+  sigslot::signal1<TransportChannelImpl*> SignalGatheringState;
 
   // Handles sending and receiving of candidates.  The Transport
   // receives the candidates and may forward them to the relevant
@@ -71,10 +67,12 @@ class TransportChannelImpl : public TransportChannel {
   // channel, they cannot return an error if the message is invalid.
   // It is assumed that the Transport will have checked validity
   // before forwarding.
-  sigslot::signal2<TransportChannelImpl*,
-                   const Candidate&> SignalCandidateReady;
+  sigslot::signal2<TransportChannelImpl*, const Candidate&>
+      SignalCandidateGathered;
   virtual void OnCandidate(const Candidate& candidate) = 0;
 
+  virtual IceGatheringState gathering_state() const = 0;
+
   // DTLS methods
   // Set DTLS local identity.  The identity object is not copied, but the caller
   // retains ownership and must delete it after this TransportChannelImpl is
@@ -89,9 +87,6 @@ class TransportChannelImpl : public TransportChannel {
 
   virtual bool SetSslRole(rtc::SSLRole role) = 0;
 
-  // TransportChannel is forwarding this signal from PortAllocatorSession.
-  sigslot::signal1<TransportChannelImpl*> SignalCandidatesAllocationDone;
-
   // Invoked when there is conflict in the ICE role between local and remote
   // agents.
   sigslot::signal1<TransportChannelImpl*> SignalRoleConflict;