Remove Sk prefix from some bench classes.

bench/LightingBench.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 "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkLightingImageFilter.h"
 
 #define FILTER_WIDTH_SMALL  SkIntToScalar(32)
 #define FILTER_HEIGHT_SMALL SkIntToScalar(32)
 #define FILTER_WIDTH_LARGE  SkIntToScalar(256)
 #define FILTER_HEIGHT_LARGE SkIntToScalar(256)
 
-class LightingBaseBench : public SkBenchmark {
+class LightingBaseBench : public Benchmark {
 public:
     LightingBaseBench(bool small) : fIsSmall(small) { }
 
 protected:
     void draw(const int loops, SkCanvas* canvas, SkImageFilter* imageFilter) const {
         SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
                               SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
         SkPaint paint;
         paint.setImageFilter(imageFilter)->unref();
         for (int i = 0; i < loops; i++) {
@@ skipping 56 matching lines @@
         static SkScalar surfaceScale = SkIntToScalar(1);
         return surfaceScale;
     }
 
     static SkColor getWhite() {
         static SkColor white(0xFFFFFFFF);
         return white;
     }
 
     bool fIsSmall;
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class LightingPointLitDiffuseBench : public LightingBaseBench {
 public:
     LightingPointLitDiffuseBench(bool small) : INHERITED(small) {
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fIsSmall ? "lightingpointlitdiffuse_small" : "lightingpointlitdiffuse_large";
@@ skipping 131 matching lines @@
 DEF_BENCH( return new LightingDistantLitDiffuseBench(true); )
 DEF_BENCH( return new LightingDistantLitDiffuseBench(false); )
 DEF_BENCH( return new LightingSpotLitDiffuseBench(true); )
 DEF_BENCH( return new LightingSpotLitDiffuseBench(false); )
 DEF_BENCH( return new LightingPointLitSpecularBench(true); )
 DEF_BENCH( return new LightingPointLitSpecularBench(false); )
 DEF_BENCH( return new LightingDistantLitSpecularBench(true); )
 DEF_BENCH( return new LightingDistantLitSpecularBench(false); )
 DEF_BENCH( return new LightingSpotLitSpecularBench(true); )
 DEF_BENCH( return new LightingSpotLitSpecularBench(false); )