Refactoring: get rid of the SkBenchmark void* parameter.

bench/DeferredCanvasBench.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkDeferredCanvas.h"
 #include "SkDevice.h"
 #include "SkString.h"
 
 class DeferredCanvasBench : public SkBenchmark {
 public:
-    DeferredCanvasBench(void* param, const char name[]) : INHERITED(param) {
+    DeferredCanvasBench(const char name[])  {
         fName.printf("deferred_canvas_%s", name);
     }
 
     enum {
         CANVAS_WIDTH = 200,
         CANVAS_HEIGHT = 200,
     };
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
@@ skipping 38 matching lines @@
     bool fDummy;
 
     typedef SkDeferredCanvas::NotificationClient INHERITED;
 };
 
 // Test that records very simple draw operations.
 // This benchmark aims to capture performance fluctuations in the recording
 // overhead of SkDeferredCanvas
 class DeferredRecordBench : public DeferredCanvasBench {
 public:
-    DeferredRecordBench(void* param)
-        : INHERITED(param, "record") {
+    DeferredRecordBench()
+        : INHERITED("record") {
     }
 
 protected:
 
     virtual void initDeferredCanvas(SkDeferredCanvas* canvas) SK_OVERRIDE {
         canvas->setNotificationClient(&fNotificationClient);
     }
 
     virtual void drawInDeferredCanvas(SkDeferredCanvas* canvas) SK_OVERRIDE {
         SkRect rect;
@@ skipping 13 matching lines @@
     }
 
 private:
     typedef DeferredCanvasBench INHERITED;
     SimpleNotificationClient fNotificationClient;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* Fact0(void* p) { return new DeferredRecordBench(p); }
-
-static BenchRegistry gReg0(Fact0);
+DEF_BENCH( return new DeferredRecordBench(); )