Cleanup: Rename SkOSPath functions.

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 "BenchLogger.h"
 #include "Timer.h"
 #include "CopyTilesRenderer.h"
@@ skipping 179 matching lines @@
     }
     SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream, proc));
 
     if (NULL == picture.get()) {
         SkString err;
         err.printf("Could not read an SkPicture from %s\n", inputPath.c_str());
         gLogger.logError(err);
         return false;
     }
 
-    SkString filename = SkOSPath::SkBasename(inputPath.c_str());
+    SkString filename = SkOSPath::Basename(inputPath.c_str());
 
     gWriter.bench(filename.c_str(), picture->width(), picture->height());
 
     benchmark.run(picture);
 
 #if SK_LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
         int cacheHits = pool->getCacheHits();
         int cacheMisses = pool->getCacheMisses();
         pool->resetCacheHitsAndMisses();
@@ skipping 158 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 = SkOSPath::SkPathJoin(input, inputFilename.c_str());
+            SkString inputPath = SkOSPath::Join(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 76 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