Cleanup: Rename SkOSPath functions.

tools/bench_pictures_main.cpp

Index: tools/bench_pictures_main.cpp
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index f6cd8e9bd7db7e201e54ad34d3681a94a52c2cb9..b740877cce053a9fbd530df5787b9ebafc50cee7 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -197,7 +197,7 @@ static bool run_single_benchmark(const SkString& inputPath,
         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());
 
@@ -376,7 +376,7 @@ static int process_input(const char* input,
     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;
             }