Reland https://codereview.chromium.org/286903025

tools/PictureBenchmark.h

Index: tools/PictureBenchmark.h
diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index e149f8c9e9f446843ee1d66eec5ae736a1512919..3ec3c6691c6c02fd3ba31d87b0cf94c73f3a5a16 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -11,6 +11,7 @@
 #include "SkTypes.h"
 #include "PictureRenderer.h"
 #include "TimerData.h"
+#include "PictureResultsWriter.h"
 
 class BenchTimer;
 class SkBenchLogger;
@@ -27,7 +28,7 @@ public:
 
     /**
      * Draw the provided SkPicture fRepeats times while collecting timing data, and log the output
-     * via fLogger.
+     * via fWriter.
      */
     void run(SkPicture* pict);
 
@@ -55,11 +56,10 @@ public:
 
     void setTimersToShow(bool wall, bool truncatedWall, bool cpu, bool truncatedCpu, bool gpu);
 
-    void setLogger(SkBenchLogger* logger) { fLogger = logger; }
+    void setWriter(PictureResultsWriter* writer) { fWriter = writer; }
 
 private:
     int               fRepeats;
-    SkBenchLogger*    fLogger;
     PictureRenderer*  fRenderer;
     TimerData::Result fTimerResult;
     uint32_t          fTimerTypes; // bitfield of TimerData::TimerFlags values
@@ -67,7 +67,7 @@ private:
     bool              fPurgeDecodedTex;
     bool              fPreprocess;
 
-    void logProgress(const char msg[]);
+    PictureResultsWriter* fWriter;
 
     BenchTimer* setupTimer(bool useGLTimer = true);
 };