Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin().

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "LazyDecodeBitmap.h"
@@ skipping 356 matching lines @@
 }
 
 static int process_input(const char* input,
                          sk_tools::PictureBenchmark& benchmark) {
     SkString inputAsSkString(input);
     SkOSFile::Iter iter(input, "skp");
     SkString inputFilename;
     int failures = 0;
     if (iter.next(&inputFilename)) {
         do {
-            SkString inputPath;
-            sk_tools::make_filepath(&inputPath, inputAsSkString, inputFilename);
+            SkString inputPath = SkOSPath::SkPathJoin(input, inputFilename.c_str());
             if (!run_single_benchmark(inputPath, benchmark)) {
                 ++failures;
             }
         } while(iter.next(&inputFilename));
     } else if (SkStrEndsWith(input, ".skp")) {
         if (!run_single_benchmark(inputAsSkString, benchmark)) {
             ++failures;
         }
     } else {
         SkString warning;
@@ skipping 70 matching lines @@
 #endif
     gWriter.end();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif