Remove Sk prefix from some bench classes.

bench/Benchmark.h

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef SkBenchmark_DEFINED
-#define SkBenchmark_DEFINED
 
+#ifndef Benchmark_DEFINED
+#define Benchmark_DEFINED
+
+#include "SkPoint.h"
 #include "SkRefCnt.h"
-#include "SkPoint.h"
 #include "SkString.h"
 #include "SkTRegistry.h"
 
 #define DEF_BENCH(code)                                                 \
 namespace {                                                             \
-static SkBenchmark* SK_MACRO_APPEND_LINE(factory)(void*) { code; }      \
+static Benchmark* SK_MACRO_APPEND_LINE(factory)(void*) { code; }      \
 BenchRegistry SK_MACRO_APPEND_LINE(g_R_)(SK_MACRO_APPEND_LINE(factory)); \
 }
 
 /*
  *  With the above macros, you can register benches as follows (at the bottom
  *  of your .cpp)
  *
  *  DEF_BENCH(return new MyBenchmark(...))
  *  DEF_BENCH(return new MyBenchmark(...))
  *  DEF_BENCH(return new MyBenchmark(...))
  */
 
 
 class SkCanvas;
 class SkPaint;
 
 class SkTriState {
 public:
     enum State {
         kDefault,
         kTrue,
         kFalse
     };
     static const char* Name[];
 };
 
-class SkBenchmark : public SkRefCnt {
+class Benchmark : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkBenchmark)
+    SK_DECLARE_INST_COUNT(Benchmark)
 
-    SkBenchmark();
+    Benchmark();
 
     const char* getName();
     SkIPoint getSize();
 
     enum Backend {
         kNonRendering_Backend,
         kRaster_Backend,
         kGPU_Backend,
         kPDF_Backend,
     };
@@ skipping 56 matching lines @@
 private:
     int     fForceAlpha;
     bool    fForceAA;
     bool    fForceFilter;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
 
     typedef SkRefCnt INHERITED;
 };
 
-typedef SkTRegistry<SkBenchmark*(*)(void*)> BenchRegistry;
+typedef SkTRegistry<Benchmark*(*)(void*)> BenchRegistry;
 
 #endif