Revert of extract some common code from PictureRenderer

tools/PictureRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef PictureRenderer_DEFINED
 #define PictureRenderer_DEFINED
 
 #include "SkCanvas.h"
 #include "SkCountdown.h"
 #include "SkDrawFilter.h"
+#include "SkJSONCPP.h"
 #include "SkMath.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkRunnable.h"
 #include "SkString.h"
 #include "SkTDArray.h"
 #include "SkThreadPool.h"
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #include "GrContext.h"
 #endif
 
-#include "image_expectations.h"
-
 class SkBitmap;
 class SkCanvas;
 class SkGLContextHelper;
 class SkThread;
 
 namespace sk_tools {
 
 class TiledPictureRenderer;
 
+/**
+ * Class for collecting image results (checksums) as we go.
+ */
+class ImageResultsSummary {
+public:
+    /**
+     * Adds this image to the summary of results.
+     *
+     * @param sourceName name of the source file that generated this result
+     * @param fileName relative path to the image output file on local disk
+     * @param hash hash to store
+     * @param tileNumber if not NULL, ptr to tile number
+     */
+    void add(const char *sourceName, const char *fileName, uint64_t hash,
+             const int *tileNumber=NULL);
+
+    /**
+     * Adds this image to the summary of results.
+     *
+     * @param sourceName name of the source file that generated this result
+     * @param fileName relative path to the image output file on local disk
+     * @param bitmap bitmap to store the hash of
+     * @param tileNumber if not NULL, ptr to tile number
+     */
+    void add(const char *sourceName, const char *fileName, const SkBitmap& bitmap,
+             const int *tileNumber=NULL);
+
+    /**
+     * Writes the summary (as constructed so far) to a file.
+     *
+     * @param filename path to write the summary to
+     */
+    void writeToFile(const char *filename);
+
+private:
+    Json::Value fActualResults;
+};
+
 class PictureRenderer : public SkRefCnt {
 
 public:
     enum SkDeviceTypes {
 #if SK_ANGLE
         kAngle_DeviceType,
 #endif
 #if SK_MESA
         kMesa_DeviceType,
 #endif
@@ skipping 581 matching lines @@
 
     typedef PictureRenderer INHERITED;
 };
 
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 extern PictureRenderer* CreatePictureCloneRenderer();
 
 }
 
 #endif  // PictureRenderer_DEFINED