Revert of Removing HTTPS and SOCKS proxy server code.

webrtc/base/proxyinfo.h

Index: webrtc/base/proxyinfo.h
diff --git a/webrtc/base/proxyinfo.h b/webrtc/base/proxyinfo.h
index cd5c3875dd9ccffa5eb07bee68ec921d982bd7e6..2251b13ee2eac883bb8bdc72517bee89ce5047d5 100644
--- a/webrtc/base/proxyinfo.h
+++ b/webrtc/base/proxyinfo.h
@@ -11,15 +11,31 @@
 #ifndef WEBRTC_BASE_PROXYINFO_H__
 #define WEBRTC_BASE_PROXYINFO_H__
 
+#include <string>
+#include "webrtc/base/socketaddress.h"
+#include "webrtc/base/cryptstring.h"
+
 namespace rtc {
 
-// TODO(deadbeef): Remove this; it's not used any more but it's referenced in
-// some places, including chromium.
 enum ProxyType {
   PROXY_NONE,
+  PROXY_HTTPS,
+  PROXY_SOCKS5,
+  PROXY_UNKNOWN
 };
+const char * ProxyToString(ProxyType proxy);
 
 struct ProxyInfo {
+  ProxyType type;
+  SocketAddress address;
+  std::string autoconfig_url;
+  bool autodetect;
+  std::string bypass_list;
+  std::string username;
+  CryptString password;
+
+  ProxyInfo();
+  ~ProxyInfo();
 };
 
 } // namespace rtc