GM: include filename extension (.png) of each output file in JSON summary

gm/gm_expectations.cpp

Index: gm/gm_expectations.cpp
===================================================================
--- gm/gm_expectations.cpp	(revision 9067)
+++ gm/gm_expectations.cpp	(working copy)
@@ -141,8 +141,7 @@
     // IndividualImageExpectationsSource class...
 
     Expectations IndividualImageExpectationsSource::get(const char *testName) {
-        SkString path = make_filename(fRootDir.c_str(), "", testName,
-                                      "png");
+        SkString path = make_filename(fRootDir.c_str(), "", testName, kPNG_FileExtension);
         SkBitmap referenceBitmap;
         bool decodedReferenceBitmap =
             SkImageDecoder::DecodeFile(path.c_str(), &referenceBitmap,
@@ -165,7 +164,10 @@
     }
 
     Expectations JsonExpectationsSource::get(const char *testName) {
-        return Expectations(fJsonExpectedResults[testName]);
+        SkString testNameWithExtension(testName);
+        testNameWithExtension.append(".");
+        testNameWithExtension.append(kPNG_FileExtension);

[epoger, 2013/05/08 19:57:16]

In patchset 3, we replace all appearances of ".png" and "png" with references to
a new kPNG_FileExtension constant.  It's bad that we make the png-only
assumption throughout, but at least there is now a term we can search for in the
code to fix these assumptions later.

+        return Expectations(fJsonExpectedResults[testNameWithExtension.c_str()]);
     }
 
     /*static*/ SkData* JsonExpectationsSource::readIntoSkData(SkStream &stream, size_t maxBytes) {