Revert of TransportController refactoring.

webrtc/p2p/base/portallocator.h

Index: webrtc/p2p/base/portallocator.h
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index 6e3efa8c4144d69fdfbb71ba30c6c14c3c09b872..b754376d89af3ae6d4eb4af2d565dcb6f47db169 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -74,10 +74,11 @@
 class PortAllocatorSession : public sigslot::has_slots<> {
  public:
   // Content name passed in mostly for logging and debugging.
+  // TODO(mallinath) - Change username and password to ice_ufrag and ice_pwd.
   PortAllocatorSession(const std::string& content_name,
                        int component,
-                       const std::string& ice_ufrag,
-                       const std::string& ice_pwd,
+                       const std::string& username,
+                       const std::string& password,
                        uint32 flags);
 
   // Subclasses should clean up any ports created.
@@ -102,14 +103,9 @@
   virtual void set_generation(uint32 generation) { generation_ = generation; }
   sigslot::signal1<PortAllocatorSession*> SignalDestroyed;
 
-  const std::string& ice_ufrag() const { return ice_ufrag_; }
-  const std::string& ice_pwd() const { return ice_pwd_; }
-
  protected:
-  // TODO(deadbeef): Get rid of these when everyone switches to ice_ufrag and
-  // ice_pwd.
-  const std::string& username() const { return ice_ufrag_; }
-  const std::string& password() const { return ice_pwd_; }
+  const std::string& username() const { return username_; }
+  const std::string& password() const { return password_; }
 
   std::string content_name_;
   int component_;
@@ -117,8 +113,8 @@
  private:
   uint32 flags_;
   uint32 generation_;
-  std::string ice_ufrag_;
-  std::string ice_pwd_;
+  std::string username_;
+  std::string password_;
 };
 
 class PortAllocator : public sigslot::has_slots<> {