Remove Sk prefix from some bench classes.

bench/Benchmark.cpp

Index: bench/Benchmark.cpp
diff --git a/bench/SkBenchmark.cpp b/bench/Benchmark.cpp
similarity index 76%
rename from bench/SkBenchmark.cpp
rename to bench/Benchmark.cpp
index 4c5d077b532ff1076a03eb1473667c9e0144c60b..ae614f04f9c4a3ab1141243f091aa78a1ca253ea 100644
--- a/bench/SkBenchmark.cpp
+++ b/bench/Benchmark.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkBenchmark.h"
+#include "Benchmark.h"
 
 #include "SkPaint.h"
 #include "SkParse.h"
@@ -14,7 +14,7 @@ const char* SkTriState::Name[] = { "default", "true", "false" };
 
 template BenchRegistry* BenchRegistry::gHead;
 
-SkBenchmark::SkBenchmark() {
+Benchmark::Benchmark() {
     fForceAlpha = 0xFF;
     fForceAA = true;
     fForceFilter = false;
@@ -22,23 +22,23 @@ SkBenchmark::SkBenchmark() {
     fOrMask = fClearMask = 0;
 }
 
-const char* SkBenchmark::getName() {
+const char* Benchmark::getName() {
     return this->onGetName();
 }
 
-SkIPoint SkBenchmark::getSize() {
+SkIPoint Benchmark::getSize() {
     return this->onGetSize();
 }
 
-void SkBenchmark::preDraw() {
+void Benchmark::preDraw() {
     this->onPreDraw();
 }
 
-void SkBenchmark::draw(const int loops, SkCanvas* canvas) {
+void Benchmark::draw(const int loops, SkCanvas* canvas) {
     this->onDraw(loops, canvas);
 }
 
-void SkBenchmark::setupPaint(SkPaint* paint) {
+void Benchmark::setupPaint(SkPaint* paint) {
     paint->setAlpha(fForceAlpha);
     paint->setAntiAlias(fForceAA);
     paint->setFilterLevel(fForceFilter ? SkPaint::kLow_FilterLevel
@@ -51,6 +51,6 @@ void SkBenchmark::setupPaint(SkPaint* paint) {
     }
 }
 
-SkIPoint SkBenchmark::onGetSize() {
+SkIPoint Benchmark::onGetSize() {
     return SkIPoint::Make(640, 480);
 }