Cleanup: Rename SkOSPath functions.

tests/StreamTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkData.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
@@ skipping 19 matching lines @@
     }
 
     // expect EOF
     size_t bytes = stream->read(tmp, 1);
     REPORTER_ASSERT(reporter, 0 == bytes);
     // isAtEnd might not return true until after the first failing read.
     REPORTER_ASSERT(reporter, stream->isAtEnd());
 }
 
 static void test_filestreams(skiatest::Reporter* reporter, const char* tmpDir) {
-    SkString path = SkOSPath::SkPathJoin(tmpDir, "wstream_test");
+    SkString path = SkOSPath::Join(tmpDir, "wstream_test");
 
     const char s[] = "abcdefghijklmnopqrstuvwxyz";
 
     {
         SkFILEWStream writer(path.c_str());
         if (!writer.isValid()) {
             ERRORF(reporter, "Failed to create tmp file %s\n", path.c_str());
             return;
         }
 
@@ skipping 132 matching lines @@
     memStream.setData(nullData);
     TestDereferencingData(&memStream);
 
 }
 
 DEF_TEST(Stream, reporter) {
     TestWStream(reporter);
     TestPackedUInt(reporter);
     TestNullData();
 }