Cleanup: Rename SkOSPath functions.

tests/SerializationTest.cpp

Index: tests/SerializationTest.cpp
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 3a443f3b9c376bc09e02dad7ea92482758bab133..2dc0c62cb5ca4db4f82877af599896f75518ebbd 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -299,7 +299,7 @@ static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) {
         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.");