Remove remaining legacy SplitString calls.

base/test/test_file_util_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/test/test_file_util.h"
 
 #include <windows.h>
 #include <aclapi.h>
 #include <shlwapi.h>
 
@@ skipping 224 matching lines @@
 
 // Return whether the ZoneIdentifier is correctly set to "Internet" (3)
 // Only returns a valid result when called from same process as the
 // one that (was supposed to have) set the zone identifier.
 bool HasInternetZoneIdentifier(const FilePath& full_path) {
   FilePath zone_path(full_path.value() + L":Zone.Identifier");
   std::string zone_path_contents;
   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:
       if (!lines[2].empty())
         return false;
       // fall through:
     case 2:
       return lines[0] == "[ZoneTransfer]" && lines[1] == "ZoneId=3";
     default:
       return false;
@@ skipping 14 matching lines @@
   DCHECK(info_ != NULL);
   DCHECK_NE(0u, length_);
 }
 
 FilePermissionRestorer::~FilePermissionRestorer() {
   if (!RestorePermissionInfo(path_, info_, length_))
     NOTREACHED();
 }
 
 }  // namespace base