Remove Sk prefix from some bench classes.

bench/ResultsWriter.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Classes for writing out bench results in various formats.
  */
+
 #ifndef SkResultsWriter_DEFINED
 #define SkResultsWriter_DEFINED
 
-#include "SkBenchLogger.h"
+#include "BenchLogger.h"
 #include "SkJSONCPP.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTypes.h"
 
-
 /**
  * Base class for writing out the bench results.
  *
  * TODO(jcgregorio) Add info if tests fail to converge?
  */
 class ResultsWriter : SkNoncopyable {
 public:
     virtual ~ResultsWriter() {};
 
     // Records one option set for this run. All options must be set before
@@ skipping 13 matching lines @@
     // Call when all results are finished.
     virtual void end() = 0;
 };
 
 /**
  * This ResultsWriter handles writing out the human readable format of the
  * bench results.
  */
 class LoggerResultsWriter : public ResultsWriter {
 public:
-    explicit LoggerResultsWriter(SkBenchLogger& logger, const char* timeFormat)
+    explicit LoggerResultsWriter(BenchLogger& logger, const char* timeFormat)
         : fLogger(logger)
         , fTimeFormat(timeFormat) {
         fLogger.logProgress("skia bench:");
     }
     virtual void option(const char name[], const char value[]) {
         fLogger.logProgress(SkStringPrintf(" %s=%s", name, value));
     }
     virtual void bench(const char name[], int32_t x, int32_t y) {
         fLogger.logProgress(SkStringPrintf(
             "\nrunning bench [%3d %3d] %40s", x, y, name));
     }
     virtual void config(const char name[]) {
         fLogger.logProgress(SkStringPrintf("   %s:", name));
     }
     virtual void timer(const char name[], double ms) {
         fLogger.logProgress(SkStringPrintf("  %s = ", name));
         fLogger.logProgress(SkStringPrintf(fTimeFormat, ms));
     }
     virtual void end() {
         fLogger.logProgress("\n");
     }
 private:
-    SkBenchLogger& fLogger;
+    BenchLogger& fLogger;
     const char* fTimeFormat;
 };
 
 /**
  * This ResultsWriter handles writing out the results in JSON.
  *
  * The output looks like (except compressed to a single line):
  *
  *  {
  *   "options" : {
@@ skipping 102 matching lines @@
  */
 template <typename T> class CallEnd : SkNoncopyable {
 public:
     CallEnd(T& obj) : fObj(obj) {}
     ~CallEnd() { fObj.end(); }
 private:
     T&  fObj;
 };
 
 #endif