Revert of Removing HTTPS and SOCKS proxy server code.

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 eec7580a1c0325af06aa44ac4617629f1e1716ec..a77b037e7294133973f83bc41f49ba2dabb836bc 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -19,6 +19,7 @@
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/base/helpers.h"
+#include "webrtc/base/proxyinfo.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 
@@ -383,6 +384,16 @@ class PortAllocator : public sigslot::has_slots<> {
   uint32_t flags() const { return flags_; }
   void set_flags(uint32_t flags) { flags_ = flags; }
 
+  // These three methods are deprecated. If connections need to go through a
+  // proxy, the application should create a BasicPortAllocator given a custom
+  // PacketSocketFactory that creates proxy sockets.
+  const std::string& user_agent() const { return agent_; }
+  const rtc::ProxyInfo& proxy() const { return proxy_; }
+  void set_proxy(const std::string& agent, const rtc::ProxyInfo& proxy) {
+    agent_ = agent;
+    proxy_ = proxy;
+  }
+
   // Gets/Sets the port range to use when choosing client ports.
   int min_port() const { return min_port_; }
   int max_port() const { return max_port_; }
@@ -435,6 +446,8 @@ class PortAllocator : public sigslot::has_slots<> {
   }
 
   uint32_t flags_;
+  std::string agent_;
+  rtc::ProxyInfo proxy_;
   int min_port_;
   int max_port_;
   uint32_t step_delay_;