Remove Sk prefix from some bench classes.

bench/RectanizerBench.cpp

 /*
 * Copyright 2014 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 "SkSize.h"
 #include "SkTDArray.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrRectanizer_pow2.h"
 #include "GrRectanizer_skyline.h"
 
 /**
  * This bench exercises Ganesh' GrRectanizer classes. It exercises the following
  * rectanizers:
  *      Pow2 Rectanizer
  *      Skyline Rectanizer
  * in the following cases:
  *      random rects (e.g., pull-save-layers forward use case)
  *      random power of two rects
  *      small constant sized power of 2 rects (e.g., glyph cache use case)
  */
-class RectanizerBench : public SkBenchmark {
+class RectanizerBench : public Benchmark {
 public:
     static const int kWidth = 1024;
     static const int kHeight = 1024;
 
     enum RectanizerType {
         kPow2_RectanizerType,
         kSkyline_RectanizerType,
     };
 
     enum RectType {
@@ skipping 71 matching lines @@
 
         fRectanizer->reset();
     }
 
 private:
     SkString                    fName;
     RectanizerType              fRectanizerType;
     RectType                    fRectType;
     SkAutoTDelete<GrRectanizer> fRectanizer;
 
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kPow2_RectanizerType,
                                      RectanizerBench::kRand_RectType);)
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kPow2_RectanizerType,
                                      RectanizerBench::kRandPow2_RectType);)
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kPow2_RectanizerType,
                                      RectanizerBench::kSmallPow2_RectType);)
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kSkyline_RectanizerType,
                                      RectanizerBench::kRand_RectType);)
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kSkyline_RectanizerType,
                                      RectanizerBench::kRandPow2_RectType);)
 DEF_BENCH(return new RectanizerBench(RectanizerBench::kSkyline_RectanizerType,
                                      RectanizerBench::kSmallPow2_RectType);)
 
 #endif