Cleanup: Rename SkOSPath functions.

tools/skpdiff/skpdiff_util.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX || SK_BUILD_FOR_ANDROID
 #   include <unistd.h>
 #   include <sys/time.h>
@@ skipping 99 matching lines @@
     DIR* dir = opendir(path);
     if (NULL == dir) {
         return false;
     }
 
     // Loop through dir entries until there are none left (i.e. readdir returns NULL)
     struct dirent* entry;
     while ((entry = readdir(dir))) {
         // dirent only gives relative paths, we need to join them to the base path to check if they
         // are directories.
-        SkString joinedPath = SkOSPath::SkPathJoin(path, entry->d_name);
+        SkString joinedPath = SkOSPath::Join(path, entry->d_name);
 
         // We only care about files
         if (!sk_isdir(joinedPath.c_str())) {
             entries->push_back(SkString(entry->d_name));
         }
     }
 
     closedir(dir);
 
     return true;
@@ skipping 66 matching lines @@
 #elif SK_BUILD_FOR_WIN32
     SkString fullPath(MAX_PATH);
     if (_fullpath(fullPath.writable_str(), path.c_str(), MAX_PATH) == NULL) {
         fullPath.reset();
     }
     return fullPath;
 #else
     return SkString();
 #endif
 }