Cleanup: Rename SkOSPath functions.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommonFlags.h"
 #include "SkImageEncoder.h"
 #include "SkMallocPixelRef.h"
 #include "SkStream.h"
 #include "SkString.h"
 
@@ skipping 118 matching lines @@
 
 void WriteTask::draw() {
     SkString dir(FLAGS_writePath[0]);
 #if SK_BUILD_FOR_IOS
     if (dir.equals("@")) {
         dir.set(FLAGS_resourcePath[0]);
     }
 #endif
     this->makeDirOrFail(dir);
     for (int i = 0; i < fSuffixes.count(); i++) {
-        dir = SkOSPath::SkPathJoin(dir.c_str(), fSuffixes[i].c_str());
+        dir = SkOSPath::Join(dir.c_str(), fSuffixes[i].c_str());
         this->makeDirOrFail(dir);
     }
 
-    SkString path = SkOSPath::SkPathJoin(dir.c_str(), fGmName.c_str());
+    SkString path = SkOSPath::Join(dir.c_str(), fGmName.c_str());
     path.append(fExtension);
 
     const bool ok = fData.get() ? save_data_to_file(fData,   path.c_str())
                                 : PngAndRaw::Encode(fBitmap, path.c_str());
     if (!ok) {
         this->fail();
     }
 }
 
 SkString WriteTask::name() const {
@@ skipping 12 matching lines @@
 static SkString path_to_expected_image(const char* root, const Task& task) {
     SkString filename = task.name();
 
     // We know that all names passed in here belong to top-level Tasks, which have a single suffix
     // (8888, 565, gpu, etc.) indicating what subdirectory to look in.
     SkTArray<SkString> suffixes;
     const int suffixLength = split_suffixes(1, filename.c_str(), &suffixes);
     SkASSERT(1 == suffixes.count());
 
     // We'll look in root/suffix for images.
-    const SkString dir = SkOSPath::SkPathJoin(root, suffixes[0].c_str());
+    const SkString dir = SkOSPath::Join(root, suffixes[0].c_str());
 
     // Remove the suffix and tack on a .png.
     filename.remove(filename.size() - suffixLength, suffixLength);
     filename.append(".png");
 
-    return SkOSPath::SkPathJoin(dir.c_str(), filename.c_str());
+    return SkOSPath::Join(dir.c_str(), filename.c_str());
 }
 
 bool WriteTask::Expectations::check(const Task& task, SkBitmap bitmap) const {
     if (!FLAGS_writePath.isEmpty() && 0 == strcmp(FLAGS_writePath[0], fRoot)) {
         SkDebugf("We seem to be reading and writing %s concurrently.  This won't work.\n", fRoot);
         return false;
     }
 
     const SkString path = path_to_expected_image(fRoot, task);
     SkBitmap expected;
     if (!PngAndRaw::Decode(path.c_str(), bitmap.info(), &expected)) {
         return false;
     }
 
     return BitmapsEqual(expected, bitmap);
 }
 
 }  // namespace DM