Revert of TransportController refactoring.

webrtc/p2p/base/p2ptransport.cc

Index: webrtc/p2p/base/p2ptransport.cc
diff --git a/webrtc/p2p/base/p2ptransport.cc b/webrtc/p2p/base/p2ptransport.cc
index abc4c145045eb0d33106ef7c245ca9b5cc1260fc..b919fde31a5100ca33d6819d7978859dc9b8de23 100644
--- a/webrtc/p2p/base/p2ptransport.cc
+++ b/webrtc/p2p/base/p2ptransport.cc
@@ -20,15 +20,21 @@
 
 namespace cricket {
 
-P2PTransport::P2PTransport(const std::string& name, PortAllocator* allocator)
-    : Transport(name, allocator) {}
+P2PTransport::P2PTransport(rtc::Thread* signaling_thread,
+                           rtc::Thread* worker_thread,
+                           const std::string& content_name,
+                           PortAllocator* allocator)
+    : Transport(signaling_thread, worker_thread,
+                content_name, allocator) {
+}
 
 P2PTransport::~P2PTransport() {
   DestroyAllChannels();
 }
 
 TransportChannelImpl* P2PTransport::CreateTransportChannel(int component) {
-  return new P2PTransportChannel(name(), component, this, port_allocator());
+  return new P2PTransportChannel(content_name(), component, this,
+                                 port_allocator());
 }
 
 void P2PTransport::DestroyTransportChannel(TransportChannelImpl* channel) {