Revert of skpbench: add option for gpu timing

tools/gpu/TestContext.cpp

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "TestContext.h"
 
-#include "GpuTimer.h"
-
 namespace sk_gpu_test {
-TestContext::TestContext()
-    : fFenceSync(nullptr)
-    , fGpuTimer(nullptr)
-    , fCurrentFenceIdx(0) {
+TestContext::TestContext() : fFenceSync(nullptr), fCurrentFenceIdx(0) {
     memset(fFrameFences, 0, sizeof(fFrameFences));
 }
 
 TestContext::~TestContext() {
     // Subclass should call teardown.
 #ifdef SK_DEBUG
     for (size_t i = 0; i < SK_ARRAY_COUNT(fFrameFences); i++) {
         SkASSERT(0 == fFrameFences[i]);
     }
 #endif
     SkASSERT(!fFenceSync);
-    SkASSERT(!fGpuTimer);
 }
 
 void TestContext::makeCurrent() const { this->onPlatformMakeCurrent(); }
 
 void TestContext::swapBuffers() { this->onPlatformSwapBuffers(); }
 
 void TestContext::waitOnSyncOrSwap() {
     if (!fFenceSync) {
         // Fallback on the platform SwapBuffers method for synchronization. This may have no effect.
         this->swapBuffers();
@@ skipping 22 matching lines @@
     if (fFenceSync) {
         for (size_t i = 0; i < SK_ARRAY_COUNT(fFrameFences); i++) {
             if (fFrameFences[i]) {
                 fFenceSync->deleteFence(fFrameFences[i]);
                 fFrameFences[i] = 0;
             }
         }
         delete fFenceSync;
         fFenceSync = nullptr;
     }
-    delete fGpuTimer;
 }
 
 }