Cleanup: Rename SkOSPath functions.

tools/Resources.cpp

 /*
  * Copyright 2014 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 "SkCommandLineFlags.h"
 #include "SkOSFile.h"
 
 DEFINE_string2(resourcePath, i, "resources", "Directory with test resources: images, fonts, etc.");
 
 SkString GetResourcePath(const char* resource) {
-    return SkOSPath::SkPathJoin(FLAGS_resourcePath[0], resource);
+    return SkOSPath::Join(FLAGS_resourcePath[0], resource);
 }
 
 void SetResourcePath(const char* resource) {
     FLAGS_resourcePath.set(0, resource);
 }