Revert of skpbench: add option for gpu timing

tools/gpu/TestContext.h

Index: tools/gpu/TestContext.h
diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h
index d39b7446c6f60a86d9d685c2690f05d39180daec..d01cb02af2ad833e256b61f5e87ba4d348bf4f7d 100644
--- a/tools/gpu/TestContext.h
+++ b/tools/gpu/TestContext.h
@@ -14,9 +14,6 @@
 #include "../private/SkTemplates.h"
 
 namespace sk_gpu_test {
-
-class GpuTimer;
-
 /**
  * An offscreen 3D context. This class is intended for Skia's internal testing needs and not
  * for general use.
@@ -29,9 +26,6 @@
 
     bool fenceSyncSupport() const { return fFenceSync != nullptr; }
     FenceSync* fenceSync() { SkASSERT(fFenceSync); return fFenceSync; }
-
-    bool gpuTimingSupport() const { return fGpuTimer != nullptr; }
-    GpuTimer* gpuTimer() const { SkASSERT(fGpuTimer); return fGpuTimer; }
 
     bool getMaxGpuFrameLag(int *maxFrameLag) const {
         if (!fFenceSync) {
@@ -81,8 +75,7 @@
     virtual void finish() = 0;
 
 protected:
-    FenceSync*   fFenceSync;
-    GpuTimer*    fGpuTimer;
+    FenceSync* fFenceSync;
 
     TestContext();