Refactoring: get rid of the SkBenchmark void* parameter.

bench/FontCacheBench.cpp

 /*
  * Copyright 2013 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 "SkFontHost.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 
 #include "gUniqueGlyphIDs.h"
 #define gUniqueGlyphIDs_Sentinel    0xFFFF
 
 static int count_glyphs(const uint16_t start[]) {
     const uint16_t* curr = start;
     while (*curr != gUniqueGlyphIDs_Sentinel) {
         curr += 1;
     }
     return curr - start;
 }
 
 class FontCacheBench : public SkBenchmark {
 public:
-    FontCacheBench(void* param) : INHERITED(param) {}
+    FontCacheBench()  {}
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return "fontcache";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
@@ skipping 63 matching lines @@
 
 static void dump_array(const uint16_t array[], int count) {
     for (int i = 0; i < count; ++i) {
         SkDebugf(" %d,", array[i]);
     }
     SkDebugf("\n");
 }
 
 class FontCacheEfficiency : public SkBenchmark {
 public:
-    FontCacheEfficiency(void* param) : INHERITED(param) {
+    FontCacheEfficiency()  {
         if (false) dump_array(NULL, 0);
         if (false) rotr(0, 0);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return "fontefficiency";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
@@ skipping 22 matching lines @@
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-DEF_BENCH( return new FontCacheBench(p); )
+DEF_BENCH( return new FontCacheBench(); )
 
 // undefine this to run the efficiency test
-//DEF_BENCH( return new FontCacheEfficiency(p); )
+//DEF_BENCH( return new FontCacheEfficiency(); )