Remove Sk prefix from some bench classes.

bench/SkipZeroesBench.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 "Benchmark.h"
 #include "Resources.h"
-#include "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkForceLinking.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 class SkCanvas;
 
-class SkipZeroesBench : public SkBenchmark {
+class SkipZeroesBench : public Benchmark {
 public:
     SkipZeroesBench(const char* filename, bool skipZeroes)
     : fName("SkipZeroes_")
     , fDecoder(NULL)
     , fFilename(filename)
     , fStream()
     , fSkipZeroes(skipZeroes)
     , fValid(false) {
         fName.append(filename);
         if (skipZeroes) {
@@ skipping 70 matching lines @@
     }
 
 private:
     SkString                        fName;
     SkAutoTDelete<SkImageDecoder>   fDecoder;
     const SkString                  fFilename;
     SkMemoryStream                  fStream;
     bool                            fSkipZeroes;
     bool                            fValid;
 
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 // Enable the true version once the feature is checked in.
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", true)));
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", false)));