Update old tools to allow MultiPictureDraw rendering

tools/PictureBenchmark.h

Index: tools/PictureBenchmark.h
diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 2b1ccb5383daf7104e82790468a2e7ceb25bd628..99eca6bcc066dc0851a6fcc78902532fffbee589 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -28,7 +28,7 @@ public:
      * Draw the provided SkPicture fRepeats times while collecting timing data, and log the output
      * via fWriter.
      */
-    void run(SkPicture* pict);
+    void run(SkPicture* pict, bool useMultiPictureDraw);
 
     void setRepeats(int repeats) {
         fRepeats = repeats;
@@ -45,9 +45,6 @@ public:
     void setPurgeDecodedTex(bool purgeDecodedTex) { fPurgeDecodedTex = purgeDecodedTex; }
     bool purgeDecodedText() const { return fPurgeDecodedTex; }
 
-    void setPreprocess(bool preprocess) { fPreprocess = preprocess; }
-    bool preprocess() const { return fPreprocess; }
-
     PictureRenderer* setRenderer(PictureRenderer*);
     PictureRenderer* renderer() { return fRenderer; }
 
@@ -64,7 +61,6 @@ private:
     uint32_t          fTimerTypes; // bitfield of TimerData::TimerFlags values
     bool              fTimeIndividualTiles;
     bool              fPurgeDecodedTex;
-    bool              fPreprocess;
 
     PictureResultsWriter* fWriter;