Remove Sk prefix from some bench classes.

bench/HairlinePathBench.cpp

Index: bench/HairlinePathBench.cpp
diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp
index 11faff57f84f6bae89624e1bd23febe9f68e6de8..e7e2b428e8f28271dd170994e49e45cdb2e6657a 100644
--- a/bench/HairlinePathBench.cpp
+++ b/bench/HairlinePathBench.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
@@ -13,8 +13,8 @@
 #include "SkString.h"
 
 #if SK_SUPPORT_GPU
-#include "GrTest.h"
 #include "GrDrawTargetCaps.h"
+#include "GrTest.h"
 #endif
 
 enum Flags {
@@ -36,7 +36,7 @@ static const int points[] = {
 
 static const int kMaxPathSize = 10;
 
-class HairlinePathBench : public SkBenchmark {
+class HairlinePathBench : public Benchmark {
 public:
     HairlinePathBench(Flags flags) : fFlags(flags) {
         fPaint.setStyle(SkPaint::kStroke_Style);
@@ -78,7 +78,7 @@ private:
     SkPaint     fPaint;
     SkString    fName;
     Flags       fFlags;
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class LinePathBench : public HairlinePathBench {