Clean up some dead code.

tools/PictureRenderer.h

Index: tools/PictureRenderer.h
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index e935f401700abd590c2f92bb10c12772e1c9f1df..6197fb0644e75502af4f84a6869bf18a9c9d42f4 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -26,8 +26,6 @@
 #include "GrContext.h"
 #endif
 
-#include "image_expectations.h"
-
 struct GrContextOptions;
 class SkBitmap;
 class SkCanvas;
@@ -102,14 +100,6 @@ public:
                       bool useMultiPictureDraw);
 
     /**
-     * TODO(epoger): Temporary hack, while we work on http://skbug.com/2584 ('bench_pictures is
-     * timing reading pixels and writing json files'), such that:
-     * - render_pictures can call this method and continue to work
-     * - any other callers (bench_pictures) will skip calls to write() by default
-     */
-    void enableWrites() { fEnableWrites = true; }
-
-    /**
      *  Set the viewport so that only the portion listed gets drawn.
      */
     void setViewport(SkISize size) { fViewport = size; }
@@ -251,10 +241,6 @@ public:
 
     BBoxHierarchyType getBBoxHierarchyType() { return fBBoxHierarchyType; }
 
-    void setJsonSummaryPtr(ImageResultsAndExpectations* jsonSummaryPtr) {
-        fJsonSummaryPtr = jsonSummaryPtr;
-    }
-
     bool isUsingBitmapDevice() {
         return kBitmap_DeviceType == fDeviceType;
     }
@@ -444,9 +430,7 @@ public:
 #else
     PictureRenderer()
 #endif
-        : fJsonSummaryPtr(nullptr)
-        , fDeviceType(kBitmap_DeviceType)
-        , fEnableWrites(false)
+        : fDeviceType(kBitmap_DeviceType)
         , fBBoxHierarchyType(kNone_BBoxHierarchyType)
         , fHasDrawFilters(false)
         , fScaleFactor(SK_Scalar1)
@@ -472,9 +456,7 @@ protected:
     SkAutoTUnref<const SkPicture> fPicture;
     bool                   fUseChecksumBasedFilenames;
     bool                   fUseMultiPictureDraw;
-    ImageResultsAndExpectations*   fJsonSummaryPtr;
     SkDeviceTypes          fDeviceType;
-    bool                   fEnableWrites;
     BBoxHierarchyType      fBBoxHierarchyType;
     bool                   fHasDrawFilters;
     DrawFilterFlags        fDrawFilters[SkDrawFilter::kTypeCount];