Revert of Add MultiPictureDraw to nanobench

bench/Benchmark.h

Index: bench/Benchmark.h
diff --git a/bench/Benchmark.h b/bench/Benchmark.h
index c30167e572848b02f0b9b276b4f40f72ac94a0c6..508d1da69409c2676b6b6451cfd378a5c3463438 100644
--- a/bench/Benchmark.h
+++ b/bench/Benchmark.h
@@ -70,11 +70,6 @@
     // before the initial draw.
     void preDraw();
 
-    // Called once before and after a series of draw calls to a single canvas.
-    // The setup/break down in these calls is not timed.
-    void perCanvasPreDraw(SkCanvas*);
-    void perCanvasPostDraw(SkCanvas*);
-
     // Bench framework can tune loops to be large enough for stable timing.
     void draw(const int loops, SkCanvas*);
 
@@ -106,8 +101,6 @@
     virtual const char* onGetName() = 0;
     virtual const char* onGetUniqueName() { return this->onGetName(); }
     virtual void onPreDraw() {}
-    virtual void onPerCanvasPreDraw(SkCanvas*) {}
-    virtual void onPerCanvasPostDraw(SkCanvas*) {}
     // Each bench should do its main work in a loop like this:
     //   for (int i = 0; i < loops; i++) { <work here> }
     virtual void onDraw(const int loops, SkCanvas*) = 0;