Remove Sk prefix from some bench classes.

bench/ETCBitmapBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "Benchmark.h"
 #include "Resources.h"
-#include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkPixelRef.h"
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 
 #include "etc1.h"
@@ skipping 50 matching lines @@
             copyInto += origRowSzInBytes;
         }
     }
     return newData;
 }
 
 // This is the base class for all of the benches in this file. In general
 // the ETC1 benches should all be working on the same data. Due to the
 // simplicity of the PKM file, that data is the 128x128 mandrill etc1
 // compressed texture repeated by some factor (currently 8 -> 1024x1024)
-class ETCBitmapBenchBase : public SkBenchmark {
+class ETCBitmapBenchBase : public Benchmark {
 public:
     ETCBitmapBenchBase() : fPKMData(loadPKM()) {
         if (NULL == fPKMData) {
             SkDebugf("Could not load PKM data!");
         }
     }
 
 protected:
     SkAutoDataUnref fPKMData;
 
@@ skipping 17 matching lines @@
             SkDebugf("Error expanding ETC1 data by factor of %d\n", kExpansionFactor);
             return NULL;
         }
 
         etc1_uint32 width = etc1_pkm_get_width(expandedETC1);
         etc1_uint32 height = etc1_pkm_get_width(expandedETC1);
         etc1_uint32 dataSz = ETC_PKM_HEADER_SIZE + etc1_get_encoded_data_size(width, height);
         return SkData::NewFromMalloc(expandedETC1, dataSz);
     }
 
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // This is the rendering benchmark. Prior to rendering the data, create a
 // bitmap using the etc1 data.
 class ETCBitmapBench : public ETCBitmapBenchBase {
 public:
     ETCBitmapBench(bool decompress, Backend backend)
         : fDecompress(decompress), fBackend(backend) { }
 
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
@@ skipping 84 matching lines @@
         for (int i = 0; i < loops; ++i) {
             this->fBitmap.pixelRef()->notifyPixelsChanged();
             canvas->drawBitmap(this->fBitmap, 0, 0, NULL);
         }
     }
 
 private:
     typedef ETCBitmapBench INHERITED;
 };
 
-DEF_BENCH(return new ETCBitmapBench(false, SkBenchmark::kRaster_Backend);)
-DEF_BENCH(return new ETCBitmapBench(true, SkBenchmark::kRaster_Backend);)
+DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);)
+DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);)
 
-DEF_BENCH(return new ETCBitmapBench(false, SkBenchmark::kGPU_Backend);)
-DEF_BENCH(return new ETCBitmapBench(true, SkBenchmark::kGPU_Backend);)
+DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);)
+DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);)
 
-DEF_BENCH(return new ETCBitmapUploadBench(false, SkBenchmark::kRaster_Backend);)
-DEF_BENCH(return new ETCBitmapUploadBench(true, SkBenchmark::kRaster_Backend);)
+DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);)
+DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);)
 
-DEF_BENCH(return new ETCBitmapUploadBench(false, SkBenchmark::kGPU_Backend);)
-DEF_BENCH(return new ETCBitmapUploadBench(true, SkBenchmark::kGPU_Backend);)
+DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);)
+DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);)
 
 #endif  // SK_IGNORE_ETC1_SUPPORT