Remove Sk prefix from some bench classes.

bench/GameBench.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 "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 // This bench simulates the calls Skia sees from various HTML5 canvas
 // game bench marks
-class GameBench : public SkBenchmark {
+class GameBench : public Benchmark {
 public:
     enum Type {
         kScale_Type,
         kTranslate_Type,
         kRotate_Type
     };
 
     enum Clear {
         kFull_Clear,
         kPartial_Clear
@@ skipping 269 matching lines @@
                 if (inColorX && inColorY) {
                     SkASSERT(colorX < kNumAtlasedX && colorY < kNumAtlasedY);
                     *scanline = colors[colorX][colorY];
                 } else {
                     *scanline = 0x00000000;
                 }
             }
         }
     }
 
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // Partial clear
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kScale_Type,
                                             GameBench::kPartial_Clear)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kPartial_Clear)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kPartial_Clear, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type,
                                             GameBench::kPartial_Clear)); )
 
 // Full clear
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kScale_Type,
                                             GameBench::kFull_Clear)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kRotate_Type,
                                             GameBench::kFull_Clear)); )
 
 // Atlased
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true)); )
 DEF_BENCH( return SkNEW_ARGS(GameBench, (GameBench::kTranslate_Type,
                                             GameBench::kFull_Clear, false, true, true)); )