Move BenchTimer to tools as Timer

tools/timer/TimerData.cpp

-
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "TimerData.h"
 
-#include "BenchTimer.h"
+#include "Timer.h"
 #include <limits>
 
-using namespace std;
+TimerData::TimerData(int maxNumTimings)
+    : fMaxNumTimings(maxNumTimings)
+    , fCurrTiming(0)
+    , fWallTimes(maxNumTimings)
+    , fTruncatedWallTimes(maxNumTimings)
+    , fCpuTimes(maxNumTimings)
+    , fTruncatedCpuTimes(maxNumTimings)
+    , fGpuTimes(maxNumTimings) {}
 
-TimerData::TimerData(int maxNumTimings)
-: fMaxNumTimings(maxNumTimings)
-, fCurrTiming(0)
-, fWallTimes(maxNumTimings)
-, fTruncatedWallTimes(maxNumTimings)
-, fCpuTimes(maxNumTimings)
-, fTruncatedCpuTimes(maxNumTimings)
-, fGpuTimes(maxNumTimings){
-}
-
-bool TimerData::appendTimes(BenchTimer* timer) {
+bool TimerData::appendTimes(Timer* timer) {
     SkASSERT(timer != NULL);
     if (fCurrTiming >= fMaxNumTimings) {
         return false;
     }
 
     fWallTimes[fCurrTiming] = timer->fWall;
     fTruncatedWallTimes[fCurrTiming] = timer->fTruncatedWall;
     fCpuTimes[fCurrTiming] = timer->fCpu;
     fTruncatedCpuTimes[fCurrTiming] = timer->fTruncatedCpu;
     fGpuTimes[fCurrTiming] = timer->fGpu;
@@ skipping 179 matching lines @@
         dataNode["cpu"] = cpuNode;
     }
     if (timerFlags & kTruncatedCpu_Flag) {
         dataNode["trucCpu"] = truncCpu;
     }
     if ((timerFlags & kGpu_Flag) && gpuSum > 0) {
         dataNode["gpu"] = gpuNode;
     }
     return dataNode;
 }