GM: make behavior of make_filename() more late-binding

gm/gm_expectations.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 "gm_expectations.h"
 #include "SkBitmapHasher.h"
 #include "SkImageDecoder.h"
@@ skipping 25 matching lines @@
 
     SkString SkPathJoin(const char *rootPath, const char *relativePath) {
         SkString result(rootPath);
         if (!result.endsWith(SkPATH_SEPARATOR)) {
             result.appendUnichar(SkPATH_SEPARATOR);
         }
         result.append(relativePath);
         return result;
     }
 
-    SkString make_filename(const char path[],
-                           const char renderModeDescriptor[],
-                           const char *name,
-                           const char suffix[]) {
-        SkString filename(name);
-        filename.append(renderModeDescriptor);
-        filename.appendUnichar('.');
-        filename.append(suffix);
-        return SkPathJoin(path, filename.c_str());
-    }
-
     // TODO(epoger): This currently assumes that the result SkHashDigest was
     // generated as an SkHashDigest of an SkBitmap.  We'll need to allow for other
     // hash types to cover non-bitmaps.
     Json::Value ActualResultAsJsonValue(const SkHashDigest& result) {
         Json::Value jsonValue;
         jsonValue[kJsonKey_ActualResults_AnyStatus_BitmapHash] = asJsonValue(result);
         return jsonValue;
     }
 
     Json::Value CreateJsonTree(Json::Value expectedResults,
@@ skipping 168 matching lines @@
         Json::Reader reader;
         if (!reader.parse(bytes, bytes+size, *jsonRoot)) {
             gm_fprintf(stderr, "error parsing JSON file %s\n", jsonPath);
             DEBUGFAIL_SEE_STDERR;
             return false;
         }
         return true;
     }
 
 }