Remove Sk prefix from some bench classes.

tools/PictureResultsWriter.h

 /*
  * Copyright 2014 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 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.
  */
 class PictureResultsWriter : SkNoncopyable {
 public:
     enum TileFlags {kPurging, kAvg};
 
     PictureResultsWriter() {}
     virtual ~PictureResultsWriter() {}
@@ skipping 58 matching lines @@
    virtual void end() {
         for(int i=0; i<fWriters.count(); ++i) {
             fWriters[i]->end();
         }
    }
 private:
     SkTArray<PictureResultsWriter*> fWriters;
 };
 
 /**
- * Writes to SkBenchLogger to mimic original behavior
+ * Writes to BenchLogger to mimic original behavior
  */
 class PictureResultsLoggerWriter : public PictureResultsWriter {
 private:
     void logProgress(const char str[]) {
         if(fLogger != NULL) {
             fLogger->logProgress(str);
         }
     }
 public:
-    PictureResultsLoggerWriter(SkBenchLogger* log)
+    PictureResultsLoggerWriter(BenchLogger* log)
           : fLogger(log), currentLine() {}
     virtual void bench(const char name[], int32_t x, int32_t y) {
         SkString result;
         result.printf("running bench [%i %i] %s ", x, y, name);
         this->logProgress(result.c_str());
     }
     virtual void tileConfig(SkString configName) {
         currentLine = configName;
     }
     virtual void tileMeta(int x, int y, int tx, int ty) {
@@ skipping 12 matching lines @@
             const TimerData::Result result,
             uint32_t timerTypes,
             int numInnerLoops = 1) {
         SkString results = data->getResult(format, result,
                 currentLine.c_str(), timerTypes, numInnerLoops);
         results.append("\n");
         this->logProgress(results.c_str());
     }
     virtual void end() {}
 private:
-    SkBenchLogger* fLogger;
+    BenchLogger* fLogger;
     SkString currentLine;
 };
 
 /**
  * This PictureResultsWriter collects data in a JSON node
  *
  * The format is something like
  * {
  *      benches: [
  *          {
@@ skipping 71 matching lines @@
     }
 private:
     SkString fFilename;
     Json::Value fRoot;
     Json::Value *fCurrentBench;
     Json::Value *fCurrentTileSet;
     Json::Value *fCurrentTile;
 };
 
 #endif