Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/test/launcher/test_launcher_ios.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 "base/test/launcher/test_launcher.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 103 matching lines @@
     *path = path->AppendASCII("test_results.xml");
     return true;
   }
 
   base::CommandLine GetCommandLineForChildGTestProcess(
       const std::vector<std::string>& test_names,
       const base::FilePath& output_file) override {
     base::CommandLine cmd_line(dir_exe_.AppendASCII(test_name_ + ".app"));
     cmd_line.AppendSwitchPath(switches::kTestLauncherOutput, output_file);
     cmd_line.AppendSwitchASCII(base::kGTestFilterFlag,
-                               JoinString(test_names, ":"));
+                               base::JoinString(test_names, ":"));
     return cmd_line;
   }
 
   std::string GetWrapperForChildGTestProcess() override {
     return dir_exe_.AppendASCII("iossim").value();
   }
 
   void RelaunchTests(base::TestLauncher* test_launcher,
                      const std::vector<std::string>& test_names,
                      int launch_flags) override {
@@ skipping 43 matching lines @@
   // Force one job since we can't run multiple simulators in parallel.
   base::TestLauncher launcher(&delegate, 1);
   bool success = launcher.Run();
 
   fprintf(stdout, "Tests took %" PRId64 " seconds.\n",
           (base::TimeTicks::Now() - start_time).InSeconds());
   fflush(stdout);
 
   return (success ? 0 : 1);
 }