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

media/gpu/vaapi_tfp_picture.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 "media/gpu/vaapi_tfp_picture.h"
 
 #include <X11/Xlib.h>
 
 #include "media/gpu/va_surface.h"
 #include "media/gpu/vaapi_wrapper.h"
@@ skipping 40 matching lines @@
     if (!make_context_current_cb_.Run())
       return false;
 
     glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
     if (!glx_image_->Initialize(x_pixmap_)) {
       // x_pixmap_ will be freed in the destructor.
       LOG(ERROR) << "Failed creating a GLX Pixmap for TFP";
       return false;
     }
 
-    gfx::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
+    gl::ScopedTextureBinder texture_binder(GL_TEXTURE_2D, texture_id_);
     if (!glx_image_->BindTexImage(GL_TEXTURE_2D)) {
       LOG(ERROR) << "Failed to bind texture to glx image";
       return false;
     }
   }
 
   return true;
 }
 
 bool VaapiTFPPicture::Allocate(gfx::BufferFormat format) {
@@ skipping 25 matching lines @@
   return false;
 }
 
 bool VaapiTFPPicture::DownloadFromSurface(
     const scoped_refptr<VASurface>& va_surface) {
   return vaapi_wrapper_->PutSurfaceIntoPixmap(va_surface->id(), x_pixmap_,
                                               va_surface->size());
 }
 
 }  // namespace media