Remove Sk prefix from some bench classes.

bench/SortBench.cpp

Index: bench/SortBench.cpp
diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp
index 1f888f2462e18f9d040954bb66d8f9e4b0e850de..a7e8c2cd0bca4143a7db214319f309329625cd1b 100644
--- a/bench/SortBench.cpp
+++ b/bench/SortBench.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
 #include "SkRandom.h"
-#include "SkTSort.h"
 #include "SkString.h"
+#include "SkTSort.h"
 
 static const int N = 1000;
 
@@ -96,7 +96,7 @@ static const struct {
     { "qsort", qsort_sort },
 };
 
-class SortBench : public SkBenchmark {
+class SortBench : public Benchmark {
     SkString           fName;
     const Type         fType;
     const SortProc     fSortProc;
@@ -136,18 +136,18 @@ protected:
     }
 
 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);
 }