Make SplitStringUsingSubstr have consistent args.

chrome/browser/extensions/api/autofill_private/autofill_util.cc

 // Copyright 2015 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 "chrome/browser/extensions/api/autofill_private/autofill_util.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 83 matching lines @@
   address.country_code.reset(
       GetStringFromProfile(profile, autofill::ADDRESS_HOME_COUNTRY).release());
   address.phone_numbers =
       GetValueList(profile, autofill::PHONE_HOME_WHOLE_NUMBER);
   address.email_addresses = GetValueList(profile, autofill::EMAIL_ADDRESS);
   address.language_code.reset(new std::string(profile.language_code()));
 
   // Parse |label| so that it can be used to create address metadata.
   base::string16 separator =
       l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR);
-  std::vector<base::string16> label_pieces;
-  base::SplitStringUsingSubstr(label, separator, &label_pieces);
+  std::vector<base::string16> label_pieces = base::SplitStringUsingSubstr(
+      label, separator, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // Create address metadata and add it to |address|.
   std::unique_ptr<autofill_private::AutofillMetadata> metadata(
       new autofill_private::AutofillMetadata);
   metadata->summary_label = base::UTF16ToUTF8(label_pieces[0]);
   metadata->summary_sublabel.reset(new std::string(base::UTF16ToUTF8(
       label.substr(label_pieces[0].size()))));
   metadata->is_local.reset(new bool(
       profile.record_type() == autofill::AutofillProfile::LOCAL_PROFILE));
   address.metadata = std::move(metadata);
@@ skipping 93 matching lines @@
   CreditCardEntryList list;
   for (const autofill::CreditCard* card : cards)
     list.push_back(CreditCardToCreditCardEntry(*card));
 
   return list;
 }
 
 }  // namespace autofill_util
 
 }  // namespace extensions