Cleanup: Rename SkOSPath functions.

tools/lua/lua_pictures.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "LazyDecodeBitmap.h"
 #include "SkLua.h"
 #include "SkLuaCanvas.h"
@@ skipping 114 matching lines @@
     }
 
     for (int i = 0; i < FLAGS_skpPath.count(); i ++) {
         SkTArray<SkString> paths;
         if (sk_isdir(FLAGS_skpPath[i])) {
             // Add all .skp in this directory.
             const SkString directory(FLAGS_skpPath[i]);
             SkString filename;
             SkOSFile::Iter iter(FLAGS_skpPath[i], "skp");
             while(iter.next(&filename)) {
-                paths.push_back() = SkOSPath::SkPathJoin(directory.c_str(), filename.c_str());
+                paths.push_back() = SkOSPath::Join(directory.c_str(), filename.c_str());
             }
         } else {
             // Add this as an .skp itself.
             paths.push_back() = FLAGS_skpPath[i];
         }
 
         for (int i = 0; i < paths.count(); i++) {
             if (moduloRemainder >= 0) {
                 if ((i % moduloDivisor) != moduloRemainder) {
                     continue;
@@ skipping 21 matching lines @@
         }
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif