Make SplitStringUsingSubstr have consistent args.

chrome/browser/ui/webui/options/autofill_options_handler.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 "chrome/browser/ui/webui/options/autofill_options_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 328 matching lines @@
   DCHECK_EQ(labels.size(), profiles.size());
 
   base::ListValue addresses;
   for (size_t i = 0; i < profiles.size(); ++i) {
     // Skip showing auxiliary profiles (e.g. Mac Contacts) for now.
     if (profiles[i]->record_type() == AutofillProfile::AUXILIARY_PROFILE)
       continue;
 
     base::string16 separator =
         l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR);
-    std::vector<base::string16> label_parts;
-    base::SplitStringUsingSubstr(labels[i], separator, &label_parts);
+    std::vector<base::string16> label_parts = base::SplitStringUsingSubstr(
+        labels[i], separator, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
     value->SetString("guid", profiles[i]->guid());
     value->SetString("label", label_parts[0]);
     value->SetString("sublabel", labels[i].substr(label_parts[0].size()));
     value->SetBoolean("isLocal", profiles[i]->record_type() ==
                                      AutofillProfile::LOCAL_PROFILE);
     addresses.Append(std::move(value));
   }
 
@@ skipping 269 matching lines @@
   address->SetString(kLanguageCode, profile.language_code());
 
   std::unique_ptr<base::ListValue> components(new base::ListValue);
   GetAddressComponents(
       base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY)),
       profile.language_code(), components.get(), nullptr);
   address->Set(kComponents, components.release());
 }
 
 }  // namespace options