Update SplitString calls in components

components/query_parser/snippet_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/query_parser/snippet.h"
 
 #include <algorithm>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 78 matching lines @@
 // sqlite's FTS matching.  BuildSnippet returns the snippet for matching
 // |query| against |document|.  Matches are surrounded by "**".
 base::string16 BuildSnippet(const std::string& document,
                             const std::string& query) {
   // This function assumes that |document| does not contain
   // any character for which lowercasing changes its length. Further,
   // it's assumed that lowercasing only the ASCII-portion works for
   // |document|. We need to add more test cases and change this function
   // to be more generic depending on how we deal with 'folding for match'
   // in history.
-  const std::string document_folded =
-      base::StringToLowerASCII(std::string(document));
-
-  std::vector<std::string> query_words;
-  base::SplitString(query, ' ', &query_words);
+  const std::string document_folded = base::StringToLowerASCII(document);
 
   // Manually construct match_positions of the document.
   Snippet::MatchPositions match_positions;
   match_positions.clear();
-  for (std::vector<std::string>::iterator qw = query_words.begin();
-       qw != query_words.end(); ++qw) {
+  for (const std::string& word : base::SplitString(
+           query, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     // Insert all instances of this word into match_pairs.
     size_t ofs = 0;
-    while ((ofs = document_folded.find(*qw, ofs)) != std::string::npos) {
-      match_positions.push_back(std::make_pair(ofs, ofs + qw->size()));
-      ofs += qw->size();
+    while ((ofs = document_folded.find(word, ofs)) != std::string::npos) {
+      match_positions.push_back(std::make_pair(ofs, ofs + word.size()));
+      ofs += word.size();
     }
   }
   // Sort match_positions in order of increasing offset.
   std::sort(match_positions.begin(), match_positions.end(), ComparePair1st);
 
   // Compute the snippet.
   Snippet snippet;
   snippet.ComputeSnippet(match_positions, document);
 
   // Now "highlight" all matches in the snippet with **.
@@ skipping 121 matching lines @@
     Snippet::ExtractMatchPositions(data[i].offsets_string, "0", &matches);
     EXPECT_EQ(data[i].expected_match_count, matches.size());
     for (size_t j = 0; j < data[i].expected_match_count; ++j) {
       EXPECT_EQ(data[i].expected_matches[2 * j], matches[j].first);
       EXPECT_EQ(data[i].expected_matches[2 * j + 1], matches[j].second);
     }
   }
 }
 
 }  // namespace query_parser