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

Side by Side Diff: trunk/src/net/base/host_mapping_rules.cc

Issue 474483002: Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/mojo/services/launcher/launcher.cc ('k') | trunk/src/net/base/mime_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/host_mapping_rules.h" 5 #include "net/base/host_mapping_rules.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_tokenizer.h" 9 #include "base/strings/string_tokenizer.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return false; 65 return false;
66 } 66 }
67 67
68 bool HostMappingRules::AddRuleFromString(const std::string& rule_string) { 68 bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
69 std::string trimmed; 69 std::string trimmed;
70 base::TrimWhitespaceASCII(rule_string, base::TRIM_ALL, &trimmed); 70 base::TrimWhitespaceASCII(rule_string, base::TRIM_ALL, &trimmed);
71 std::vector<std::string> parts; 71 std::vector<std::string> parts;
72 base::SplitString(trimmed, ' ', &parts); 72 base::SplitString(trimmed, ' ', &parts);
73 73
74 // Test for EXCLUSION rule. 74 // Test for EXCLUSION rule.
75 if (parts.size() == 2 && base::LowerCaseEqualsASCII(parts[0], "exclude")) { 75 if (parts.size() == 2 && LowerCaseEqualsASCII(parts[0], "exclude")) {
76 ExclusionRule rule; 76 ExclusionRule rule;
77 rule.hostname_pattern = base::StringToLowerASCII(parts[1]); 77 rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
78 exclusion_rules_.push_back(rule); 78 exclusion_rules_.push_back(rule);
79 return true; 79 return true;
80 } 80 }
81 81
82 // Test for MAP rule. 82 // Test for MAP rule.
83 if (parts.size() == 3 && base::LowerCaseEqualsASCII(parts[0], "map")) { 83 if (parts.size() == 3 && LowerCaseEqualsASCII(parts[0], "map")) {
84 MapRule rule; 84 MapRule rule;
85 rule.hostname_pattern = base::StringToLowerASCII(parts[1]); 85 rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
86 86
87 if (!ParseHostAndPort(parts[2], &rule.replacement_hostname, 87 if (!ParseHostAndPort(parts[2], &rule.replacement_hostname,
88 &rule.replacement_port)) { 88 &rule.replacement_port)) {
89 return false; // Failed parsing the hostname/port. 89 return false; // Failed parsing the hostname/port.
90 } 90 }
91 91
92 map_rules_.push_back(rule); 92 map_rules_.push_back(rule);
93 return true; 93 return true;
94 } 94 }
95 95
96 return false; 96 return false;
97 } 97 }
98 98
99 void HostMappingRules::SetRulesFromString(const std::string& rules_string) { 99 void HostMappingRules::SetRulesFromString(const std::string& rules_string) {
100 exclusion_rules_.clear(); 100 exclusion_rules_.clear();
101 map_rules_.clear(); 101 map_rules_.clear();
102 102
103 base::StringTokenizer rules(rules_string, ","); 103 base::StringTokenizer rules(rules_string, ",");
104 while (rules.GetNext()) { 104 while (rules.GetNext()) {
105 bool ok = AddRuleFromString(rules.token()); 105 bool ok = AddRuleFromString(rules.token());
106 LOG_IF(ERROR, !ok) << "Failed parsing rule: " << rules.token(); 106 LOG_IF(ERROR, !ok) << "Failed parsing rule: " << rules.token();
107 } 107 }
108 } 108 }
109 109
110 } // namespace net 110 } // namespace net
OLDNEW
« no previous file with comments | « trunk/src/mojo/services/launcher/launcher.cc ('k') | trunk/src/net/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698