Move GPU fences into sk_gpu_test

tools/gpu/FenceSync.h

Index: tools/gpu/FenceSync.h
diff --git a/include/private/SkGpuFenceSync.h b/tools/gpu/FenceSync.h
similarity index 48%
rename from include/private/SkGpuFenceSync.h
rename to tools/gpu/FenceSync.h
index 5e5d3a6a4eb1f27f1d48551befbb54697184a842..c3f1182621e08bd07bfdb18ca54f735d3d5899e3 100644
--- a/include/private/SkGpuFenceSync.h
+++ b/tools/gpu/FenceSync.h
@@ -1,30 +1,34 @@
-
 /*
- * Copyright 2015 Google Inc.
+ * 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 SkGpuFenceSync_DEFINED
-#define SkGpuFenceSync_DEFINED
+
+#ifndef FenceSync_DEFINED
+#define FenceSync_DEFINED
 
 #include "SkTypes.h"
 
-typedef void* SkPlatformGpuFence;
-constexpr static SkPlatformGpuFence kInvalidPlatformGpuFence = nullptr;
+namespace sk_gpu_test {
+
+using PlatformFence = intptr_t;
+static constexpr PlatformFence kInvalidPlatformFence = 0;
 
 /*
  * This class provides an interface to interact with fence syncs. A fence sync is an object that the
  * client can insert into the GPU command stream, and then at any future time, wait until all
  * commands that were issued before the fence have completed.
  */
-class SkGpuFenceSync {
+class FenceSync {
 public:
-    virtual SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const = 0;
-    virtual bool waitFence(SkPlatformGpuFence) const = 0;
-    virtual void deleteFence(SkPlatformGpuFence) const = 0;
+    virtual PlatformFence SK_WARN_UNUSED_RESULT insertFence() const = 0;
+    virtual bool waitFence(PlatformFence) const = 0;
+    virtual void deleteFence(PlatformFence) const = 0;
 
-    virtual ~SkGpuFenceSync() {}
+    virtual ~FenceSync() {}
 };
 
+}
+
 #endif