Remove Sk prefix from some bench classes.

This idea came while commenting on
https://codereview.chromium.org/343583005/

Since SkBenchmark, SkBenchLogger and SkGMBench are not part of the Skia library,
they should not have the Sk prefix.

BUG=None
TEST=make all
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/347823004

4 files changed, 14 insertions, 14 deletions

diff --git a/tools/PictureBenchmark.h b/tools/PictureBenchmark.h
index 3ec3c6691c..142d52685e 100644
--- a/tools/PictureBenchmark.h
+++ b/tools/PictureBenchmark.h
@@ -8,15 +8,13 @@
 #ifndef PictureBenchmark_DEFINED
 #define PictureBenchmark_DEFINED
 
-#include "SkTypes.h"
 #include "PictureRenderer.h"
-#include "TimerData.h"
 #include "PictureResultsWriter.h"
+#include "SkTypes.h"
+#include "TimerData.h"
 
 class BenchTimer;
-class SkBenchLogger;
 class SkPicture;
-class SkString;
 
 namespace sk_tools {
 
diff --git a/tools/PictureResultsWriter.h b/tools/PictureResultsWriter.h
index 272a50c4c3..d4a15765f0 100644
--- a/tools/PictureResultsWriter.h
+++ b/tools/PictureResultsWriter.h
@@ -6,15 +6,17 @@
  *
  * Classes for writing out bench results in various formats.
  */
+
 #ifndef SkPictureResultsWriter_DEFINED
 #define SkPictureResultsWriter_DEFINED
 
+#include "BenchLogger.h"
 #include "ResultsWriter.h"
-#include "SkBenchLogger.h"
 #include "SkJSONCPP.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
+#include "TimerData.h"
 
 /**
  * Base class for writing picture bench results.
@@ -93,7 +95,7 @@ private:
 };
 
 /**
- * Writes to SkBenchLogger to mimic original behavior
+ * Writes to BenchLogger to mimic original behavior
  */
 class PictureResultsLoggerWriter : public PictureResultsWriter {
 private:
@@ -103,7 +105,7 @@ private:
         }
     }
 public:
-    PictureResultsLoggerWriter(SkBenchLogger* log)
+    PictureResultsLoggerWriter(BenchLogger* log)
           : fLogger(log), currentLine() {}
     virtual void bench(const char name[], int32_t x, int32_t y) {
         SkString result;
@@ -136,7 +138,7 @@ public:
     }
     virtual void end() {}
 private:
-    SkBenchLogger* fLogger;
+    BenchLogger* fLogger;
     SkString currentLine;
 };
 
diff --git a/tools/bbh_shootout.cpp b/tools/bbh_shootout.cpp
index f3758cb903..e657917aad 100644
--- a/tools/bbh_shootout.cpp
+++ b/tools/bbh_shootout.cpp
@@ -6,16 +6,16 @@
  */
 
 #include "BenchTimer.h"
+#include "Benchmark.h"
 #include "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderer.h"
-#include "SkBenchmark.h"
+#include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
-#include "SkCommandLineFlags.h"
 
 typedef sk_tools::PictureRenderer::BBoxHierarchyType BBoxType;
 static const int kBBoxTypeCount = sk_tools::PictureRenderer::kLast_BBoxHierarchyType + 1;
diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index c63ffff5b7..d9b767b2aa 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -5,13 +5,14 @@
  * found in the LICENSE file.
  */
 
+#include "BenchLogger.h"
 #include "BenchTimer.h"
-#include "CrashHandler.h"
 #include "CopyTilesRenderer.h"
+#include "CrashHandler.h"
 #include "LazyDecodeBitmap.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderingFlags.h"
-#include "SkBenchLogger.h"
+#include "PictureResultsWriter.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkDiscardableMemoryPool.h"
@@ -22,9 +23,8 @@
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "picture_utils.h"
-#include "PictureResultsWriter.h"
 
-SkBenchLogger gLogger;
+BenchLogger gLogger;
 PictureResultsLoggerWriter gLogWriter(&gLogger);
 PictureResultsMultiWriter gWriter;