Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)

Reason for revert:
GpuTimer broken

Original issue's description:
> Move BenchTimer to tools as Timer
>
> This breaks a bunch of circular dependencies between tools and gm and bench.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/346753003

1 files changed, 0 insertions, 53 deletions

diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp
deleted file mode 100644
index 4f3fc85cff..0000000000
--- a/tools/timer/Timer.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "Timer.h"
-
-Timer::Timer(SkGLContextHelper* gl)
-        : fCpu(-1.0)
-        , fWall(-1.0)
-        , fTruncatedCpu(-1.0)
-        , fTruncatedWall(-1.0)
-        , fGpu(-1.0)
-#if SK_SUPPORT_GPU
-        , fGpuTimer(gl)
-#endif
-        {}
-
-void Timer::start() {
-    fSysTimer.startWall();
-    fTruncatedSysTimer.startWall();
-#if SK_SUPPORT_GPU
-    fGpuTimer.start();
-#endif
-    fSysTimer.startCpu();
-    fTruncatedSysTimer.startCpu();
-}
-
-void Timer::end() {
-    fCpu = fSysTimer.endCpu();
-#if SK_SUPPORT_GPU
-    //It is important to stop the cpu clocks first,
-    //as the following will cpu wait for the gpu to finish.
-    fGpu = fGpuTimer.end();
-#endif
-    fWall = fSysTimer.endWall();
-}
-
-void Timer::truncatedEnd() {
-    fTruncatedCpu = fTruncatedSysTimer.endCpu();
-    fTruncatedWall = fTruncatedSysTimer.endWall();
-}
-
-WallTimer::WallTimer() : fWall(-1.0) {}
-
-void WallTimer::start() {
-    fSysTimer.startWall();
-}
-
-void WallTimer::end() {
-    fWall = fSysTimer.endWall();
-}