Remove Sk prefix from some bench classes.

bench/DeferredCanvasBench.cpp

 /*
  * Copyright 2012 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 "SkDeferredCanvas.h"
 #include "SkDevice.h"
 #include "SkString.h"
 
-class DeferredCanvasBench : public SkBenchmark {
+class DeferredCanvasBench : public Benchmark {
 public:
     DeferredCanvasBench(const char name[])  {
         fName.printf("deferred_canvas_%s", name);
     }
 
     enum {
         CANVAS_WIDTH = 200,
         CANVAS_HEIGHT = 200,
     };
 protected:
@@ skipping 16 matching lines @@
 #endif
     }
 
     virtual void initDeferredCanvas(SkDeferredCanvas* canvas) = 0;
     virtual void drawInDeferredCanvas(const int loops, SkDeferredCanvas* canvas) = 0;
     virtual void finalizeDeferredCanvas(SkDeferredCanvas* canvas) = 0;
 
     SkString fName;
 
 private:
-    typedef SkBenchmark INHERITED;
+    typedef Benchmark INHERITED;
 };
 
 class SimpleNotificationClient : public SkDeferredCanvas::NotificationClient {
 public:
     SimpleNotificationClient() : fDummy(false) {}
 
     //bogus virtual implementations that just do something small
     virtual void prepareForDraw() SK_OVERRIDE {fDummy = true;}
     virtual void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE {fDummy = false;}
     virtual void flushedDrawCommands() SK_OVERRIDE {fDummy = !fDummy;}
@@ skipping 37 matching lines @@
 
 private:
     typedef DeferredCanvasBench INHERITED;
     SimpleNotificationClient fNotificationClient;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DeferredRecordBench(); )