Move BenchTimer to tools as Timer

tools/timer/GpuTimer.h

Index: tools/timer/GpuTimer.h
diff --git a/bench/BenchGpuTimer_gl.h b/tools/timer/GpuTimer.h
similarity index 59%
rename from bench/BenchGpuTimer_gl.h
rename to tools/timer/GpuTimer.h
index e472a4c51447d380b71d7f57d763a293de951cc9..2100312a21fb922321a215ab6665e0ae67992c59 100644
--- a/bench/BenchGpuTimer_gl.h
+++ b/tools/timer/GpuTimer.h
@@ -1,21 +1,20 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef SkBenchGpuTimer_DEFINED
-#define SkBenchGpuTimer_DEFINED
+#ifndef GpuTimer_DEFINED
+#define GpuTimer_DEFINED
 
 class SkGLContextHelper;
 
-class BenchGpuTimer {
+class GpuTimer {
 public:
-    BenchGpuTimer(const SkGLContextHelper* glctx);
-    ~BenchGpuTimer();
-    void startGpu();
-    double endGpu();
+    GpuTimer(const SkGLContextHelper*);
+    ~GpuTimer();
+    void start();
+    double end();
 private:
     unsigned fQuery;
     int fStarted;