Cleanup: Rename SkOSPath functions.

src/ports/SkFontHost_linux.cpp

 /*
  * 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.
  */
 
 #include "SkFontHost.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontDescriptor.h"
@@ skipping 305 matching lines @@
             return false;
         }
     }
 
     void load_directory_fonts(const SkString& directory) {
         SkOSFile::Iter iter(directory.c_str(), ".ttf");
         SkString name;
 
         while (iter.next(&name, false)) {
             SkString filename(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
+                SkOSPath::Join(directory.c_str(), name.c_str()));
 
             bool isFixedPitch;
             SkString realname;
             SkTypeface::Style style = SkTypeface::kNormal; // avoid uninitialized warning
 
             if (!get_name_and_style(filename.c_str(), &realname, &style, &isFixedPitch)) {
                 SkDebugf("------ can't load <%s> as a font\n", filename.c_str());
                 continue;
             }
 
@@ skipping 10 matching lines @@
                 fFamilies.push_back().reset(addTo);
             }
             addTo->appendTypeface(tf);
         }
 
         SkOSFile::Iter dirIter(directory.c_str());
         while (dirIter.next(&name, true)) {
             if (name.startsWith(".")) {
                 continue;
             }
-            SkString dirname(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
+            SkString dirname(SkOSPath::Join(directory.c_str(), name.c_str()));
             load_directory_fonts(dirname);
         }
     }
 
     void load_system_fonts(const char* dir) {
         SkString baseDirectory(dir);
         load_directory_fonts(baseDirectory);
 
         if (fFamilies.empty()) {
             SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
@@ skipping 29 matching lines @@
     }
 
     SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> fFamilies;
     SkFontStyleSet_Custom* gDefaultFamily;
     SkTypeface* gDefaultNormal;
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     return new SkFontMgr_Custom(SK_FONT_FILE_PREFIX);
 }