Remove Sk prefix from some bench classes.

dm/DMBenchTask.h

Index: dm/DMBenchTask.h
diff --git a/dm/DMBenchTask.h b/dm/DMBenchTask.h
index ac7030b5f01feace3adcf0eb191aa958d420ac7d..3c71cd76f0f813017e4e0336b67948a51b04e243 100644
--- a/dm/DMBenchTask.h
+++ b/dm/DMBenchTask.h
@@ -1,14 +1,14 @@
 #ifndef DMBenchTask_DEFINED
 #define DMBenchTask_DEFINED
 
+#include "Benchmark.h"
 #include "DMReporter.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
-#include "SkBenchmark.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 
-// Tasks that run an SkBenchmark once as a check that it doesn't crash.
+// Tasks that run an Benchmark once as a check that it doesn't crash.
 
 namespace DM {
 
@@ -21,7 +21,7 @@ public:
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
 };
 
@@ -34,7 +34,7 @@ public:
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
     const SkColorType fColorType;
 };
@@ -53,7 +53,7 @@ public:
     virtual SkString name() const SK_OVERRIDE { return fName; }
 
 private:
-    SkAutoTDelete<SkBenchmark> fBench;
+    SkAutoTDelete<Benchmark> fBench;
     const SkString fName;
     const GrContextFactory::GLContextType fContextType;
     int fSampleCount;