| Index: net/proxy/proxy_server.h
|
| diff --git a/net/proxy/proxy_server.h b/net/proxy/proxy_server.h
|
| index 3786ddbe0a755f5790f53920a5437fd9a9f34e2c..316725243ba1bffc7de9945a5e6a5ea4fc572e19 100644
|
| --- a/net/proxy/proxy_server.h
|
| +++ b/net/proxy/proxy_server.h
|
| @@ -128,6 +128,12 @@ class ProxyServer {
|
| // scheme. Returns -1 if unknown.
|
| static int GetDefaultPortForScheme(Scheme scheme);
|
|
|
| + // Parses the proxy scheme from a URL-like representation, to a
|
| + // ProxyServer::Scheme. This corresponds with the values used in
|
| + // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
|
| + // |scheme| can be one of http, https, socks, socks4, socks5, direct.
|
| + static Scheme GetSchemeFromURI(const std::string& scheme);
|
| +
|
| bool operator==(const ProxyServer& other) const {
|
| return scheme_ == other.scheme_ &&
|
| host_port_pair_.Equals(other.host_port_pair_);
|
|
|