Cleanup: Rename SkOSPath functions.

tests/ImageDecodingTest.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.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 140 matching lines @@
     // This test cannot run if there is no resource path.
     SkString resourcePath = GetResourcePath();
     if (resourcePath.isEmpty()) {
         SkDebugf("Could not run unpremul test because resourcePath not specified.");
         return;
     }
     SkOSFile::Iter iter(resourcePath.c_str());
     SkString basename;
     if (iter.next(&basename)) {
         do {
-            SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), basename.c_str());
+            SkString filename = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
             // SkDebugf("about to decode \"%s\"\n", filename.c_str());
             compare_unpremul(reporter, filename);
         } while (iter.next(&basename));
     } else {
         SkDebugf("Failed to find any files :(\n");
     }
 }
 
 #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
 // Test that the alpha type is what we expect.
@@ skipping 62 matching lines @@
     SkString resourcePath = GetResourcePath();
     if (resourcePath.isEmpty()) {
         SkDebugf("Could not run alphaType test because resourcePath not specified.");
         return;
     }
 
     SkOSFile::Iter iter(resourcePath.c_str());
     SkString basename;
     if (iter.next(&basename)) {
         do {
-            SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), basename.c_str());
+            SkString filename = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
             for (int truth = 0; truth <= 1; ++truth) {
                 test_alphaType(reporter, filename, SkToBool(truth));
             }
         } while (iter.next(&basename));
     } else {
         SkDebugf("Failed to find any files :(\n");
     }
 
 }
 
 // Using known images, test that decoding into unpremul and premul behave as expected.
 DEF_TEST(ImageDecoding_unpremul, reporter) {
     SkString resourcePath = GetResourcePath();
     if (resourcePath.isEmpty()) {
         SkDebugf("Could not run unpremul test because resourcePath not specified.");
         return;
     }
     const char* root = "half-transparent-white-pixel";
     const char* suffixes[] = { ".png", ".webp" };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(suffixes); ++i) {
         SkString basename = SkStringPrintf("%s%s", root, suffixes[i]);
-        SkString fullName = SkOSPath::SkPathJoin(resourcePath.c_str(), basename.c_str());
+        SkString fullName = SkOSPath::Join(resourcePath.c_str(), basename.c_str());
 
         SkBitmap bm;
         SkFILEStream stream(fullName.c_str());
 
         if (!stream.isValid()) {
             SkDebugf("file %s missing from resource directoy %s\n",
                      basename.c_str(), resourcePath.c_str());
             continue;
         }
 
@@ skipping 407 matching lines @@
         kAlpha_8_SkColorType,
         kRGB_565_SkColorType,
         kARGB_4444_SkColorType,  // Most decoders will fail on 4444.
         kN32_SkColorType
         // Note that indexed color is left out of the list.  Lazy
         // decoding doesn't do indexed color.
     };
     const bool useDataList[] = {true, false};
 
     for (size_t fidx = 0; fidx < SK_ARRAY_COUNT(files); ++fidx) {
-        SkString path = SkOSPath::SkPathJoin(resourceDir.c_str(), files[fidx]);
+        SkString path = SkOSPath::Join(resourceDir.c_str(), files[fidx]);
         if (!sk_exists(path.c_str())) {
             continue;
         }
 
         SkAutoDataUnref encodedData(SkData::NewFromFileName(path.c_str()));
         REPORTER_ASSERT(reporter, encodedData.get() != NULL);
         SkAutoTUnref<SkStreamRewindable> encodedStream(
             SkStream::NewFromFile(path.c_str()));
         REPORTER_ASSERT(reporter, encodedStream.get() != NULL);
 
@@ skipping 13 matching lines @@
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }
 
 DEF_TEST(DiscardablePixelRef_SecondLockColorTableCheck, r) {
     SkString resourceDir = GetResourcePath();
-    SkString path = SkOSPath::SkPathJoin(resourceDir.c_str(), "randPixels.gif");
+    SkString path = SkOSPath::Join(resourceDir.c_str(), "randPixels.gif");
     if (!sk_exists(path.c_str())) {
         return;
     }
     SkAutoDataUnref encoded(SkData::NewFromFileName(path.c_str()));
     SkBitmap bitmap;
     if (!SkInstallDiscardablePixelRef(
             SkDecodingImageGenerator::Create(
                     encoded, SkDecodingImageGenerator::Options()), &bitmap)) {
         #ifndef SK_BUILD_FOR_WIN
         ERRORF(r, "SkInstallDiscardablePixelRef [randPixels.gif] failed.");
         #endif
         return;
     }
     if (kIndex_8_SkColorType != bitmap.colorType()) {
         return;
     }
     {
         SkAutoLockPixels alp(bitmap);
         REPORTER_ASSERT(r, bitmap.getColorTable() && "first pass");
     }
     {
         SkAutoLockPixels alp(bitmap);
         REPORTER_ASSERT(r, bitmap.getColorTable() && "second pass");
     }
 }