Refactoring: get rid of the SkBenchmark void* parameter.

bench/RegionContainBench.cpp

Index: bench/RegionContainBench.cpp
diff --git a/bench/RegionContainBench.cpp b/bench/RegionContainBench.cpp
index c4cbc9497dd5b9e487767c363af54880f0a48867..a7998951bf1591b94c5a4983dc1b233d8734b95f 100644
--- a/bench/RegionContainBench.cpp
+++ b/bench/RegionContainBench.cpp
@@ -33,7 +33,7 @@ public:
         return SkIRect::MakeXYWH(0, i*H/COUNT, w, H/COUNT);
     }
 
-    RegionContainBench(void* param, Proc proc, const char name[]) : INHERITED(param) {
+    RegionContainBench(Proc proc, const char name[])  {
         fProc = proc;
         fName.printf("region_contains_%s", name);
 
@@ -62,6 +62,4 @@ private:
     typedef SkBenchmark INHERITED;
 };
 
-static SkBenchmark* gF0(void* p) { return SkNEW_ARGS(RegionContainBench, (p, sect_proc, "sect")); }
-
-static BenchRegistry gR0(gF0);
+DEF_BENCH( return SkNEW_ARGS(RegionContainBench, (sect_proc, "sect")); )