Remove Sk prefix from some bench classes.

bench/GrMemoryPoolBench.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.
  */
 
 // This tests a Gr class
 #if SK_SUPPORT_GPU
 
+#include "Benchmark.h"
 #include "GrMemoryPool.h"
-#include "SkBenchmark.h"
 #include "SkRandom.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 
 // change this to 0 to compare GrMemoryPool to default new / delete
 #define OVERRIDE_NEW    1
 
 struct A {
     int gStuff[10];
 #if OVERRIDE_NEW
     void* operator new (size_t size) { return gBenchPool.allocate(size); }
     void operator delete (void* mem) { if (mem) { return gBenchPool.release(mem); } }
 #endif
     static GrMemoryPool gBenchPool;
 };
 GrMemoryPool A::gBenchPool(10 * (1 << 10), 10 * (1 << 10));
 
 /**
  * This benchmark creates and deletes objects in stack order
  */
-class GrMemoryPoolBenchStack : public SkBenchmark {
+class GrMemoryPoolBenchStack : public Benchmark {
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_stack";
     }
 
@@ skipping 25 matching lines @@
                 objects[count] = new A;
                 ++count;
             }
         }
         for (int i = 0; i < count; ++i) {
             delete objects[i];
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 struct B {
     int gStuff[10];
 #if OVERRIDE_NEW
     void* operator new (size_t size) { return gBenchPool.allocate(size); }
     void operator delete (void* mem) { if (mem) { return gBenchPool.release(mem); } }
 #endif
     static GrMemoryPool gBenchPool;
 };
 GrMemoryPool B::gBenchPool(10 * (1 << 10), 10 * (1 << 10));
 
 /**
  * This benchmark creates objects and deletes them in random order
  */
-class GrMemoryPoolBenchRandom : public SkBenchmark {
+class GrMemoryPoolBenchRandom : public Benchmark {
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_random";
     }
 
     virtual void onDraw(const int loops, SkCanvas*) {
         SkRandom r;
         enum {
             kMaxObjects = 4 * (1 << 10),
         };
         SkAutoTDelete<B> objects[kMaxObjects];
 
         for (int i = 0; i < loops; i++) {
             uint32_t idx = r.nextRangeU(0, kMaxObjects-1);
             if (NULL == objects[idx].get()) {
                 objects[idx].reset(new B);
             } else {
                 objects[idx].free();
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 struct C {
     int gStuff[10];
 #if OVERRIDE_NEW
     void* operator new (size_t size) { return gBenchPool.allocate(size); }
     void operator delete (void* mem) { if (mem) { return gBenchPool.release(mem); } }
 #endif
     static GrMemoryPool gBenchPool;
 };
 GrMemoryPool C::gBenchPool(10 * (1 << 10), 10 * (1 << 10));
 
 /**
  * This benchmark creates objects and deletes them in queue order
  */
-class GrMemoryPoolBenchQueue : public SkBenchmark {
+class GrMemoryPoolBenchQueue : public Benchmark {
     enum {
         M = 4 * (1 << 10),
     };
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_queue";
     }
 
     virtual void onDraw(const int loops, SkCanvas*) {
         SkRandom r;
         C* objects[M];
         for (int i = 0; i < loops; i++) {
             uint32_t count = r.nextRangeU(0, M-1);
             for (uint32_t i = 0; i < count; i++) {
                 objects[i] = new C;
             }
             for (uint32_t i = 0; i < count; i++) {
                 delete objects[i];
             }
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new GrMemoryPoolBenchStack(); )
 DEF_BENCH( return new GrMemoryPoolBenchRandom(); )
 DEF_BENCH( return new GrMemoryPoolBenchQueue(); )
 
 #endif