Cleanup: Rename SkOSPath functions.

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index d4ec45eb9b262c326f255ef9f9e5ee3c0bec3f02..9b51eb0ad6265fc9ad57d74a1a78f03909661db7 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -237,7 +237,7 @@ public:
         filename.append(renderModeDescriptor);
         filename.appendUnichar('.');
         filename.append(suffix);
-        return SkOSPath::SkPathJoin(path, filename.c_str());
+        return SkOSPath::Join(path, filename.c_str());
     }
 
     /**
@@ -257,7 +257,7 @@ public:
             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);