summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 16:55:42 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-07 16:55:42 +0000
commitcb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d (patch)
tree953168adbbb3a7ff1c069911b764ffbed2369384 /net/base
parentb7a95ad6f584b029954c3b398993f49f1d69265e (diff)
downloadchromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.zip
chromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.tar.gz
chromium_src-cb1f4ac35e1e687925fdf62f7f62140dcd6d4a1d.tar.bz2
Move StringToLowerASCII to base namespace
TBR=sky Review URL: https://codereview.chromium.org/448853002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/data_url.cc2
-rw-r--r--net/base/filename_util_internal.cc8
-rw-r--r--net/base/filename_util_unittest.cc2
-rw-r--r--net/base/host_mapping_rules.cc4
-rw-r--r--net/base/mime_util.cc8
-rw-r--r--net/base/sdch_manager.cc14
6 files changed, 20 insertions, 18 deletions
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index 9699136..e647764 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -42,7 +42,7 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
std::vector<std::string>::iterator iter = meta_data.begin();
if (iter != meta_data.end()) {
mime_type->swap(*iter);
- StringToLowerASCII(mime_type);
+ base::StringToLowerASCII(mime_type);
++iter;
}
diff --git a/net/base/filename_util_internal.cc b/net/base/filename_util_internal.cc
index a59de0f..ae0b4c6 100644
--- a/net/base/filename_util_internal.cc
+++ b/net/base/filename_util_internal.cc
@@ -89,7 +89,8 @@ std::string GetFileNameFromURL(const GURL& url,
// Returns whether the specified extension is automatically integrated into the
// windows shell.
bool IsShellIntegratedExtension(const base::FilePath::StringType& extension) {
- base::FilePath::StringType extension_lower = StringToLowerASCII(extension);
+ base::FilePath::StringType extension_lower =
+ base::StringToLowerASCII(extension);
// http://msdn.microsoft.com/en-us/library/ms811694.aspx
// Right-clicking on shortcuts can be magical.
@@ -119,9 +120,10 @@ bool IsReservedName(const base::FilePath::StringType& filename) {
"com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3",
"lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "clock$"};
#if defined(OS_WIN)
- std::string filename_lower = StringToLowerASCII(base::WideToUTF8(filename));
+ std::string filename_lower =
+ base::StringToLowerASCII(base::WideToUTF8(filename));
#elif defined(OS_POSIX)
- std::string filename_lower = StringToLowerASCII(filename);
+ std::string filename_lower = base::StringToLowerASCII(filename);
#endif
for (size_t i = 0; i < arraysize(known_devices); ++i) {
diff --git a/net/base/filename_util_unittest.cc b/net/base/filename_util_unittest.cc
index bc726a2..6cbcae1 100644
--- a/net/base/filename_util_unittest.cc
+++ b/net/base/filename_util_unittest.cc
@@ -423,7 +423,7 @@ TEST(FilenameUtilTest, GenerateFileName) {
// string conversions fail. This is OK (we have the default value) but they
// don't match our expectations.
std::string locale = setlocale(LC_CTYPE, NULL);
- StringToLowerASCII(&locale);
+ base::StringToLowerASCII(&locale);
EXPECT_TRUE(locale.find("utf-8") != std::string::npos ||
locale.find("utf8") != std::string::npos)
<< "Your locale (" << locale << ") must be set to UTF-8 "
diff --git a/net/base/host_mapping_rules.cc b/net/base/host_mapping_rules.cc
index 6ae4754..f91f3fd 100644
--- a/net/base/host_mapping_rules.cc
+++ b/net/base/host_mapping_rules.cc
@@ -74,7 +74,7 @@ bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
// Test for EXCLUSION rule.
if (parts.size() == 2 && LowerCaseEqualsASCII(parts[0], "exclude")) {
ExclusionRule rule;
- rule.hostname_pattern = StringToLowerASCII(parts[1]);
+ rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
exclusion_rules_.push_back(rule);
return true;
}
@@ -82,7 +82,7 @@ bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
// Test for MAP rule.
if (parts.size() == 3 && LowerCaseEqualsASCII(parts[0], "map")) {
MapRule rule;
- rule.hostname_pattern = StringToLowerASCII(parts[1]);
+ rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
if (!ParseHostAndPort(parts[2], &rule.replacement_hostname,
&rule.replacement_port)) {
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 0e799a6..7dd51a2 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -767,8 +767,8 @@ bool MatchesMimeTypeParameters(const std::string& mime_type_pattern,
bool MimeUtil::MatchesMimeType(const std::string& mime_type_pattern,
const std::string& mime_type) const {
// Verify caller is passing lowercase strings.
- DCHECK_EQ(StringToLowerASCII(mime_type_pattern), mime_type_pattern);
- DCHECK_EQ(StringToLowerASCII(mime_type), mime_type);
+ DCHECK_EQ(base::StringToLowerASCII(mime_type_pattern), mime_type_pattern);
+ DCHECK_EQ(base::StringToLowerASCII(mime_type), mime_type);
if (mime_type_pattern.empty())
return false;
@@ -838,7 +838,7 @@ bool MimeUtil::ParseMimeTypeWithoutParameter(
}
bool MimeUtil::IsValidTopLevelMimeType(const std::string& type_string) const {
- std::string lower_type = StringToLowerASCII(type_string);
+ std::string lower_type = base::StringToLowerASCII(type_string);
for (size_t i = 0; i < arraysize(legal_top_level_types); ++i) {
if (lower_type.compare(legal_top_level_types[i]) == 0)
return true;
@@ -1270,7 +1270,7 @@ void GetExtensionsForMimeType(
if (unsafe_mime_type == "*/*" || unsafe_mime_type == "*")
return;
- const std::string mime_type = StringToLowerASCII(unsafe_mime_type);
+ const std::string mime_type = base::StringToLowerASCII(unsafe_mime_type);
base::hash_set<base::FilePath::StringType> unique_extensions;
if (EndsWith(mime_type, "/*", true)) {
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index fee75e5..8b7481b 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -269,7 +269,7 @@ void SdchManager::EnableSecureSchemeSupport(bool enabled) {
void SdchManager::BlacklistDomain(const GURL& url) {
SetAllowLatencyExperiment(url, false);
- std::string domain(StringToLowerASCII(url.host()));
+ std::string domain(base::StringToLowerASCII(url.host()));
int count = blacklisted_domains_[domain];
if (count > 0)
return; // Domain is already blacklisted.
@@ -286,7 +286,7 @@ void SdchManager::BlacklistDomain(const GURL& url) {
void SdchManager::BlacklistDomainForever(const GURL& url) {
SetAllowLatencyExperiment(url, false);
- std::string domain(StringToLowerASCII(url.host()));
+ std::string domain(base::StringToLowerASCII(url.host()));
exponential_blacklist_count_[domain] = INT_MAX;
blacklisted_domains_[domain] = INT_MAX;
}
@@ -297,20 +297,20 @@ void SdchManager::ClearBlacklistings() {
}
void SdchManager::ClearDomainBlacklisting(const std::string& domain) {
- blacklisted_domains_.erase(StringToLowerASCII(domain));
+ blacklisted_domains_.erase(base::StringToLowerASCII(domain));
}
int SdchManager::BlackListDomainCount(const std::string& domain) {
if (blacklisted_domains_.end() == blacklisted_domains_.find(domain))
return 0;
- return blacklisted_domains_[StringToLowerASCII(domain)];
+ return blacklisted_domains_[base::StringToLowerASCII(domain)];
}
int SdchManager::BlacklistDomainExponential(const std::string& domain) {
if (exponential_blacklist_count_.end() ==
exponential_blacklist_count_.find(domain))
return 0;
- return exponential_blacklist_count_[StringToLowerASCII(domain)];
+ return exponential_blacklist_count_[base::StringToLowerASCII(domain)];
}
bool SdchManager::IsInSupportedDomain(const GURL& url) {
@@ -324,7 +324,7 @@ bool SdchManager::IsInSupportedDomain(const GURL& url) {
if (blacklisted_domains_.empty())
return true;
- std::string domain(StringToLowerASCII(url.host()));
+ std::string domain(base::StringToLowerASCII(url.host()));
DomainCounter::iterator it = blacklisted_domains_.find(domain);
if (blacklisted_domains_.end() == it)
return true;
@@ -427,7 +427,7 @@ bool SdchManager::AddSdchDictionary(const std::string& dictionary_text,
break;
std::string name(dictionary_text, line_start, colon_index - line_start);
std::string value(dictionary_text, value_start, line_end - value_start);
- name = StringToLowerASCII(name);
+ name = base::StringToLowerASCII(name);
if (name == "domain") {
domain = value;
} else if (name == "path") {