Revert of Move GPU fences into sk_gpu_test

tools/gpu/gl/GLTestContext.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GLTestContext_DEFINED
 #define GLTestContext_DEFINED
 
@@ skipping 41 matching lines @@
 
     /** Wait until all GPU work is finished. */
     void finish() override;
 
     /**
      * Creates a new GL context of the same type and makes the returned context current
      * (if not null).
      */
     virtual GLTestContext *createNew() const { return nullptr; }
 
-    template<typename Ret, typename... Args>
-    void getGLProcAddress(Ret(GR_GL_FUNCTION_TYPE** out)(Args...),
-                          const char* name, const char* ext = nullptr) const {
-        using Proc = Ret(GR_GL_FUNCTION_TYPE*)(Args...);
-        if (!SkStrStartsWith(name, "gl")) {
-            SkFAIL("getGLProcAddress: proc name must have 'gl' prefix");
-            *out = nullptr;
-        } else if (ext) {
-            SkString fullname(name);
-            fullname.append(ext);
-            *out = reinterpret_cast<Proc>(this->onPlatformGetProcAddress(fullname.c_str()));
-        } else {
-            *out = reinterpret_cast<Proc>(this->onPlatformGetProcAddress(name));
-        }
-    }
-
 protected:
     GLTestContext();
 
     /*
      * Methods that sublcasses must call from their constructors and destructors.
      */
-    void init(const GrGLInterface *, FenceSync* = nullptr);
+    void init(const GrGLInterface *, SkGpuFenceSync * = NULL);
 
     void teardown() override;
 
     virtual GrGLFuncPtr onPlatformGetProcAddress(const char *) const = 0;
 
 private:
+    class GLFenceSync;  // SkGpuFenceSync implementation that uses the OpenGL functionality.
+
     /** Subclass provides the gl interface object if construction was
      *  successful. */
     SkAutoTUnref<const GrGLInterface> fGL;
 
+    friend class GLFenceSync;  // For onPlatformGetProcAddress.
+
     typedef TestContext INHERITED;
 };
 
 /**
  * Creates platform-dependent GL context object.  The shareContext parameter is in an optional
  * context with which to share display lists. This should be a pointer to an GLTestContext created
  * with SkCreatePlatformGLTestContext.  NULL indicates that no sharing is to take place. Returns a
  * valid gl context object or NULL if such can not be created.
  */
 GLTestContext* CreatePlatformGLTestContext(GrGLStandard forcedGpuAPI,
                                            GLTestContext *shareContext = nullptr);
 
 }  // namespace sk_gpu_test
 #endif