Revert of TransportController refactoring.

webrtc/p2p/base/dtlstransportchannel.cc

Index: webrtc/p2p/base/dtlstransportchannel.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index b434d0860e1e73763a89d1fddbc2439d39fd5c4f..dcebdee53e48828842b0d8929a2a780e77c69311 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -87,9 +87,9 @@
 }
 
 DtlsTransportChannelWrapper::DtlsTransportChannelWrapper(
-    Transport* transport,
-    TransportChannelImpl* channel)
-    : TransportChannelImpl(channel->transport_name(), channel->component()),
+                                           Transport* transport,
+                                           TransportChannelImpl* channel)
+    : TransportChannelImpl(channel->content_name(), channel->component()),
       transport_(transport),
       worker_thread_(rtc::Thread::Current()),
       channel_(channel),
@@ -103,10 +103,12 @@
       &DtlsTransportChannelWrapper::OnReadPacket);
   channel_->SignalReadyToSend.connect(this,
       &DtlsTransportChannelWrapper::OnReadyToSend);
-  channel_->SignalGatheringState.connect(
-      this, &DtlsTransportChannelWrapper::OnGatheringState);
-  channel_->SignalCandidateGathered.connect(
-      this, &DtlsTransportChannelWrapper::OnCandidateGathered);
+  channel_->SignalRequestSignaling.connect(this,
+      &DtlsTransportChannelWrapper::OnRequestSignaling);
+  channel_->SignalCandidateReady.connect(this,
+      &DtlsTransportChannelWrapper::OnCandidateReady);
+  channel_->SignalCandidatesAllocationDone.connect(this,
+      &DtlsTransportChannelWrapper::OnCandidatesAllocationDone);
   channel_->SignalRoleConflict.connect(this,
       &DtlsTransportChannelWrapper::OnRoleConflict);
   channel_->SignalRouteChange.connect(this,
@@ -209,7 +211,7 @@
     return true;
   }
 
-  // Allow SetRemoteFingerprint with a NULL digest even if SetLocalCertificate
+  // Allow SetRemoteFingerprint with a NULL digest even if SetLocalIdentity
   // hasn't been called.
   if (dtls_state_ > STATE_OFFERED ||
       (dtls_state_ == STATE_NONE && !digest_alg.empty())) {
@@ -589,17 +591,22 @@
   return downward_->OnPacketReceived(data, size);
 }
 
-void DtlsTransportChannelWrapper::OnGatheringState(
+void DtlsTransportChannelWrapper::OnRequestSignaling(
     TransportChannelImpl* channel) {
   ASSERT(channel == channel_);
-  SignalGatheringState(this);
-}
-
-void DtlsTransportChannelWrapper::OnCandidateGathered(
-    TransportChannelImpl* channel,
-    const Candidate& c) {
-  ASSERT(channel == channel_);
-  SignalCandidateGathered(this, c);
+  SignalRequestSignaling(this);
+}
+
+void DtlsTransportChannelWrapper::OnCandidateReady(
+    TransportChannelImpl* channel, const Candidate& c) {
+  ASSERT(channel == channel_);
+  SignalCandidateReady(this, c);
+}
+
+void DtlsTransportChannelWrapper::OnCandidatesAllocationDone(
+    TransportChannelImpl* channel) {
+  ASSERT(channel == channel_);
+  SignalCandidatesAllocationDone(this);
 }
 
 void DtlsTransportChannelWrapper::OnRoleConflict(