Revert of Update SplitString calls to new form

base/trace_event/trace_config.cc

 // Copyright (c) 2015 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 "base/trace_event/trace_config.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_split.h"
@@ skipping 275 matching lines @@
   if (dict->GetList(kExcludedCategoriesParam, &category_list))
     SetCategoriesFromExcludedList(*category_list);
   if (dict->GetList(kSyntheticDelaysParam, &category_list))
     SetSyntheticDelaysFromList(*category_list);
 }
 
 void TraceConfig::InitializeFromStrings(
     const std::string& category_filter_string,
     const std::string& trace_options_string) {
   if (!category_filter_string.empty()) {
-    std::vector<std::string> split = base::SplitString(
-        category_filter_string, ",", base::TRIM_WHITESPACE,
-        base::SPLIT_WANT_ALL);
+    std::vector<std::string> split;
     std::vector<std::string>::iterator iter;
+    base::SplitString(category_filter_string, ',', &split);
     for (iter = split.begin(); iter != split.end(); ++iter) {
       std::string category = *iter;
       // Ignore empty categories.
       if (category.empty())
         continue;
       // Synthetic delays are of the form 'DELAY(delay;option;option;...)'.
       if (category.find(kSyntheticDelayCategoryFilterPrefix) == 0 &&
           category.at(category.size() - 1) == ')') {
         category = category.substr(
             strlen(kSyntheticDelayCategoryFilterPrefix),
@@ skipping 15 matching lines @@
         included_categories_.push_back(category);
       }
     }
   }
 
   record_mode_ = RECORD_UNTIL_FULL;
   enable_sampling_ = false;
   enable_systrace_ = false;
   enable_argument_filter_ = false;
   if(!trace_options_string.empty()) {
-    std::vector<std::string> split = base::SplitString(
-        trace_options_string, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> split;
     std::vector<std::string>::iterator iter;
+    base::SplitString(trace_options_string, ',', &split);
     for (iter = split.begin(); iter != split.end(); ++iter) {
       if (*iter == kRecordUntilFull) {
         record_mode_ = RECORD_UNTIL_FULL;
       } else if (*iter == kRecordContinuously) {
         record_mode_ = RECORD_CONTINUOUSLY;
       } else if (*iter == kTraceToConsole) {
         record_mode_ = ECHO_TO_CONSOLE;
       } else if (*iter == kRecordAsMuchAsPossible) {
         record_mode_ = RECORD_AS_MUCH_AS_POSSIBLE;
       } else if (*iter == kEnableSampling) {
@@ skipping 192 matching lines @@
           str.at(0) == ' ' ||
           str.at(str.length() - 1) == ' ';
 }
 
 bool TraceConfig::HasIncludedPatterns() const {
   return !included_categories_.empty();
 }
 
 }  // namespace trace_event
 }  // namespace base