Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_image_ozone_native_pixmap.cc

 // Copyright 2015 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/gfx/buffer_format_util.h"
 #include "ui/gl/gl_image_ozone_native_pixmap.h"
 
 #define FOURCC(a, b, c, d)                                        \
   ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
    (static_cast<uint32_t>(c) << 16) | (static_cast<uint32_t>(d) << 24))
@@ skipping 73 matching lines @@
   }
 
   NOTREACHED();
   return 0;
 }
 
 }  // namespace
 
 GLImageOzoneNativePixmap::GLImageOzoneNativePixmap(const gfx::Size& size,
                                                    unsigned internalformat)
-    : gl::GLImageEGL(size), internalformat_(internalformat) {}
+    : GLImageEGL(size), internalformat_(internalformat) {}
 
 GLImageOzoneNativePixmap::~GLImageOzoneNativePixmap() {
 }
 
 bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,
                                           gfx::BufferFormat format) {
   DCHECK(!pixmap_);
   if (pixmap->GetEGLClientBuffer()) {
     EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
-    if (!gl::GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
-                                    pixmap->GetEGLClientBuffer(), attrs)) {
+    if (!GLImageEGL::Initialize(EGL_NATIVE_PIXMAP_KHR,
+                                pixmap->GetEGLClientBuffer(), attrs)) {
       return false;
     }
   } else if (pixmap->AreDmaBufFdsValid()) {
     if (!ValidInternalFormat(internalformat_)) {
       LOG(ERROR) << "Invalid internalformat: " << internalformat_;
       return false;
     }
 
     if (!ValidFormat(format)) {
       LOG(ERROR) << "Invalid format: " << static_cast<int>(format);
@@ skipping 15 matching lines @@
          ++plane) {
       attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + plane * 3);
       attrs.push_back(pixmap->GetDmaBufFd(plane));
       attrs.push_back(EGL_DMA_BUF_PLANE0_OFFSET_EXT + plane * 3);
       attrs.push_back(0);
       attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);
       attrs.push_back(pixmap->GetDmaBufPitch(plane));
     }
     attrs.push_back(EGL_NONE);
 
-    if (!gl::GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
-                                    static_cast<EGLClientBuffer>(nullptr),
-                                    &attrs[0])) {
+    if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
+                                static_cast<EGLClientBuffer>(nullptr),
+                                &attrs[0])) {
       return false;
     }
   }
 
   pixmap_ = pixmap;
   return true;
 }
 
 unsigned GLImageOzoneNativePixmap::GetInternalFormat() {
   return internalformat_;
 }
 
 void GLImageOzoneNativePixmap::Destroy(bool have_context) {
-  gl::GLImageEGL::Destroy(have_context);
+  GLImageEGL::Destroy(have_context);
 }
 
 bool GLImageOzoneNativePixmap::CopyTexImage(unsigned target) {
   if (egl_image_ == EGL_NO_IMAGE_KHR) {
     // Pass-through image type fails to bind and copy; make sure we
     // don't draw with uninitialized texture.
     std::vector<unsigned char> data(size_.width() * size_.height() * 4);
     glTexImage2D(target, 0, GL_RGBA, size_.width(),
                  size_.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE,
                  data.data());
@@ skipping 14 matching lines @@
 }
 
 void GLImageOzoneNativePixmap::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd,
     uint64_t process_tracing_id,
     const std::string& dump_name) {
   // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914
 }
 
 }  // namespace gl