Remove IOSurfaceSupport

ui/gl/gl_image_io_surface.cc

Index: ui/gl/gl_image_io_surface.cc
diff --git a/ui/gl/gl_image_io_surface.cc b/ui/gl/gl_image_io_surface.cc
index e20c739cffad6ce232405e4cc460e7aeec078a39..566b05e4cc7646ee186171cb9bff1058063e4903 100644
--- a/ui/gl/gl_image_io_surface.cc
+++ b/ui/gl/gl_image_io_surface.cc
@@ -6,19 +6,19 @@
 
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
-#include "ui/gl/io_surface_support_mac.h"
+
+// Note that this must be included after gl_bindings.h to avoid conflicts.
+#include <OpenGL/CGLIOSurface.h>
 
 namespace gfx {
 
 GLImageIOSurface::GLImageIOSurface(gfx::Size size)
-    : io_surface_support_(IOSurfaceSupport::Initialize()), size_(size) {
-  CHECK(io_surface_support_);
-}
+    : size_(size) {}
 
 GLImageIOSurface::~GLImageIOSurface() { Destroy(); }
 
 bool GLImageIOSurface::Initialize(gfx::GpuMemoryBufferHandle buffer) {
-  io_surface_.reset(io_surface_support_->IOSurfaceLookup(buffer.io_surface_id));
+  io_surface_.reset(IOSurfaceLookup(buffer.io_surface_id));
   if (!io_surface_) {
     LOG(ERROR) << "IOSurface lookup failed";
     return false;
@@ -41,16 +41,15 @@ bool GLImageIOSurface::BindTexImage(unsigned target) {
       static_cast<CGLContextObj>(GLContext::GetCurrent()->GetHandle());
 
   DCHECK(io_surface_);
-  CGLError cgl_error =
-      io_surface_support_->CGLTexImageIOSurface2D(cgl_context,
-                                                  target,
-                                                  GL_RGBA,
-                                                  size_.width(),
-                                                  size_.height(),
-                                                  GL_BGRA,
-                                                  GL_UNSIGNED_INT_8_8_8_8_REV,
-                                                  io_surface_.get(),
-                                                  0);
+  CGLError cgl_error = CGLTexImageIOSurface2D(cgl_context,
+                                              target,
+                                              GL_RGBA,
+                                              size_.width(),
+                                              size_.height(),
+                                              GL_BGRA,
+                                              GL_UNSIGNED_INT_8_8_8_8_REV,
+                                              io_surface_.get(),
+                                              0);
   if (cgl_error != kCGLNoError) {
     LOG(ERROR) << "Error in CGLTexImageIOSurface2D";
     return false;