Remove Sk prefix from some bench classes.

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 "Benchmark.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 static_cast<int>(curr - start);
 }
 
-class FontCacheBench : public SkBenchmark {
+class FontCacheBench : public Benchmark {
 public:
     FontCacheBench()  {}
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return "fontcache";
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
         const uint16_t* array = gUniqueGlyphIDs;
         while (*array != gUniqueGlyphIDs_Sentinel) {
             int count = count_glyphs(array);
             for (int i = 0; i < loops; ++i) {
                 paint.measureText(array, count * sizeof(uint16_t));
             }
             array += count + 1;    // skip the sentinel
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static uint32_t rotr(uint32_t value, unsigned bits) {
     return (value >> bits) | (value << (32 - bits));
 }
 
 typedef uint32_t (*HasherProc)(uint32_t);
 
@@ skipping 38 matching lines @@
     return collisions;
 }
 
 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 {
+class FontCacheEfficiency : public Benchmark {
 public:
     FontCacheEfficiency()  {
         if (false) dump_array(NULL, 0);
         if (false) rotr(0, 0);
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return "fontefficiency";
     }
@@ skipping 19 matching lines @@
                         array += count + 1;    // skip the sentinel
                     }
                     SkDebugf("hashBits [%d] limit [%d] collisions [%d / %d = %1.2g%%] using %s\n", hashBits, limit, collisions, glyphs,
                              collisions * 100.0 / glyphs, gRec[i].fName);
                 }
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new FontCacheBench(); )
 
 // undefine this to run the efficiency test
 //DEF_BENCH( return new FontCacheEfficiency(); )