Eliminate one copy of replace_char() function.

tools/skimage_main.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 "gm_expectations.h"
+#include "picture_utils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
 #include "SkRandom.h"
@@ skipping 437 matching lines @@
                                             "a digest\n", srcPath);
         return;
     }
     if (!lengthLessDigest.equals(digest)) {
         gDecodeFailures.push_back().appendf("Without using getLength, %s did not match digest "
                                             "that uses getLength\n", srcPath);
     }
 }
 #endif // defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
 
-/**
- * Replaces all instances of oldChar with newChar in str.
- *
- * TODO: This function appears here and in picture_utils.[cpp|h] ;
- * we should add the implementation to src/core/SkString.cpp, write tests for it,
- * and remove it from elsewhere.
- */
-static void replace_char(SkString* str, const char oldChar, const char newChar) {
-    if (NULL == str) {
-        return;
-    }
-    for (size_t i = 0; i < str->size(); ++i) {
-        if (oldChar == str->operator[](i)) {
-            str->operator[](i) = newChar;
-        }
-    }
-}
-
 static void decodeFileAndWrite(const char srcPath[], const SkString* writePath) {
     SkBitmap bitmap;
     SkFILEStream stream(srcPath);
     if (!stream.isValid()) {
         gInvalidStreams.push_back().set(srcPath);
         return;
     }
 
     SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
     if (NULL == codec) {
         gMissingCodecs.push_back().set(srcPath);
         return;
     }
 
     SkAutoTDelete<SkImageDecoder> ad(codec);
 
     codec->setSkipWritingZeroes(FLAGS_skip);
     codec->setSampleSize(FLAGS_sampleSize);
     stream.rewind();
 
     // Create a string representing just the filename itself, for use in json expectations.
     SkString basename = SkOSPath::Basename(srcPath);
     // Replace '_' with '-', so that the names can fit gm_json.py's IMAGE_FILENAME_PATTERN
-    replace_char(&basename, '_', '-');
+    sk_tools::replace_char(&basename, '_', '-');
     // Replace '.' with '-', so the output filename can still retain the original file extension,
     // but still end up with only one '.', which denotes the actual extension of the final file.
-    replace_char(&basename, '.', '-');
+    sk_tools::replace_char(&basename, '.', '-');
     const char* filename = basename.c_str();
 
     if (!codec->decode(&stream, &bitmap, gPrefColorType, SkImageDecoder::kDecodePixels_Mode)) {
         if (gJsonExpectations.get()) {
             const SkString name_config = create_json_key(filename);
             skiagm::Expectations jsExpectations = gJsonExpectations->get(name_config.c_str());
             if (jsExpectations.ignoreFailure()) {
                 // This is a known failure.
                 gKnownFailures.push_back().appendf(
                     "failed to decode %s, which is a known failure.", srcPath);
@@ skipping 313 matching lines @@
     print_strings("Known failures", gKnownFailures);
 
     return failed ? -1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif