summaryrefslogtreecommitdiffstats
path: root/components/google/core/browser/google_util.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:23:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:25:00 +0000
commiteee3522979ae33c9ddc7ec33c769b2c3f0a48320 (patch)
tree46c85b8ad29772c08e4a423303128e976cb4b20f /components/google/core/browser/google_util.cc
parent67c87495f7b272a74ab1944af19202531b766b5b (diff)
downloadchromium_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 'components/google/core/browser/google_util.cc')
-rw-r--r--components/google/core/browser/google_util.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
index 800b1bc..bd3e0fe 100644
--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/browser/google_util.cc
@@ -54,12 +54,12 @@ bool IsValidHostName(const std::string& host,
return false;
// Removes the tld and the preceding dot.
std::string host_minus_tld(host, 0, host.length() - tld_length - 1);
- if (LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case.c_str()))
+ if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case.c_str()))
return true;
if (subdomain_permission == google_util::ALLOW_SUBDOMAIN)
return EndsWith(host_minus_tld, "." + domain_in_lower_case, false);
- return LowerCaseEqualsASCII(host_minus_tld,
- ("www." + domain_in_lower_case).c_str());
+ return base::LowerCaseEqualsASCII(host_minus_tld,
+ ("www." + domain_in_lower_case).c_str());
}
// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|