Revert of Move GPU fences into sk_gpu_test

tools/gpu/TestContext.h

Index: tools/gpu/TestContext.h
diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h
index d01cb02af2ad833e256b61f5e87ba4d348bf4f7d..ffa8cae8f9d76792d8e1a924500f396efb6f0861 100644
--- a/tools/gpu/TestContext.h
+++ b/tools/gpu/TestContext.h
@@ -9,8 +9,8 @@
 #ifndef TestContext_DEFINED
 #define TestContext_DEFINED
 
-#include "FenceSync.h"
 #include "GrTypes.h"
+#include "../private/SkGpuFenceSync.h"
 #include "../private/SkTemplates.h"
 
 namespace sk_gpu_test {
@@ -25,7 +25,6 @@
     virtual bool isValid() const = 0;
 
     bool fenceSyncSupport() const { return fFenceSync != nullptr; }
-    FenceSync* fenceSync() { SkASSERT(fFenceSync); return fFenceSync; }
 
     bool getMaxGpuFrameLag(int *maxFrameLag) const {
         if (!fFenceSync) {
@@ -74,8 +73,13 @@
     /** 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();
 
@@ -90,7 +94,7 @@
         kMaxFrameLag = 3
     };
 
-    PlatformFence fFrameFences[kMaxFrameLag - 1];
+    SkPlatformGpuFence fFrameFences[kMaxFrameLag - 1];
     int fCurrentFenceIdx;
 
     typedef SkNoncopyable INHERITED;