| Index: net/proxy/proxy_server.cc
|
| diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
|
| index 1e8bba968a865fe9d4b2fc632826fd65d1ace6d7..c65df3170161671aaf45f3c514ab9dc870f318cb 100644
|
| --- a/net/proxy/proxy_server.cc
|
| +++ b/net/proxy/proxy_server.cc
|
| @@ -21,23 +21,23 @@ namespace {
|
| ProxyServer::Scheme GetSchemeFromPacTypeInternal(
|
| std::string::const_iterator begin,
|
| std::string::const_iterator end) {
|
| - if (LowerCaseEqualsASCII(begin, end, "proxy"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "proxy"))
|
| return ProxyServer::SCHEME_HTTP;
|
| - if (LowerCaseEqualsASCII(begin, end, "socks")) {
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks")) {
|
| // Default to v4 for compatibility. This is because the SOCKS4 vs SOCKS5
|
| // notation didn't originally exist, so if a client returns SOCKS they
|
| // really meant SOCKS4.
|
| return ProxyServer::SCHEME_SOCKS4;
|
| }
|
| - if (LowerCaseEqualsASCII(begin, end, "socks4"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks4"))
|
| return ProxyServer::SCHEME_SOCKS4;
|
| - if (LowerCaseEqualsASCII(begin, end, "socks5"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks5"))
|
| return ProxyServer::SCHEME_SOCKS5;
|
| - if (LowerCaseEqualsASCII(begin, end, "direct"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "direct"))
|
| return ProxyServer::SCHEME_DIRECT;
|
| - if (LowerCaseEqualsASCII(begin, end, "https"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "https"))
|
| return ProxyServer::SCHEME_HTTPS;
|
| - if (LowerCaseEqualsASCII(begin, end, "quic"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "quic"))
|
| return ProxyServer::SCHEME_QUIC;
|
|
|
| return ProxyServer::SCHEME_INVALID;
|
| @@ -48,19 +48,19 @@ ProxyServer::Scheme GetSchemeFromPacTypeInternal(
|
| // ProxyServer::ToURI(). If no type could be matched, returns SCHEME_INVALID.
|
| ProxyServer::Scheme GetSchemeFromURIInternal(std::string::const_iterator begin,
|
| std::string::const_iterator end) {
|
| - if (LowerCaseEqualsASCII(begin, end, "http"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "http"))
|
| return ProxyServer::SCHEME_HTTP;
|
| - if (LowerCaseEqualsASCII(begin, end, "socks4"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks4"))
|
| return ProxyServer::SCHEME_SOCKS4;
|
| - if (LowerCaseEqualsASCII(begin, end, "socks"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks"))
|
| return ProxyServer::SCHEME_SOCKS5;
|
| - if (LowerCaseEqualsASCII(begin, end, "socks5"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "socks5"))
|
| return ProxyServer::SCHEME_SOCKS5;
|
| - if (LowerCaseEqualsASCII(begin, end, "direct"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "direct"))
|
| return ProxyServer::SCHEME_DIRECT;
|
| - if (LowerCaseEqualsASCII(begin, end, "https"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "https"))
|
| return ProxyServer::SCHEME_HTTPS;
|
| - if (LowerCaseEqualsASCII(begin, end, "quic"))
|
| + if (base::LowerCaseEqualsASCII(begin, end, "quic"))
|
| return ProxyServer::SCHEME_QUIC;
|
| return ProxyServer::SCHEME_INVALID;
|
| }
|
|
|