diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:23:25 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:25:00 +0000 |
commit | eee3522979ae33c9ddc7ec33c769b2c3f0a48320 (patch) | |
tree | 46c85b8ad29772c08e4a423303128e976cb4b20f /net/proxy | |
parent | 67c87495f7b272a74ab1944af19202531b766b5b (diff) | |
download | chromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.zip chromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.tar.gz chromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.tar.bz2 |
Move StringToUpperASCII and LowerCaseEqualsASCII to the base namespace
Convert LowerCaseEqualsASCII to take StringPiece. In the current patch this is
generally a NOP but will allow me to delete the other 4 variants in a followup
(wanted to do that separately since that will require more review, since
callsites will be changed in nontrivial ways).
In some cases, LowerCaseEqualsASCII is called with a WebString, which no
longer is implicitly converted. I added base::string16(...) around such
calls to force the right conversion. It happened in these files:
window_container_type.cc
savable_resources.cc
render_view_impl.cc
blink_ax_tree_source.cc
password_form_conversion_utils.cc
translate_helper.cc
chrome_render_view_observer.cc
dom_serializer_browsertest.cc
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/448143008
Cr-Commit-Position: refs/heads/master@{#289312}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r-- | net/proxy/proxy_bypass_rules.cc | 2 | ||||
-rw-r--r-- | net/proxy/proxy_script_fetcher_impl.cc | 2 | ||||
-rw-r--r-- | net/proxy/proxy_server.cc | 28 |
3 files changed, 16 insertions, 16 deletions
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index 6bf1c61..1edf0a4 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -267,7 +267,7 @@ bool ProxyBypassRules::AddRuleFromStringInternal( // This is the special syntax used by WinInet's bypass list -- we allow it // on all platforms and interpret it the same way. - if (LowerCaseEqualsASCII(raw, "<local>")) { + if (base::LowerCaseEqualsASCII(raw, "<local>")) { AddRuleToBypassLocal(); return true; } diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index 737c6f8..229ab7c 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -40,7 +40,7 @@ bool IsPacMimeType(const std::string& mime_type) { "application/x-javascript-config", }; for (size_t i = 0; i < arraysize(kSupportedPacMimeTypes); ++i) { - if (LowerCaseEqualsASCII(mime_type, kSupportedPacMimeTypes[i])) + if (base::LowerCaseEqualsASCII(mime_type, kSupportedPacMimeTypes[i])) return true; } return false; diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc index 09c2538..2b51705 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; } |