Update SplitString calls in components

components/bookmarks/browser/bookmark_index_unittest.cc

Index: components/bookmarks/browser/bookmark_index_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index cab18e56987f86637307686fa8d73c3d1cc0b2e8..7e5831c3e49b476d3fa881da95069dcae5c9b2f3 100644
--- a/components/bookmarks/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -109,11 +109,11 @@ class BookmarkIndexTest : public testing::Test {
 
   void ExtractMatchPositions(const std::string& string,
                              BookmarkMatch::MatchPositions* matches) {
-    std::vector<std::string> match_strings;
-    base::SplitString(string, ':', &match_strings);
-    for (size_t i = 0; i < match_strings.size(); ++i) {
-      std::vector<std::string> chunks;
-      base::SplitString(match_strings[i], ',', &chunks);
+    for (const base::StringPiece& match :
+         base::SplitStringPiece(string, ":",
+                                base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL)) {

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

+      std::vector<base::StringPiece> chunks = base::SplitStringPiece(
+          match, ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

       ASSERT_EQ(2U, chunks.size());
       matches->push_back(BookmarkMatch::MatchPosition());
       int chunks0, chunks1;
@@ -192,18 +192,20 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatching) {
     { "abc def",                    "abc d",    "" },
   };
   for (size_t i = 0; i < arraysize(data); ++i) {
-    std::vector<std::string> titles;
-    base::SplitString(data[i].titles, ';', &titles);
     std::vector<TitleAndURL> bookmarks;
-    for (size_t j = 0; j < titles.size(); ++j) {
-      TitleAndURL bookmark(titles[j], kAboutBlankURL);
+    for (const std::string& title : base::SplitString(
+             data[i].titles, ";",
+             base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL)) {

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

+      TitleAndURL bookmark(title, kAboutBlankURL);
       bookmarks.push_back(bookmark);
     }
     AddBookmarks(bookmarks);
 
     std::vector<std::string> expected;
-    if (!data[i].expected.empty())
-      base::SplitString(data[i].expected, ';', &expected);
+    if (!data[i].expected.empty()) {
+      expected = base::SplitString(data[i].expected, ";",
+                                   base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

+    }
 
     ExpectMatches(data[i].query, query_parser::MatchingAlgorithm::DEFAULT,
                   expected);
@@ -251,18 +253,20 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatchingAlwaysPrefixSearch) {
     { "ab cdef;abcd;abcd cdefg",    "ab cdef",  "ab cdef;abcd cdefg" },
   };
   for (size_t i = 0; i < arraysize(data); ++i) {
-    std::vector<std::string> titles;
-    base::SplitString(data[i].titles, ';', &titles);
     std::vector<TitleAndURL> bookmarks;
-    for (size_t j = 0; j < titles.size(); ++j) {
-      TitleAndURL bookmark(titles[j], kAboutBlankURL);
+    for (const std::string& title : base::SplitString(
+             data[i].titles, ";",
+             base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL)) {

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

+      TitleAndURL bookmark(title, kAboutBlankURL);
       bookmarks.push_back(bookmark);
     }
     AddBookmarks(bookmarks);
 
     std::vector<std::string> expected;
-    if (!data[i].expected.empty())
-      base::SplitString(data[i].expected, ';', &expected);
+    if (!data[i].expected.empty()) {
+      expected = base::SplitString(data[i].expected, ";",
+                                   base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);

[yzshen1, 2015/07/22 22:50:34]

TRIM_WHITESPACE

+    }
 
     ExpectMatches(data[i].query,
                   query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH,