Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

apps/benchmark/benchmark_app.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 <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "apps/benchmark/event.h"
@@ skipping 57 matching lines @@
         FROM_HERE, base::Bind(&BenchmarkApp::StartTracedApplication,
                               base::Unretained(this), app),
         base::TimeDelta::FromSeconds(1));
   }
 
   // Computes the string of trace categories we want to collect: a union of all
   // categories targeted in measurements.
   std::string ComputeCategoriesStr() {
     std::set<std::string> category_set;
     for (const Measurement& measurement : args_.measurements) {
-      std::vector<std::string> categories;
-      base::SplitString(measurement.target_event.categories, ',', &categories);
+      std::vector<std::string> categories =
+          base::SplitString(measurement.target_event.categories, ",",
+                            base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
       category_set.insert(categories.begin(), categories.end());
     }
     std::vector<std::string> unique_categories(category_set.begin(),
                                                category_set.end());
     return base::JoinString(unique_categories, ",");
   }
 
   void StartTracedApplication(mojo::ApplicationImpl* app) {
     // Record the time origin for measurements just before connecting to the app
     // being benchmarked.
@@ skipping 69 matching lines @@
 };
 }  // namespace
 }  // namespace benchmark
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new benchmark::BenchmarkApp);
   auto ret = runner.Run(application_request);
   fflush(nullptr);
   return ret;
 }