Remove Sk prefix from some bench classes.

bench/CmapBench.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 "SkPaint.h"
 #include "SkTypeface.h"
 
 enum {
     NGLYPHS = 100
 };
 
 static SkTypeface::Encoding paint2Encoding(const SkPaint& paint) {
     SkPaint::TextEncoding enc = paint.getTextEncoding();
@@ skipping 36 matching lines @@
 static void charsToGlyphsNull_proc(int loops, const SkPaint& paint, const void* text,
                                    size_t len, int glyphCount) {
     SkTypeface::Encoding encoding = paint2Encoding(paint);
 
     SkTypeface* face = paint.getTypeface();
     for (int i = 0; i < loops; ++i) {
         face->charsToGlyphs(text, encoding, NULL, glyphCount);
     }
 }
 
-class CMAPBench : public SkBenchmark {
+class CMAPBench : public Benchmark {
     TypefaceProc fProc;
     SkString     fName;
     char         fText[NGLYPHS];
     SkPaint      fPaint;
 
 public:
     CMAPBench(TypefaceProc proc, const char name[]) {
         fProc = proc;
         fName.printf("cmap_%s", name);
 
         for (int i = 0; i < NGLYPHS; ++i) {
             // we're jamming values into utf8, so we must keep it legal utf8
             fText[i] = 'A' + (i & 31);
         }
         fPaint.setTypeface(SkTypeface::RefDefault())->unref();
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         fProc(loops, fPaint, fText, sizeof(fText), NGLYPHS);
     }
 
 private:
 
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new CMAPBench(containsText_proc, "paint_containsText"); )
 DEF_BENCH( return new CMAPBench(textToGlyphs_proc, "paint_textToGlyphs"); )
 DEF_BENCH( return new CMAPBench(charsToGlyphs_proc, "face_charsToGlyphs"); )
 DEF_BENCH( return new CMAPBench(charsToGlyphsNull_proc, "face_charsToGlyphs_null"); )