Index: components/content_settings/core/common/content_settings_pattern.cc |
diff --git a/components/content_settings/core/common/content_settings_pattern.cc b/components/content_settings/core/common/content_settings_pattern.cc |
index b02cbee5dac6dad2f2e967507e0f079643f003ff..c5f31eac410308cfa9cecd3e70cb4bde5321df17 100644 |
--- a/components/content_settings/core/common/content_settings_pattern.cc |
+++ b/components/content_settings/core/common/content_settings_pattern.cc |
@@ -47,17 +47,16 @@ bool IsSubDomainOrEqual(const std::string& sub_domain, |
// Compares two domain names. |
int CompareDomainNames(const std::string& str1, const std::string& str2) { |
- std::vector<std::string> domain_name1; |
- std::vector<std::string> domain_name2; |
- |
- base::SplitString(str1, '.', &domain_name1); |
- base::SplitString(str2, '.', &domain_name2); |
+ std::vector<base::StringPiece> domain_name1 = base::SplitStringPiece( |
+ str1, ".", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); |
yzshen1
2015/07/22 22:50:34
TRIM_WHITESPACE
|
+ std::vector<base::StringPiece> domain_name2 = base::SplitStringPiece( |
+ str2, ".", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); |
yzshen1
2015/07/22 22:50:34
TRIM_WHITESPACE
|
int i1 = static_cast<int>(domain_name1.size()) - 1; |
int i2 = static_cast<int>(domain_name2.size()) - 1; |
int rv; |
while (i1 >= 0 && i2 >= 0) { |
- // domain names are stored in puny code. So it's fine to use the compare |
+ // Domain names are stored in puny code. So it's fine to use the compare |
// method. |
rv = domain_name1[i1].compare(domain_name2[i2]); |
if (rv != 0) |