Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/ui/gl/gl_surface.h

Index: trunk/src/ui/gl/gl_surface.h
===================================================================
--- trunk/src/ui/gl/gl_surface.h	(revision 247809)
+++ trunk/src/ui/gl/gl_surface.h	(working copy)
@@ -12,7 +12,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_export.h"
-#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
@@ -70,15 +69,8 @@
   // Copy part of the backbuffer to the frontbuffer.
   virtual bool PostSubBuffer(int x, int y, int width, int height);
 
-  // Initialize GL bindings.
   static bool InitializeOneOff();
 
-  // Unit tests should call these instead of InitializeOneOff() to set up
-  // GL bindings appropriate for tests.
-  static void InitializeOneOffForTests();
-  static void InitializeOneOffWithMockBindingsForTests();
-  static void InitializeDynamicMockBindingsForTests(GLContext* context);
-
   // Called after a context is made current with this surface. Returns false
   // on error.
   virtual bool OnMakeCurrent(GLContext* context);
@@ -117,10 +109,6 @@
 
  protected:
   virtual ~GLSurface();
-  static bool InitializeOneOffImplementation(GLImplementation impl,
-                                             bool fallback_to_osmesa,
-                                             bool gpu_service_logging,
-                                             bool disable_gl_drawing);
   static bool InitializeOneOffInternal();
   static void SetCurrent(GLSurface* surface);