Revert of 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 ddddf15a030a21a391efbc68f5d0feb33d11e3ee..3aca951a2370537b4c5c88a309708f592480729b 100644
--- a/webrtc/p2p/base/transportchannelimpl.h
+++ b/webrtc/p2p/base/transportchannelimpl.h
@@ -32,9 +32,8 @@
 // client.
 class TransportChannelImpl : public TransportChannel {
  public:
-  explicit TransportChannelImpl(const std::string& transport_name,
-                                int component)
-      : TransportChannel(transport_name, component) {}
+  explicit TransportChannelImpl(const std::string& content_name, int component)
+      : TransportChannel(content_name, component) {}
 
   // Returns the transport that created this channel.
   virtual Transport* GetTransport() = 0;
@@ -64,11 +63,11 @@
   // Begins the process of attempting to make a connection to the other client.
   virtual void Connect() = 0;
 
-  // Start gathering candidates if not already started, or if an ICE restart
-  // occurred.
-  virtual void MaybeStartGathering() = 0;
-
-  sigslot::signal1<TransportChannelImpl*> SignalGatheringState;
+  // 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;
 
   // Handles sending and receiving of candidates.  The Transport
   // receives the candidates and may forward them to the relevant
@@ -78,11 +77,9 @@
   // 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&>
-      SignalCandidateGathered;
-  virtual void AddRemoteCandidate(const Candidate& candidate) = 0;
-
-  virtual IceGatheringState gathering_state() const = 0;
+  sigslot::signal2<TransportChannelImpl*,
+                   const Candidate&> SignalCandidateReady;
+  virtual void OnCandidate(const Candidate& candidate) = 0;
 
   // DTLS methods
   virtual bool SetLocalCertificate(
@@ -94,6 +91,9 @@
     size_t digest_len) = 0;
 
   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.