Cleanup: Rename SkOSPath functions.

tools/picture_utils.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 "picture_utils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 37 matching lines @@
 
     void setup_bitmap(SkBitmap* bitmap, int width, int height) {
         bitmap->allocN32Pixels(width, height);
         bitmap->eraseColor(SK_ColorTRANSPARENT);
     }
 
     bool write_bitmap_to_disk(const SkBitmap& bm, const SkString& dirPath,
                               const char *subdirOrNull, const SkString& baseName) {
         SkString partialPath;
         if (subdirOrNull) {
-            partialPath = SkOSPath::SkPathJoin(dirPath.c_str(), subdirOrNull);
+            partialPath = SkOSPath::Join(dirPath.c_str(), subdirOrNull);
             sk_mkdir(partialPath.c_str());
         } else {
             partialPath.set(dirPath);
         }
-        SkString fullPath = SkOSPath::SkPathJoin(partialPath.c_str(), baseName.c_str());
+        SkString fullPath = SkOSPath::Join(partialPath.c_str(), baseName.c_str());
         if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {
             return true;
         } else {
             SkDebugf("Failed to write the bitmap to %s.\n", fullPath.c_str());
             return false;
         }
     }
 
 } // namespace sk_tools