GLContext no longer holds a pointer to a GLSurface.

ui/gfx/gl/gl_context_glx.h

Index: ui/gfx/gl/gl_context_glx.h
===================================================================
--- ui/gfx/gl/gl_context_glx.h	(revision 86168)
+++ ui/gfx/gl/gl_context_glx.h	(working copy)
@@ -4,40 +4,30 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/size.h"
 
 namespace gfx {
 
-class GLSurfaceGLX;
+class GLSurface;
 
 // Encapsulates a GLX OpenGL context.
 class GLContextGLX : public GLContext {
  public:
-  // Takes ownership of surface. TODO(apatrick): separate notion of surface
-  // from context.
-  explicit GLContextGLX(GLSurfaceGLX* surface);
-
+  GLContextGLX();
   virtual ~GLContextGLX();
 
-  // Initializes the GL context.
-  bool Initialize(GLContext* shared_context);
-
   // Implement GLContext.
+  virtual bool Initialize(GLContext* shared_context,
+                          GLSurface* compatible_surface);
   virtual void Destroy();
-  virtual bool MakeCurrent();
-  virtual bool IsCurrent();
-  virtual bool IsOffscreen();
-  virtual bool SwapBuffers();
-  virtual gfx::Size GetSize();
+  virtual bool MakeCurrent(GLSurface* surface);
+  virtual void ReleaseCurrent(GLSurface* surface);
+  virtual bool IsCurrent(GLSurface* surface);
   virtual void* GetHandle();
   virtual void SetSwapInterval(int interval);
   virtual std::string GetExtensions();
 
  private:
-  scoped_ptr<GLSurfaceGLX> surface_;
   void* context_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextGLX);