Cleanup: Rename SkOSPath functions.

include/core/SkOSFile.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 // TODO: add unittests for all these operations
@@ skipping 115 matching lines @@
 class SkOSPath {
 public:
     /**
      * Assembles rootPath and relativePath into a single path, like this:
      * rootPath/relativePath.
      * It is okay to call with a NULL rootPath and/or relativePath. A path
      * separator will still be inserted.
      *
      * Uses SkPATH_SEPARATOR, to work on all platforms.
      */
-    static SkString SkPathJoin(const char *rootPath, const char *relativePath);
+    static SkString Join(const char* rootPath, const char* relativePath);
 
     /**
      *  Return the name of the file, ignoring the directory structure.
      *  Behaves like python's os.path.basename. If the fullPath is
      *  /dir/subdir/, an empty string is returned.
      *  @param fullPath Full path to the file.
      *  @return SkString The basename of the file - anything beyond the
      *      final slash, or the full name if there is no slash.
      */
-    static SkString SkBasename(const char* fullPath);
+    static SkString Basename(const char* fullPath);
 };
+
 #endif