Cleanup: Rename SkOSPath functions.

tools/render_pdfs_main.cpp

Index: tools/render_pdfs_main.cpp
diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 5e337009c6c9a3af5c8725303286ffb2cacd1c8a..6e1d609cde7391b8a1a52fe793ee0b499d45ea6f 100644
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -111,7 +111,7 @@ static SkData* encode_to_dct_data(size_t*, const SkBitmap& bitmap) {
  */
 static bool make_output_filepath(SkString* path, const SkString& dir,
                                  const SkString& name) {
-    *path = SkOSPath::SkPathJoin(dir.c_str(), name.c_str());
+    *path = SkOSPath::Join(dir.c_str(), name.c_str());
     return replace_filename_extension(path,
                                       SKP_FILE_EXTENSION,
                                       PDF_FILE_EXTENSION);
@@ -149,7 +149,7 @@ static SkWStream* open_stream(const SkString& outputDir,
  */
 static bool render_pdf(const SkString& inputPath, const SkString& outputDir,
                        sk_tools::PdfRenderer& renderer) {
-    SkString inputFilename = SkOSPath::SkBasename(inputPath.c_str());
+    SkString inputFilename = SkOSPath::Basename(inputPath.c_str());
 
     SkFILEStream inputStream;
     inputStream.setPath(inputPath.c_str());
@@ -197,7 +197,7 @@ static int process_input(const SkString& input, const SkString& outputDir,
         SkOSFile::Iter iter(input.c_str(), SKP_FILE_EXTENSION);
         SkString inputFilename;
         while (iter.next(&inputFilename)) {
-            SkString inputPath = SkOSPath::SkPathJoin(input.c_str(), inputFilename.c_str());
+            SkString inputPath = SkOSPath::Join(input.c_str(), inputFilename.c_str());
             if (!render_pdf(inputPath, outputDir, renderer)) {
                 ++failures;
             }