Refactoring: get rid of the SkBenchmark void* parameter.

bench/ChecksumBench.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 "SkCanvas.h"
 #include "SkChecksum.h"
 #include "SkMD5.h"
@@ skipping 10 matching lines @@
 
 class ComputeChecksumBench : public SkBenchmark {
     enum {
         U32COUNT  = 256,
         SIZE      = U32COUNT * 4,
     };
     uint32_t    fData[U32COUNT];
     ChecksumType fType;
 
 public:
-    ComputeChecksumBench(void* param, ChecksumType type) : INHERITED(param), fType(type) {
+    ComputeChecksumBench(ChecksumType type) : fType(type) {
         SkRandom rand;
         for (int i = 0; i < U32COUNT; ++i) {
             fData[i] = rand.nextU();
         }
         fIsRendering = false;
     }
 
 protected:
     virtual const char* onGetName() {
         switch (fType) {
@@ skipping 39 matching lines @@
         }
 
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* Fact0(void* p) { return new ComputeChecksumBench(p, kChecksum_ChecksumType); }
-static SkBenchmark* Fact1(void* p) { return new ComputeChecksumBench(p, kMD5_ChecksumType); }
-static SkBenchmark* Fact2(void* p) { return new ComputeChecksumBench(p, kSHA1_ChecksumType); }
-static SkBenchmark* Fact3(void* p) { return new ComputeChecksumBench(p, kMurmur3_ChecksumType); }
-
-
-static BenchRegistry gReg0(Fact0);
-static BenchRegistry gReg1(Fact1);
-static BenchRegistry gReg2(Fact2);
-static BenchRegistry gReg3(Fact3);
+DEF_BENCH( return new ComputeChecksumBench(kChecksum_ChecksumType); )
+DEF_BENCH( return new ComputeChecksumBench(kMD5_ChecksumType); )
+DEF_BENCH( return new ComputeChecksumBench(kSHA1_ChecksumType); )
+DEF_BENCH( return new ComputeChecksumBench(kMurmur3_ChecksumType); )