Remove Sk prefix from some bench classes.

bench/MemoryBench.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 "SkChunkAlloc.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
-#include "SkChunkAlloc.h"
 #include "SkString.h"
 
-class ChunkAllocBench : public SkBenchmark {
+class ChunkAllocBench : public Benchmark {
     SkString    fName;
     size_t      fMinSize;
 public:
     ChunkAllocBench(size_t minSize)  {
         fMinSize = minSize;
         fName.printf("chunkalloc_" SK_SIZE_T_SPECIFIER, minSize);
     }
 
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
@@ skipping 17 matching lines @@
             while (size < total) {
                 alloc.allocThrow(inc);
                 size += inc;
                 calls += 1;
             }
             alloc.reset();
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new ChunkAllocBench(64); )
 DEF_BENCH( return new ChunkAllocBench(8*1024); )
 
 static int* calloc(size_t num) {
     return (int*)sk_calloc_throw(num*sizeof(int));
 }
 
 static int* malloc_bzero(size_t num) {
     const size_t bytes = num*sizeof(int);
     int* ints = (int*)sk_malloc_throw(bytes);
     sk_bzero(ints, bytes);
     return ints;
 }
 
-class ZerosBench : public SkBenchmark {
+class ZerosBench : public Benchmark {
     size_t   fNum;
     bool     fRead;
     bool     fWrite;
     bool     fUseCalloc;
     SkString fName;
 public:
     ZerosBench(size_t num, bool read, bool write, bool useCalloc)
         : fNum(num)
         , fRead(read)
         , fWrite(write)
@@ skipping 75 matching lines @@
 DEF_BENCH(return new ZerosBench(300, 1, 1, 1))
 
 DEF_BENCH(return new ZerosBench(4, 0, 0, 0))
 DEF_BENCH(return new ZerosBench(4, 0, 0, 1))
 DEF_BENCH(return new ZerosBench(4, 0, 1, 0))
 DEF_BENCH(return new ZerosBench(4, 0, 1, 1))
 DEF_BENCH(return new ZerosBench(4, 1, 0, 0))
 DEF_BENCH(return new ZerosBench(4, 1, 0, 1))
 DEF_BENCH(return new ZerosBench(4, 1, 1, 0))
 DEF_BENCH(return new ZerosBench(4, 1, 1, 1))