Cleanup: Rename SkOSPath functions.

tools/CopyTilesRenderer.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 "CopyTilesRenderer.h"
 #include "SkCanvas.h"
@@ skipping 54 matching lines @@
                         subset.set(tileX, tileY, tileX + this->getTileWidth(),
                                    tileY + this->getTileHeight());
                         SkDEBUGCODE(bool extracted =)
                         baseBitmap.extractSubset(&dst, subset);
                         SkASSERT(extracted);
                         if (!fWritePath.isEmpty()) {
                             // Similar to write() in PictureRenderer.cpp, but just encodes
                             // a bitmap directly.
                             // TODO: Share more common code with write() to do this, to properly
                             // write out the JSON summary, etc.
-                            SkString pathWithNumber = SkOSPath::SkPathJoin(fWritePath.c_str(),
-                                                                           fInputFilename.c_str());
+                            SkString pathWithNumber = SkOSPath::Join(fWritePath.c_str(),
+                                                                     fInputFilename.c_str());
                             pathWithNumber.remove(pathWithNumber.size() - 4, 4);
                             pathWithNumber.appendf("%i.png", i++);
                             SkBitmap copy;
 #if SK_SUPPORT_GPU
                             if (isUsingGpuDevice()) {
                                 dst.pixelRef()->readPixels(&copy, &subset);
                             } else {
 #endif
                                 dst.copyTo(&copy);
 #if SK_SUPPORT_GPU
                             }
 #endif
                             success &= SkImageEncoder::EncodeFile(pathWithNumber.c_str(), copy,
                                                                   SkImageEncoder::kPNG_Type, 100);
                         }
                     }
                 }
             }
         }
         return success;
     }
 
     SkString CopyTilesRenderer::getConfigNameInternal() {
         return SkString("copy_tiles");
     }
 }