Update SplitString calls in components

components/autofill/core/browser/autofill_field.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_field.h"
 
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 84 matching lines @@
 // Like SetSelectControlValue, but searches within the field values and options
 // for |value|. First it tokenizes the options, then tries to match against
 // tokens. For example, "NC - North Carolina" would match "nc" but not "ca".
 bool SetSelectControlValueTokenMatch(const base::string16& value,
                                      FormFieldData* field) {
   std::vector<base::string16> tokenized;
   DCHECK_EQ(field->option_values.size(), field->option_contents.size());
   l10n::CaseInsensitiveCompare compare;
 
   for (size_t i = 0; i < field->option_values.size(); ++i) {
-    base::SplitStringAlongWhitespace(field->option_values[i], &tokenized);
+    tokenized = base::SplitString(
+        field->option_values[i], base::kWhitespaceASCIIAs16,
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     if (std::find_if(tokenized.begin(), tokenized.end(),
                      [&compare, value](base::string16& rhs) {
                        return compare.StringsEqual(value, rhs);
                      }) != tokenized.end()) {
       field->value = field->option_values[i];
       return true;
     }
 
-    base::SplitStringAlongWhitespace(field->option_contents[i], &tokenized);
+    tokenized = base::SplitString(
+        field->option_contents[i], base::kWhitespaceASCIIAs16,
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     if (std::find_if(tokenized.begin(), tokenized.end(),
                      [&compare, value](base::string16& rhs) {
                        return compare.StringsEqual(value, rhs);
                      }) != tokenized.end()) {
       field->value = field->option_values[i];
       return true;
     }
   }
 
   return false;
@@ skipping 201 matching lines @@
     return FillCreditCardTypeSelectControl(value, field);
   }
 
   return false;
 }
 
 // Fills in the month control |field| with |value|.  |value| should be a date
 // formatted as MM/YYYY.  If it isn't, filling will fail.
 bool FillMonthControl(const base::string16& value, FormFieldData* field) {
   // Autofill formats a combined date as month/year.
-  std::vector<base::string16> pieces;
-  base::SplitString(value, base::char16('/'), &pieces);
+  std::vector<base::string16> pieces = base::SplitString(
+      value, base::ASCIIToUTF16("/"),
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (pieces.size() != 2)
     return false;
 
   // HTML5 input="month" is formatted as year-month.
   base::string16 month = pieces[0];
   base::string16 year = pieces[1];
   if ((month.size() != 1 && month.size() != 2) || year.size() != 4)
     return false;
 
   // HTML5 input="month" expects zero-padded months.
@@ skipping 10 matching lines @@
 void FillStreetAddress(const base::string16& value,
                        const std::string& address_language_code,
                        FormFieldData* field) {
   if (field->form_control_type == "textarea") {
     field->value = value;
     return;
   }
 
   AddressData address_data;
   address_data.language_code = address_language_code;
-  base::SplitString(base::UTF16ToUTF8(value), '\n', &address_data.address_line);
+  address_data.address_line = base::SplitString(
+      base::UTF16ToUTF8(value), "\n",
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   std::string line;
   GetStreetAddressLinesAsSingleLine(address_data, &line);
   field->value = base::UTF8ToUTF16(line);
 }
 
 std::string Hash32Bit(const std::string& str) {
   std::string hash_bin = base::SHA1HashString(str);
   DCHECK_EQ(base::kSHA1Length, hash_bin.length());
 
   uint32 hash32 = ((hash_bin[0] & 0xFF) << 24) |
@@ skipping 177 matching lines @@
     if (compare.StringsEqual(value_stripped, option_contents)) {
       if (index)
         *index = i;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace autofill