Update SplitString calls in chrome.

chrome/browser/net/safe_search_util.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 "chrome/browser/net/safe_search_util.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 32 matching lines @@
 }
 
 // Examines the query string containing parameters and adds the necessary ones
 // so that SafeSearch is active. |query| is the string to examine and the
 // return value is the |query| string modified such that SafeSearch is active.
 std::string AddSafeSearchParameters(const std::string& query) {
   std::vector<std::string> new_parameters;
   std::string safe_parameter = chrome::kSafeSearchSafeParameter;
   std::string ssui_parameter = chrome::kSafeSearchSsuiParameter;
 
-  std::vector<std::string> parameters;
-  base::SplitString(query, '&', &parameters);
-
-  std::vector<std::string>::iterator it;
-  for (it = parameters.begin(); it < parameters.end(); ++it) {
-    if (!HasSameParameterKey(*it, safe_parameter) &&
-        !HasSameParameterKey(*it, ssui_parameter)) {
-      new_parameters.push_back(*it);
+  for (const std::string& param : base::SplitString(
+           query, "&", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+    if (!HasSameParameterKey(param, safe_parameter) &&
+        !HasSameParameterKey(param, ssui_parameter)) {
+      new_parameters.push_back(param);
     }
   }
 
   new_parameters.push_back(safe_parameter);
   new_parameters.push_back(ssui_parameter);
   return base::JoinString(new_parameters, "&");
 }
 
 } // namespace
 
@@ skipping 45 matching lines @@
 
 void ClearForceGoogleSafeSearchCountForTesting() {
   g_force_google_safe_search_count_for_test = 0;
 }
 
 void ClearForceYouTubeSafetyModeCountForTesting() {
   g_force_youtube_safety_mode_count_for_test = 0;
 }
 
 }  // namespace safe_search_util