Cleanup: Rename SkOSPath functions.

bench/benchmain.cpp

 /*
  * Copyright 2011 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 "Benchmark.h"
 #include "CrashHandler.h"
@@ skipping 90 matching lines @@
 static void saveFile(const char name[], const char config[], const char dir[],
                      const SkImage* image) {
     SkAutoTUnref<SkData> data(image->encode(SkImageEncoder::kPNG_Type, 100));
     if (NULL == data.get()) {
         return;
     }
 
     SkString filename;
     make_filename(name, &filename);
     filename.appendf("_%s.png", config);
-    SkString path = SkOSPath::SkPathJoin(dir, filename.c_str());
+    SkString path = SkOSPath::Join(dir, filename.c_str());
     ::remove(path.c_str());
 
     SkFILEWStream   stream(path.c_str());
     stream.write(data->data(), data->size());
 }
 
 static void perform_clip(SkCanvas* canvas, int w, int h) {
     SkRect r;
 
     r.set(SkIntToScalar(10), SkIntToScalar(10),
@@ skipping 585 matching lines @@
     gContextFactory.destroyContexts();
 #endif
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif