Remove Sk prefix from some bench classes.

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
+#include "CrashHandler.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "Test.h"
 #include "gm.h"
-#include "CrashHandler.h"
 
 #include "DMBenchTask.h"
 #include "DMCpuGMTask.h"
 #include "DMGpuGMTask.h"
 #include "DMGpuSupport.h"
 #include "DMPDFTask.h"
 #include "DMReporter.h"
 #include "DMSKPTask.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
@@ skipping 219 matching lines @@
             if (sk_isdir(path)) {
                 expectations.reset(SkNEW_ARGS(DM::WriteTask::Expectations, (path)));
             } else {
                 expectations.reset(SkNEW_ARGS(DM::JsonExpectations, (path)));
             }
         }
     }
 
     SkTDArray<BenchRegistry::Factory> benches;
     if (FLAGS_benches) {
-        append_matching_factories<SkBenchmark>(BenchRegistry::Head(), &benches);
+        append_matching_factories<Benchmark>(BenchRegistry::Head(), &benches);
     }
 
     SkTDArray<TestRegistry::Factory> tests;
     if (FLAGS_tests) {
         append_matching_factories<Test>(TestRegistry::Head(), &tests);
     }
 
     SkDebugf("(%d GMs, %d benches) x %d configs, %d tests\n",
              gms.count(), benches.count(), configs.count(), tests.count());
     DM::Reporter reporter;
@@ skipping 10 matching lines @@
     reporter.getFailures(&failures);
     report_failures(failures);
     return failures.count() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     return tool_main(argc, argv);
 }
 #endif