Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/net/proxy/proxy_server.cc

Index: trunk/src/net/proxy/proxy_server.cc
===================================================================
--- trunk/src/net/proxy/proxy_server.cc	(revision 289319)
+++ trunk/src/net/proxy/proxy_server.cc	(working copy)
@@ -20,23 +20,23 @@
 ProxyServer::Scheme GetSchemeFromPacTypeInternal(
     std::string::const_iterator begin,
     std::string::const_iterator end) {
-  if (base::LowerCaseEqualsASCII(begin, end, "proxy"))
+  if (LowerCaseEqualsASCII(begin, end, "proxy"))
     return ProxyServer::SCHEME_HTTP;
-  if (base::LowerCaseEqualsASCII(begin, end, "socks")) {
+  if (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 (base::LowerCaseEqualsASCII(begin, end, "socks4"))
+  if (LowerCaseEqualsASCII(begin, end, "socks4"))
     return ProxyServer::SCHEME_SOCKS4;
-  if (base::LowerCaseEqualsASCII(begin, end, "socks5"))
+  if (LowerCaseEqualsASCII(begin, end, "socks5"))
     return ProxyServer::SCHEME_SOCKS5;
-  if (base::LowerCaseEqualsASCII(begin, end, "direct"))
+  if (LowerCaseEqualsASCII(begin, end, "direct"))
     return ProxyServer::SCHEME_DIRECT;
-  if (base::LowerCaseEqualsASCII(begin, end, "https"))
+  if (LowerCaseEqualsASCII(begin, end, "https"))
     return ProxyServer::SCHEME_HTTPS;
-  if (base::LowerCaseEqualsASCII(begin, end, "quic"))
+  if (LowerCaseEqualsASCII(begin, end, "quic"))
     return ProxyServer::SCHEME_QUIC;
 
   return ProxyServer::SCHEME_INVALID;
@@ -47,19 +47,19 @@
 // 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 (base::LowerCaseEqualsASCII(begin, end, "http"))
+  if (LowerCaseEqualsASCII(begin, end, "http"))
     return ProxyServer::SCHEME_HTTP;
-  if (base::LowerCaseEqualsASCII(begin, end, "socks4"))
+  if (LowerCaseEqualsASCII(begin, end, "socks4"))
     return ProxyServer::SCHEME_SOCKS4;
-  if (base::LowerCaseEqualsASCII(begin, end, "socks"))
+  if (LowerCaseEqualsASCII(begin, end, "socks"))
     return ProxyServer::SCHEME_SOCKS5;
-  if (base::LowerCaseEqualsASCII(begin, end, "socks5"))
+  if (LowerCaseEqualsASCII(begin, end, "socks5"))
     return ProxyServer::SCHEME_SOCKS5;
-  if (base::LowerCaseEqualsASCII(begin, end, "direct"))
+  if (LowerCaseEqualsASCII(begin, end, "direct"))
     return ProxyServer::SCHEME_DIRECT;
-  if (base::LowerCaseEqualsASCII(begin, end, "https"))
+  if (LowerCaseEqualsASCII(begin, end, "https"))
     return ProxyServer::SCHEME_HTTPS;
-  if (base::LowerCaseEqualsASCII(begin, end, "quic"))
+  if (LowerCaseEqualsASCII(begin, end, "quic"))
     return ProxyServer::SCHEME_QUIC;
   return ProxyServer::SCHEME_INVALID;
 }