Revert of Move GPU fences into sk_gpu_test

tools/gpu/TestContext.h

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef TestContext_DEFINED
 #define TestContext_DEFINED
 
-#include "FenceSync.h"
 #include "GrTypes.h"
+#include "../private/SkGpuFenceSync.h"
 #include "../private/SkTemplates.h"
 
 namespace sk_gpu_test {
 /**
  * An offscreen 3D context. This class is intended for Skia's internal testing needs and not
  * for general use.
  */
 class TestContext : public SkNoncopyable {
 public:
     virtual ~TestContext();
 
     virtual bool isValid() const = 0;
 
     bool fenceSyncSupport() const { return fFenceSync != nullptr; }
-    FenceSync* fenceSync() { SkASSERT(fFenceSync); return fFenceSync; }
 
     bool getMaxGpuFrameLag(int *maxFrameLag) const {
         if (!fFenceSync) {
             return false;
         }
         *maxFrameLag = kMaxFrameLag;
         return true;
     }
 
     void makeCurrent() const;
@@ skipping 28 matching lines @@
      * context to test that further API calls are not made by Skia GPU code.
      */
     virtual void testAbandon();
 
     /** Ensures all work is submitted to the GPU for execution. */
     virtual void submit() = 0;
 
     /** Wait until all GPU work is finished. */
     virtual void finish() = 0;
 
+    /**
+     * returns the fencesync object owned by this GLTestContext
+     */
+    SkGpuFenceSync *fenceSync() { return fFenceSync; }
+
 protected:
-    FenceSync* fFenceSync;
+    SkGpuFenceSync* fFenceSync;
 
     TestContext();
 
     /** This should destroy the 3D context. */
     virtual void teardown();
 
     virtual void onPlatformMakeCurrent() const = 0;
     virtual void onPlatformSwapBuffers() const = 0;
 
 private:
     enum {
         kMaxFrameLag = 3
     };
 
-    PlatformFence fFrameFences[kMaxFrameLag - 1];
+    SkPlatformGpuFence fFrameFences[kMaxFrameLag - 1];
     int fCurrentFenceIdx;
 
     typedef SkNoncopyable INHERITED;
 };
 }  // namespace sk_gpu_test
 #endif