Revert r258965 aka reland r258122

ui/gl/gl_gl_api_implementation.h

Index: ui/gl/gl_gl_api_implementation.h
diff --git a/ui/gl/gl_gl_api_implementation.h b/ui/gl/gl_gl_api_implementation.h
index d1896912779a50957ef79eb0dd0868a18af36b90..aff59265c9fd78223914a004bdf411e522790470 100644
--- a/ui/gl/gl_gl_api_implementation.h
+++ b/ui/gl/gl_gl_api_implementation.h
@@ -41,6 +41,7 @@ class GLApiBase : public GLApi {
   GLApiBase();
   virtual ~GLApiBase();
   void InitializeBase(DriverGL* driver);
+  void SignalFlush();
 
   DriverGL* driver_;
 };
@@ -51,6 +52,10 @@ class RealGLApi : public GLApiBase {
   RealGLApi();
   virtual ~RealGLApi();
   void Initialize(DriverGL* driver);
+
+ private:
+  virtual void glFinishFn() OVERRIDE;
+  virtual void glFlushFn() OVERRIDE;
 };
 
 // Inserts a TRACE for every GL call.
@@ -94,10 +99,12 @@ class VirtualGLApi : public GLApiBase {
 
   void OnReleaseVirtuallyCurrent(GLContext* virtual_context);
 
+private:
   // Overridden functions from GLApiBase
   virtual const GLubyte* glGetStringFn(GLenum name) OVERRIDE;
+  virtual void glFinishFn() OVERRIDE;
+  virtual void glFlushFn() OVERRIDE;
 
- private:
   // The real context we're running on.
   GLContext* real_context_;