Revert of Move BenchTimer to tools as Timer

tools/bench_playback.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 #include "../include/record/SkRecording.h"
 
+#include "BenchTimer.h"
 #include "Stats.h"
-#include "Timer.h"
+
+typedef WallTimer Timer;
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 DEFINE_string2(skps, r, "skps", "Directory containing SKPs to playback.");
 DEFINE_int32(samples, 10, "Gather this many samples of each picture playback.");
 DEFINE_bool(skr, false, "Play via SkRecord instead of SkPicture.");
 DEFINE_int32(tile, 1000000000, "Simulated tile size.");
 DEFINE_string(match, "", "The usual filters on file names of SKPs to bench.");
 DEFINE_string(timescale, "ms", "Print times in ms, us, or ns");
 DEFINE_int32(verbose, 0, "0: print min sample; "
@@ skipping 38 matching lines @@
 
     SkAutoTDelete<SkCanvas> canvas(SkCanvas::NewRasterDirectN32(src.width(),
                                                                 src.height(),
                                                                 scratch,
                                                                 src.width() * sizeof(SkPMColor)));
     canvas->clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile), SkIntToScalar(FLAGS_tile)));
 
     // Draw once to warm any caches.  The first sample otherwise can be very noisy.
     draw(*record, *picture, canvas.get());
 
-    WallTimer timer;
-    const double scale = timescale();
+    Timer timer;
     SkAutoTMalloc<double> samples(FLAGS_samples);
     for (int i = 0; i < FLAGS_samples; i++) {
         // We assume timer overhead (typically, ~30ns) is insignificant
         // compared to draw runtime (at least ~100us, usually several ms).
-        timer.start();
+        timer.start(timescale());
         draw(*record, *picture, canvas.get());
         timer.end();
-        samples[i] = timer.fWall * scale;
+        samples[i] = timer.fWall;
     }
 
     Stats stats(samples.get(), FLAGS_samples);
     if (FLAGS_verbose == 0) {
         printf("%g\t%s\n", stats.min, name);
     } else if (FLAGS_verbose == 1) {
         // Get a rough idea of how noisy the measurements were.
         const double noisePercent = 100 * sqrt(stats.var) / stats.mean;
         printf("%g\t%g\t%g\t±%.0f%%\t%s\n", stats.min, stats.mean, stats.max, noisePercent, name);
     } else if (FLAGS_verbose == 2) {
@@ skipping 47 matching lines @@
         bench(scratch.get(), *src, filename.c_str());
     }
     return failed ? 1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif