Eliminate one copy of replace_char() function.

tools/skpdiff/SkDiffContext.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 "SkBitmap.h"
+#include "SkDiffContext.h"
 #include "SkImageDecoder.h"
+#include "SkImageDiffer.h"
 #include "SkOSFile.h"
 #include "SkRunnable.h"
 #include "SkSize.h"
 #include "SkStream.h"
 #include "SkTDict.h"
 #include "SkTaskGroup.h"
-
-// from the tools directory for replace_char(...)
-#include "picture_utils.h"
-
-#include "SkDiffContext.h"
-#include "SkImageDiffer.h"
 #include "skpdiff_util.h"
 
 SkDiffContext::SkDiffContext() {
     fDiffers = NULL;
     fDifferCount = 0;
 }
 
 SkDiffContext::~SkDiffContext() {
     if (fDiffers) {
         SkDELETE_ARRAY(fDiffers);
@@ skipping 52 matching lines @@
         return a;
     }
 }
 
 static SkString get_combined_name(const SkString& a, const SkString& b) {
     // Note (stephana): We must keep this function in sync with
     // getImageDiffRelativeUrl() in static/loader.js (under rebaseline_server).
     SkString result = a;
     result.append("-vs-");
     result.append(b);
-    sk_tools::replace_char(&result, '.', '_');
+    result.replace('.', '_');
     return result;
 }
 
 void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
     // Load the images at the paths
     SkBitmap baselineBitmap;
     SkBitmap testBitmap;
     if (!SkImageDecoder::DecodeFile(baselinePath, &baselineBitmap)) {
         SkDebugf("Failed to load bitmap \"%s\"\n", baselinePath);
         return;
@@ skipping 347 matching lines @@
         for (int i = 0; i < cntColumns; i++) {
             SkString str;
             str.printf(", %f", values[i]);
             stream.writeText(str.c_str());
         }
         stream.writeText("\n");
 
         currentRecord = iter2.next();
     }
 }