summaryrefslogtreecommitdiffstats
path: root/net/base/host_mapping_rules.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:48:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:50:48 +0000
commitdf80704e21578c439a2facfdaeabfe016d297353 (patch)
tree01092783052df5d2b027b80ec67011b5475e5c19 /net/base/host_mapping_rules.cc
parent5a25b4d1b753851cab3d5100d32bbc87ca4a4e4d (diff)
downloadchromium_src-df80704e21578c439a2facfdaeabfe016d297353.zip
chromium_src-df80704e21578c439a2facfdaeabfe016d297353.tar.gz
chromium_src-df80704e21578c439a2facfdaeabfe016d297353.tar.bz2
Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."
> 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 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/474483002 Cr-Commit-Position: refs/heads/master@{#289320} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_mapping_rules.cc')
-rw-r--r--net/base/host_mapping_rules.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/host_mapping_rules.cc b/net/base/host_mapping_rules.cc
index d71f9f4..f91f3fd 100644
--- a/net/base/host_mapping_rules.cc
+++ b/net/base/host_mapping_rules.cc
@@ -72,7 +72,7 @@ bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
base::SplitString(trimmed, ' ', &parts);
// Test for EXCLUSION rule.
- if (parts.size() == 2 && base::LowerCaseEqualsASCII(parts[0], "exclude")) {
+ if (parts.size() == 2 && LowerCaseEqualsASCII(parts[0], "exclude")) {
ExclusionRule rule;
rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
exclusion_rules_.push_back(rule);
@@ -80,7 +80,7 @@ bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
}
// Test for MAP rule.
- if (parts.size() == 3 && base::LowerCaseEqualsASCII(parts[0], "map")) {
+ if (parts.size() == 3 && LowerCaseEqualsASCII(parts[0], "map")) {
MapRule rule;
rule.hostname_pattern = base::StringToLowerASCII(parts[1]);