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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_test.cc

Issue 1240183002: Update SplitString calls in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/safe_browsing_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 04bebdd4e3638af4686296c4663f57aeb6823a17..807a2c2ac376a6a138cefc0cfd65d6bd79625e1e 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;
}
« no previous file with comments | « chrome/browser/safe_browsing/chunk_range.cc ('k') | chrome/browser/spellchecker/spellcheck_custom_dictionary.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698