Index: webrtc/base/proxyinfo.h |
diff --git a/webrtc/base/proxyinfo.h b/webrtc/base/proxyinfo.h |
index 2251b13ee2eac883bb8bdc72517bee89ce5047d5..f0ae1825e473f2efcefbbc91bce7c9605ba66500 100644 |
--- a/webrtc/base/proxyinfo.h |
+++ b/webrtc/base/proxyinfo.h |
@@ -8,36 +8,12 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_BASE_PROXYINFO_H__ |
-#define WEBRTC_BASE_PROXYINFO_H__ |
+#ifndef WEBRTC_BASE_PROXYINFO_H_ |
+#define WEBRTC_BASE_PROXYINFO_H_ |
-#include <string> |
-#include "webrtc/base/socketaddress.h" |
-#include "webrtc/base/cryptstring.h" |
-namespace rtc { |
+// This header is deprecated and is just left here temporarily during |
+// refactoring. See https://bugs.webrtc.org/7634 for more details. |
+#include "webrtc/rtc_base/proxyinfo.h" |
-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 |
- |
-#endif // WEBRTC_BASE_PROXYINFO_H__ |
+#endif // WEBRTC_BASE_PROXYINFO_H_ |