Cleanup: Rename SkOSPath functions.

tests/SerializationTest.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 "SkBitmapSource.h"
 #include "SkCanvas.h"
@@ skipping 281 matching lines @@
 }
 
 static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) {
     // Load typeface form file.
     // This test cannot run if there is no resource path.
     SkString resourcePath = GetResourcePath();
     if (resourcePath.isEmpty()) {
         SkDebugf("Could not run fontstream test because resourcePath not specified.");
         return;
     }
-    SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "test.ttc");
+    SkString filename = SkOSPath::Join(resourcePath.c_str(), "test.ttc");
     SkTypeface* typeface = SkTypeface::CreateFromFile(filename.c_str());
     if (!typeface) {
         SkDebugf("Could not run fontstream test because test.ttc not found.");
         return;
     }
 
     // Create a paint with the typeface we loaded.
     SkPaint paint;
     paint.setColor(SK_ColorGRAY);
     paint.setTextSize(SkIntToScalar(30));
@@ skipping 178 matching lines @@
 
         // Deserialize picture
         SkValidatingReadBuffer reader(static_cast<void*>(data.get()), size);
         SkAutoTUnref<SkPicture> readPict(
             SkPicture::CreateFromBuffer(reader));
         REPORTER_ASSERT(reporter, NULL != readPict.get());
     }
 
     TestPictureTypefaceSerialization(reporter);
 }