Remove Sk prefix from some bench classes.

bench/HairlinePathBench.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 "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 #if SK_SUPPORT_GPU
+#include "GrDrawTargetCaps.h"
 #include "GrTest.h"
-#include "GrDrawTargetCaps.h"
 #endif
 
 enum Flags {
     kBig_Flag = 1 << 0,
     kAA_Flag = 1 << 1
 };
 
 #define FLAGS00 Flags(0)
 #define FLAGS01 Flags(kBig_Flag)
 #define FLAGS10 Flags(kAA_Flag)
 #define FLAGS11 Flags(kBig_Flag | kAA_Flag)
 
 static const int points[] = {
     10, 10, 15, 5, 20, 20,
     30, 5, 25, 20, 15, 12,
     21, 21, 30, 30, 12, 4,
     32, 28, 20, 18, 12, 10
 };
 
 static const int kMaxPathSize = 10;
 
-class HairlinePathBench : public SkBenchmark {
+class HairlinePathBench : public Benchmark {
 public:
     HairlinePathBench(Flags flags) : fFlags(flags) {
         fPaint.setStyle(SkPaint::kStroke_Style);
         fPaint.setStrokeWidth(SkIntToScalar(0));
     }
 
     virtual void appendName(SkString*) = 0;
     virtual void makePath(SkPath*) = 0;
 
 protected:
@@ skipping 21 matching lines @@
 
         for (int i = 0; i < loops; i++) {
             canvas->drawPath(path, paint);
         }
     }
 
 private:
     SkPaint     fPaint;
     SkString    fName;
     Flags       fFlags;
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class LinePathBench : public HairlinePathBench {
 public:
     LinePathBench(Flags flags) : INHERITED(flags) {}
 
     virtual void appendName(SkString* name) SK_OVERRIDE {
         name->append("line");
     }
     virtual void makePath(SkPath* path) SK_OVERRIDE {
@@ skipping 157 matching lines @@
 // Don't have default path renderer for conics yet on GPU, so must use AA
 // DEF_BENCH( return new ConicPathBench(FLAGS00); )
 // DEF_BENCH( return new ConicPathBench(FLAGS01); )
 DEF_BENCH( return new ConicPathBench(FLAGS10); )
 DEF_BENCH( return new ConicPathBench(FLAGS11); )
 
 DEF_BENCH( return new CubicPathBench(FLAGS00); )
 DEF_BENCH( return new CubicPathBench(FLAGS01); )
 DEF_BENCH( return new CubicPathBench(FLAGS10); )
 DEF_BENCH( return new CubicPathBench(FLAGS11); )