Make SplitStringUsingSubstr have consistent args.

net/ftp/ftp_directory_listing_parser_unittest.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 "net/ftp/ftp_directory_listing_parser.h"
 
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 51 matching lines @@
       param.expected_result,
       ParseFtpDirectoryListing(test_listing, mock_current_time, &entries));
   if (param.expected_result != OK)
     return;
 
   std::string expected_listing;
   ASSERT_TRUE(base::ReadFileToString(
       test_dir.AppendASCII(std::string(param.name) + ".expected"),
       &expected_listing));
 
-  std::vector<std::string> lines;
-  base::SplitStringUsingSubstr(expected_listing, "\r\n", &lines);
+  std::vector<std::string> lines = base::SplitStringUsingSubstr(
+      expected_listing, "\r\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // Special case for empty listings.
   if (lines.size() == 1 && lines[0].empty())
     lines.clear();
 
   ASSERT_EQ(9 * entries.size(), lines.size());
 
   for (size_t i = 0; i < lines.size() / 9; i++) {
     std::string type(lines[9 * i]);
     std::string name(lines[9 * i + 1]);
@@ skipping 91 matching lines @@
 };
 
 INSTANTIATE_TEST_CASE_P(,
                         FtpDirectoryListingParserTest,
                         testing::ValuesIn(kTestParams),
                         TestName);
 
 }  // namespace
 
 }  // namespace net