New new versions of Starts/EndsWith and SplitString in net

net/ftp/ftp_util.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_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
@@ skipping 278 matching lines @@
   return true;
 }
 
 // static
 bool FtpUtil::WindowsDateListingToTime(const base::string16& date,
                                        const base::string16& time,
                                        base::Time* result) {
   base::Time::Exploded time_exploded = { 0 };
 
   // Date should be in format MM-DD-YY[YY].
-  std::vector<base::string16> date_parts;
-  base::SplitString(date, '-', &date_parts);
+  std::vector<base::StringPiece16> date_parts =
+      base::SplitStringPiece(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.month))
     return false;
   if (!base::StringToInt(date_parts[1], &time_exploded.day_of_month))
     return false;
   if (!base::StringToInt(date_parts[2], &time_exploded.year))
     return false;
   if (time_exploded.year < 0)
     return false;
   // If year has only two digits then assume that 00-79 is 2000-2079,
   // and 80-99 is 1980-1999.
   if (time_exploded.year < 80)
     time_exploded.year += 2000;
   else if (time_exploded.year < 100)
     time_exploded.year += 1900;
 
   // Time should be in format HH:MM[(AM|PM)]
   if (time.length() < 5)
     return false;
 
-  std::vector<base::string16> time_parts;
-  base::SplitString(time.substr(0, 5), ':', &time_parts);
+  std::vector<base::StringPiece16> time_parts = base::SplitStringPiece(
+      base::StringPiece16(time).substr(0, 5), 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;
 
   if (time.length() > 5) {
@@ skipping 31 matching lines @@
     while (!iter.end() && !u_isspace(iter.get()))
       iter.Advance();
   }
 
   base::string16 result(text.substr(iter.array_pos()));
   base::TrimWhitespace(result, base::TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace