Cleanup: Rename SkOSPath functions.

gm/gmmain.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.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 219 matching lines @@
      */
     SkString make_filename(const char *path,
                            const char *shortName,
                            const char *configName,
                            const char *renderModeDescriptor,
                            const char *suffix) {
         SkString filename = make_shortname_plus_config(shortName, configName);
         filename.append(renderModeDescriptor);
         filename.appendUnichar('.');
         filename.append(suffix);
-        return SkOSPath::SkPathJoin(path, filename.c_str());
+        return SkOSPath::Join(path, filename.c_str());
     }
 
     /**
      * Assemble filename suitable for writing out an SkBitmap.
      */
     SkString make_bitmap_filename(const char *path,
                                   const char *shortName,
                                   const char *configName,
                                   const char *renderModeDescriptor,
                                   const GmResultDigest &bitmapDigest) {
         if (fWriteChecksumBasedFilenames) {
             SkString filename;
             filename.append(bitmapDigest.getHashType());
             filename.appendUnichar('_');
             filename.append(shortName);
             filename.appendUnichar('_');
             filename.append(bitmapDigest.getDigestValue());
             filename.appendUnichar('.');
             filename.append(kPNG_FileExtension);
-            return SkOSPath::SkPathJoin(path, filename.c_str());
+            return SkOSPath::Join(path, filename.c_str());
         } else {
             return make_filename(path, shortName, configName, renderModeDescriptor,
                                  kPNG_FileExtension);
         }
     }
 
     /* since PNG insists on unpremultiplying our alpha, we take no
        precision chances and force all pixels to be 100% opaque,
        otherwise on compare we may not get a perfect match.
     */
@@ skipping 2223 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #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