Move BenchTimer to tools as Timer

tools/timer/TimerData.cpp

Index: tools/timer/TimerData.cpp
diff --git a/bench/TimerData.cpp b/tools/timer/TimerData.cpp
similarity index 96%
rename from bench/TimerData.cpp
rename to tools/timer/TimerData.cpp
index 0cb000280b9315121952e04007b0dc5189866927..21529bc2e068c10350a5999b41afd7480480e3e0 100644
--- a/bench/TimerData.cpp
+++ b/tools/timer/TimerData.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -7,22 +6,19 @@
  */
 #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){
-}
-
-bool TimerData::appendTimes(BenchTimer* timer) {
+    : fMaxNumTimings(maxNumTimings)
+    , fCurrTiming(0)
+    , fWallTimes(maxNumTimings)
+    , fTruncatedWallTimes(maxNumTimings)
+    , fCpuTimes(maxNumTimings)
+    , fTruncatedCpuTimes(maxNumTimings)
+    , fGpuTimes(maxNumTimings) {}
+
+bool TimerData::appendTimes(Timer* timer) {
     SkASSERT(timer != NULL);
     if (fCurrTiming >= fMaxNumTimings) {
         return false;