Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

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 60 matching lines @@
   // 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);
       category_set.insert(categories.begin(), categories.end());
     }
     std::vector<std::string> unique_categories(category_set.begin(),
                                                category_set.end());
-    return JoinString(unique_categories, ',');
+    return base::JoinString(unique_categories, ",");
   }
 
   void StartTracedApplication(mojo::ApplicationImpl* app) {
     // Record the time origin for measurements just before connecting to the app
     // being benchmarked.
     time_origin_ = base::TimeTicks::FromInternalValue(MojoGetTimeTicksNow());
     traced_app_connection_ = app->ConnectToApplication(args_.app);
 
     // Post task to stop tracing when the time is up.
     base::MessageLoop::current()->PostDelayedTask(
@@ skipping 63 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;
 }