New new versions of Starts/EndsWith and SplitString in net

net/ftp/ftp_directory_listing_parser_ls.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_ls.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 {
 
 namespace {
 
 bool TwoColumnDateListingToTime(const base::string16& date,
                                 const base::string16& time,
                                 base::Time* result) {
   base::Time::Exploded time_exploded = { 0 };
 
   // Date should be in format YYYY-MM-DD.
-  std::vector<base::string16> date_parts;
-  base::SplitString(date, '-', &date_parts);
+  std::vector<base::string16> date_parts =
+      base::SplitString(date, base::ASCIIToUTF16("-"), base::TRIM_WHITESPACE,
+                        base::SPLIT_WANT_ALL);
   if (date_parts.size() != 3)
     return false;
   if (!base::StringToInt(date_parts[0], &time_exploded.year))
     return false;
   if (!base::StringToInt(date_parts[1], &time_exploded.month))
     return false;
   if (!base::StringToInt(date_parts[2], &time_exploded.day_of_month))
     return false;
 
   // Time should be in format HH:MM
   if (time.length() != 5)
     return false;
 
-  std::vector<base::string16> time_parts;
-  base::SplitString(time, ':', &time_parts);
+  std::vector<base::string16> time_parts =
+      base::SplitString(time, base::ASCIIToUTF16(":"), base::TRIM_WHITESPACE,
+                        base::SPLIT_WANT_ALL);
   if (time_parts.size() != 2)
     return false;
   if (!base::StringToInt(time_parts[0], &time_exploded.hour))
     return false;
   if (!base::StringToInt(time_parts[1], &time_exploded.minute))
     return false;
   if (!time_exploded.HasValidValues())
     return false;
 
   // We don't know the time zone of the server, so just use local time.
@@ skipping 67 matching lines @@
     const base::Time& current_time,
     std::vector<FtpDirectoryListingEntry>* entries) {
   // True after we have received a "total n" listing header, where n is an
   // integer. Only one such header is allowed per listing.
   bool received_total_line = false;
 
   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);
 
     // Some FTP servers put a "total n" line at the beginning of the listing
     // (n is an integer). Allow such a line, but only once, and only if it's
     // the first non-empty line. Do not match the word exactly, because it may
     // be in different languages (at least English and German have been seen
     // in the field).
     if (columns.size() == 2 && !received_total_line) {
       received_total_line = true;
 
       int64 total_number;
@@ skipping 76 matching lines @@
         entry.name = entry.name.substr(0, pos);
     }
 
     entries->push_back(entry);
   }
 
   return true;
 }
 
 }  // namespace net