Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

apps/benchmark/run_args.cc

 // Copyright 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 "apps/benchmark/run_args.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
                << ", expected " << required_args << " while " << provided_args
                << " were provided";
     return false;
   }
   return true;
 }
 
 bool GetMeasurement(const std::string& measurement_spec, Measurement* result) {
   // Measurements are described in the format:
   // <measurement type>/<event category>/<event name>.
-  std::vector<std::string> parts;
-  base::SplitString(measurement_spec, '/', &parts);
+  std::vector<std::string> parts = base::SplitString(
+      measurement_spec, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (parts.size() < 1) {
     LOG(ERROR) << "Could not parse the measurement description: "
                << measurement_spec;
     return false;
   }
 
   if (parts[0] == "time_until") {
     if (!CheckMeasurementFormat(parts[0], 3, parts.size()))
       return false;
     *result =
@@ skipping 76 matching lines @@
     if (!GetMeasurement(unquoted_measurement_spec, &measurement)) {
       return false;
     }
     result->measurements.push_back(measurement);
   }
 
   return true;
 }
 
 }  // namespace benchmark