Update SplitString calls in chrome.

chrome/browser/ui/autofill/generated_credit_card_bubble_controller.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 "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
 
 #include <climits>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 175 matching lines @@
   contents_text_.clear();
   contents_text_ranges_.clear();
 
   base::string16 to_split = l10n_util::GetStringFUTF16(
       IDS_AUTOFILL_GENERATED_CREDIT_CARD_BUBBLE_CONTENTS,
       fronting_card_name_,
       backing_card_name_);
 
   // Split the full text on '|' to highlight certain parts. For example, "sly"
   // and "jumped" would be bolded in "The |sly| fox |jumped| over the lazy dog".
-  std::vector<base::string16> pieces;
-  base::SplitStringDontTrim(to_split, kRangeSeparator, &pieces);
+  std::vector<base::string16> pieces = base::SplitString(
+      to_split, base::string16(1, kRangeSeparator),
+      base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
 
   while (!pieces.empty()) {
     base::string16 piece = pieces.front();
 
-    // Every second piece should be bolded. Because |base::SplitString*()|
-    // leaves an empty "" even if '|' is the first character, this is guaranteed
-    // to work for "|highlighting| starts here". Ignore empty pieces because
-    // there's nothing to highlight.
+    // Every second piece should be bolded. Because SPLIT_WANT_ALL makes
+    // SplitString leave an empty "" even if '|' is the first character, this
+    // is guaranteed to work for "|highlighting| starts here". Ignore empty
+    // pieces because there's nothing to highlight.
     if (!piece.empty() && pieces.size() % 2 == 0) {
       const size_t start = contents_text_.size();
       TextRange bold_text;
       bold_text.range = gfx::Range(start, start + piece.size());
       bold_text.is_link = false;
       contents_text_ranges_.push_back(bold_text);
     }
 
     // Append the piece whether it's bolded or not and move on to the next one.
     contents_text_.append(piece);
@@ skipping 45 matching lines @@
   if (browser && browser->window() && browser->window()->GetLocationBar())
     browser->window()->GetLocationBar()->UpdateGeneratedCreditCardView();
 }
 
 void GeneratedCreditCardBubbleController::Hide() {
   if (bubble_ && !bubble_->IsHiding())
     bubble_->Hide();
 }
 
 }  // namespace autofill