New new versions of Starts/EndsWith and SplitString in net

net/ftp/ftp_directory_listing_parser_os2.cc

 // Copyright (c) 2011 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_os2.h"
 
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "net/ftp/ftp_directory_listing_parser.h"
 #include "net/ftp/ftp_util.h"
 
 namespace net {
 
 bool ParseFtpDirectoryListingOS2(
     const std::vector<base::string16>& lines,
     std::vector<FtpDirectoryListingEntry>* entries) {
   for (size_t i = 0; i < lines.size(); i++) {
     if (lines[i].empty())
       continue;
 
-    std::vector<base::string16> columns;
-    base::SplitString(base::CollapseWhitespace(lines[i], false), ' ', &columns);
+    std::vector<base::string16> columns = base::SplitString(
+        base::CollapseWhitespace(lines[i], false), base::ASCIIToUTF16(" "),
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     // Every line of the listing consists of the following:
     //
     //   1. size in bytes (0 for directories)
     //   2. type (A for files, DIR for directories)
     //   3. date
     //   4. time
     //   5. filename (may be empty or contain spaces)
     //
     // For now, make sure we have 1-4, and handle 5 later.
@@ skipping 31 matching lines @@
       continue;
     }
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net