Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: net/proxy/proxy_server.cc

Issue 448143008: Move StringToUpperASCII and LowerCaseEqualsASCII to the base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl.cc ('k') | net/url_request/url_request_file_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_server.cc
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
index 09c2538e559b5087e21592634b67ae93097726da..2b51705a551fdce465f1ef6781ca72eb5b26bcd2 100644
--- a/net/proxy/proxy_server.cc
+++ b/net/proxy/proxy_server.cc
@@ -20,23 +20,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;
@@ -47,19 +47,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;
}
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl.cc ('k') | net/url_request/url_request_file_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698