Update SplitString calls in chrome.

chrome/common/variations/experiment_labels_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 "chrome/common/variations/experiment_labels.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialB",
                              "Group1", TEST_VALUE_B);
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialC",
                              "Default", TEST_VALUE_C);
   AssociateGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE, "FieldTrialD",
                              "Default", TEST_VALUE_D);  // Not actually used.
 
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
     // Parse the input groups.
     base::FieldTrial::ActiveGroups groups;
-    std::vector<std::string> group_data;
-    base::SplitString(test_cases[i].active_group_pairs, '#', &group_data);
+    std::vector<std::string> group_data = base::SplitString(
+        test_cases[i].active_group_pairs, "#",
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     ASSERT_EQ(0U, group_data.size() % 2);
     for (size_t j = 0; j < group_data.size(); j += 2) {
       base::FieldTrial::ActiveGroup group;
       group.trial_name = group_data[j];
       group.group_name = group_data[j + 1];
       groups.push_back(group);
     }
 
     // Parse the expected output.
-    std::vector<std::string> expected_ids_list;
-    base::SplitString(test_cases[i].expected_ids, '#', &expected_ids_list);
+    std::vector<std::string> expected_ids_list = base::SplitString(
+        test_cases[i].expected_ids, "#",
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     std::string experiment_labels_string = base::UTF16ToUTF8(
         BuildGoogleUpdateExperimentLabel(groups));
 
     // Split the VariationIDs from the labels for verification below.
-    std::vector<std::string> split_labels;
     std::set<std::string> parsed_ids;
-    base::SplitString(experiment_labels_string, ';', &split_labels);
-    for (std::vector<std::string>::const_iterator it = split_labels.begin();
-         it != split_labels.end(); ++it) {
+    for (const std::string& label : base::SplitString(
+             experiment_labels_string, ";",
+             base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
       // The ID is precisely between the '=' and '|' characters in each label.
-      size_t index_of_equals = it->find('=');
-      size_t index_of_pipe = it->find('|');
+      size_t index_of_equals = label.find('=');
+      size_t index_of_pipe = label.find('|');
       ASSERT_NE(std::string::npos, index_of_equals);
       ASSERT_NE(std::string::npos, index_of_pipe);
       ASSERT_GT(index_of_pipe, index_of_equals);
-      parsed_ids.insert(it->substr(index_of_equals + 1,
-                                   index_of_pipe - index_of_equals - 1));
+      parsed_ids.insert(label.substr(index_of_equals + 1,
+                                     index_of_pipe - index_of_equals - 1));
     }
 
     // Verify that the resulting string contains each of the expected labels,
     // and nothing more. Note that the date is stripped out and ignored.
     for (std::vector<std::string>::const_iterator it =
              expected_ids_list.begin(); it != expected_ids_list.end(); ++it) {
       std::set<std::string>::iterator it2 = parsed_ids.find(*it);
       EXPECT_TRUE(parsed_ids.end() != it2);
       parsed_ids.erase(it2);
     }
@@ skipping 83 matching lines @@
 
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::string non_variation_labels = base::UTF16ToUTF8(
         ExtractNonVariationLabels(
             base::ASCIIToUTF16(test_cases[i].input_label)));
     EXPECT_EQ(test_cases[i].expected_output, non_variation_labels);
   }
 }
 
 }  // namespace chrome_variations