Remove Sk prefix from some bench classes.

bench/SortBench.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 "SkRandom.h"
+#include "SkString.h"
 #include "SkTSort.h"
-#include "SkString.h"
 
 static const int N = 1000;
 
 static void rand_proc(int array[N]) {
     SkRandom rand;
     for (int i = 0; i < N; ++i) {
         array[i] = rand.nextS();
     }
 }
 
@@ skipping 67 matching lines @@
 
 static const struct {
     const char* fName;
     SortProc    fProc;
 } gSorts[] = {
     { "skqsort", skqsort_sort },
     { "skheap", skheap_sort },
     { "qsort", qsort_sort },
 };
 
-class SortBench : public SkBenchmark {
+class SortBench : public Benchmark {
     SkString           fName;
     const Type         fType;
     const SortProc     fSortProc;
     SkAutoTMalloc<int> fUnsorted;
 
 public:
     SortBench(Type t, SortType s) : fType(t), fSortProc(gSorts[s].fProc) {
         fName.printf("sort_%s_%s", gSorts[s].fName, gRec[t].fName);
     }
 
@@ skipping 19 matching lines @@
             fSortProc(sorted.get());
 #ifdef SK_DEBUG
             for (int j = 1; j < N; ++j) {
                 SkASSERT(sorted[j - 1] <= sorted[j]);
             }
 #endif
         }
     }
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkBenchmark* NewSkQSort(Type t) {
+static Benchmark* NewSkQSort(Type t) {
     return new SortBench(t, kSKQSort);
 }
-static SkBenchmark* NewSkHeap(Type t) {
+static Benchmark* NewSkHeap(Type t) {
     return new SortBench(t, kSKHeap);
 }
-static SkBenchmark* NewQSort(Type t) {
+static Benchmark* NewQSort(Type t) {
     return new SortBench(t, kQSort);
 }
 
 DEF_BENCH( return NewSkQSort(kRand); )
 DEF_BENCH( return NewSkHeap(kRand); )
 DEF_BENCH( return NewQSort(kRand); )
 
 DEF_BENCH( return NewSkQSort(kRandN); )
 DEF_BENCH( return NewSkHeap(kRandN); )
 DEF_BENCH( return NewQSort(kRandN); )
 
 DEF_BENCH( return NewSkQSort(kFore); )
 DEF_BENCH( return NewSkHeap(kFore); )
 DEF_BENCH( return NewQSort(kFore); )
 
 DEF_BENCH( return NewSkQSort(kBack); )
 DEF_BENCH( return NewSkHeap(kBack); )
 DEF_BENCH( return NewQSort(kBack); )
 
 DEF_BENCH( return NewSkQSort(kSame); )
 DEF_BENCH( return NewSkHeap(kSame); )
 DEF_BENCH( return NewQSort(kSame); )