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

Unified Diff: base/test/test_file_util_win.cc

Issue 1284833004: Remove remaining legacy SplitString calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/strings/string_split_unittest.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_file_util_win.cc
diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc
index 5496a5574ce6a88d4359bf7c85e35975f6dc7368..241e69df6134fd45f133ce9d06cfb6447d88563c 100644
--- a/base/test/test_file_util_win.cc
+++ b/base/test/test_file_util_win.cc
@@ -242,10 +242,8 @@ bool HasInternetZoneIdentifier(const FilePath& full_path) {
if (!ReadFileToString(zone_path, &zone_path_contents))
return false;
- std::vector<std::string> lines;
- // This call also trims whitespaces, including carriage-returns (\r).
- SplitString(zone_path_contents, '\n', &lines);
-
+ std::vector<std::string> lines = SplitString(
+ zone_path_contents, "\n", TRIM_WHITESPACE, SPLIT_WANT_ALL);
switch (lines.size()) {
case 3:
// optional empty line at end of file:
« no previous file with comments | « base/strings/string_split_unittest.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698