diff options
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/chunk_range.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_test.cc | 15 |
2 files changed, 10 insertions, 15 deletions
diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index 6e5c3f8..024aa9b 100644 --- a/chrome/browser/safe_browsing/chunk_range.cc +++ b/chrome/browser/safe_browsing/chunk_range.cc @@ -69,12 +69,10 @@ bool StringToRanges(const std::string& input, // Crack the string into chunk parts, then crack each part looking for a // range. - std::vector<std::string> chunk_parts; - base::SplitString(input, ',', &chunk_parts); - - for (size_t i = 0; i < chunk_parts.size(); ++i) { - std::vector<std::string> chunk_ranges; - base::SplitString(chunk_parts[i], '-', &chunk_ranges); + for (const base::StringPiece& chunk : base::SplitStringPiece( + input, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { + std::vector<std::string> chunk_ranges = base::SplitString( + chunk, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); int start = atoi(chunk_ranges[0].c_str()); int stop = start; if (chunk_ranges.size() == 2) diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 04bebdd..807a2c2 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -83,17 +83,14 @@ bool ParsePhishingUrls(const std::string& data, if (data.empty()) return false; - std::vector<std::string> urls; - base::SplitString(data, '\n', &urls); - for (size_t i = 0; i < urls.size(); ++i) { - if (urls[i].empty()) - continue; + for (const base::StringPiece& url_str : base::SplitStringPiece( + data, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { PhishingUrl phishing_url; - std::vector<std::string> record_parts; - base::SplitString(urls[i], '\t', &record_parts); + std::vector<std::string> record_parts = base::SplitString( + url_str, "\t", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (record_parts.size() != 3) { LOG(ERROR) << "Unexpected URL format in phishing URL list: " - << urls[i]; + << url_str.as_string(); return false; } phishing_url.url = std::string(url::kHttpScheme) + "://" + record_parts[0]; @@ -103,7 +100,7 @@ bool ParsePhishingUrls(const std::string& data, } else if (record_parts[2] == "no") { phishing_url.is_phishing = false; } else { - LOG(ERROR) << "Unrecognized expectation in " << urls[i] + LOG(ERROR) << "Unrecognized expectation in " << url_str.as_string() << ": " << record_parts[2]; return false; } |