Move code in ui/gl/* from gfx:: to gl::

ui/ozone/demo/surfaceless_gl_renderer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/demo/surfaceless_gl_renderer.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 26 matching lines @@
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   glGenFramebuffersEXT(1, &gl_fb_);
   glGenTextures(1, &gl_tex_);
 
   scoped_refptr<NativePixmap> pixmap =
       OzonePlatform::GetInstance()
           ->GetSurfaceFactoryOzone()
           ->CreateNativePixmap(widget, size, gfx::BufferFormat::BGRX_8888,
                                gfx::BufferUsage::SCANOUT);
-  scoped_refptr<gfx::GLImageOzoneNativePixmap> image(
-      new gfx::GLImageOzoneNativePixmap(size, GL_RGB));
+  scoped_refptr<gl::GLImageOzoneNativePixmap> image(
+      new gl::GLImageOzoneNativePixmap(size, GL_RGB));
   if (!image->Initialize(pixmap.get(), gfx::BufferFormat::BGRX_8888)) {
     LOG(ERROR) << "Failed to create GLImage";
     return false;
   }
   image_ = image;
 
   glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_);
   glBindTexture(GL_TEXTURE_2D, gl_tex_);
   image_->BindTexImage(GL_TEXTURE_2D);
 
@@ skipping 10 matching lines @@
 
   return true;
 }
 
 void SurfacelessGlRenderer::BufferWrapper::BindFramebuffer() {
   glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_);
 }
 
 SurfacelessGlRenderer::SurfacelessGlRenderer(
     gfx::AcceleratedWidget widget,
-    const scoped_refptr<gfx::GLSurface>& surface,
+    const scoped_refptr<gl::GLSurface>& surface,
     const gfx::Size& size)
     : GlRenderer(widget, surface, size), weak_ptr_factory_(this) {}
 
 SurfacelessGlRenderer::~SurfacelessGlRenderer() {
   // Need to make current when deleting the framebuffer resources allocated in
   // the buffers.
   context_->MakeCurrent(surface_.get());
 }
 
 bool SurfacelessGlRenderer::Initialize() {
@@ skipping 43 matching lines @@
     case gfx::SwapResult::SWAP_ACK:
       GlRenderer::PostRenderFrameTask(result);
       break;
     case gfx::SwapResult::SWAP_FAILED:
       LOG(FATAL) << "Failed to swap buffers";
       break;
   }
 }
 
 }  // namespace ui