Update SplitString calls in components

components/bookmarks/browser/bookmark_model_unittest.cc

 // Copyright 2014 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/bookmarks/browser/bookmark_model.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 142 matching lines @@
 //   a 1 c
 //     |
 //     b
 // In words: a node of type URL with the title a, followed by a folder node with
 // the title 1 having the single child of type url with name b, followed by
 // the url node with the title c.
 //
 // NOTE: each name must be unique, and folders are assigned a unique title by
 // way of an increasing integer.
 void PopulateNodeFromString(const std::string& description, TestNode* parent) {
-  std::vector<std::string> elements;
-  base::SplitStringAlongWhitespace(description, &elements);
+  std::vector<std::string> elements = base::SplitString(
+      description, base::kWhitespaceASCII,
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   size_t index = 0;
   PopulateNodeImpl(elements, &index, parent);
 }
 
 // Populates the BookmarkNode with the children of parent.
 void PopulateBookmarkNode(TestNode* parent,
                           BookmarkModel* model,
                           const BookmarkNode* bb_node) {
   for (int i = 0; i < parent->child_count(); ++i) {
     TestNode* child = parent->GetChild(i);
@@ skipping 1147 matching lines @@
     std::set<GURL> changed_page_urls;
     changed_page_urls.insert(kPageURL1);
     model_->OnFaviconsChanged(changed_page_urls, kFaviconURL12);
     ASSERT_EQ(2u, updated_nodes_.size());
     EXPECT_TRUE(WasNodeUpdated(node1));
     EXPECT_TRUE(WasNodeUpdated(node2));
   }
 }
 
 }  // namespace bookmarks