| 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: | 
|  |