Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_image_memory.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/gl/gl_image_memory.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 287 matching lines @@
                             dst[2] = src[0];
                           },
                           data_format, data_type, data_row_length);
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::R_8: {
       size_t gles2_data_stride =
           RowSizeForBufferFormat(size.width(), format, 0);
       if (stride == gles2_data_stride ||
-          gl::g_driver_gl.ext.b_GL_EXT_unpack_subimage)
+          g_driver_gl.ext.b_GL_EXT_unpack_subimage)
         return nullptr;  // No data conversion needed
 
       std::unique_ptr<uint8_t[]> gles2_data(
           new uint8_t[gles2_data_stride * size.height()]);
       for (int y = 0; y < size.height(); ++y) {
         memcpy(&gles2_data[y * gles2_data_stride], &data[y * stride],
                gles2_data_stride);
       }
       *data_row_length = size.width();
       return gles2_data;
@@ skipping 84 matching lines @@
     glCompressedTexImage2D(
         target, 0, TextureFormat(format_), size_.width(), size_.height(), 0,
         static_cast<GLsizei>(BufferSizeForBufferFormat(size_, format_)),
         memory_);
   } else {
     GLenum data_format = DataFormat(format_);
     GLenum data_type = DataType(format_);
     GLint data_row_length = DataRowLength(stride_, format_);
     std::unique_ptr<uint8_t[]> gles2_data;
 
-    if (gl::GLContext::GetCurrent()->GetVersionInfo()->is_es) {
+    if (GLContext::GetCurrent()->GetVersionInfo()->is_es) {
       gles2_data = GLES2Data(size_, format_, stride_, memory_, &data_format,
                              &data_type, &data_row_length);
     }
 
     if (data_row_length != size_.width())
       glPixelStorei(GL_UNPACK_ROW_LENGTH, data_row_length);
 
     glTexImage2D(target, 0, TextureFormat(format_), size_.width(),
                  size_.height(), 0, data_format, data_type,
                  gles2_data ? gles2_data.get() : memory_);
@@ skipping 29 matching lines @@
         target, 0, offset.x(), offset.y(), rect.width(), rect.height(),
         DataFormat(format_),
         static_cast<GLsizei>(BufferSizeForBufferFormat(rect.size(), format_)),
         data);
   } else {
     GLenum data_format = DataFormat(format_);
     GLenum data_type = DataType(format_);
     GLint data_row_length = DataRowLength(stride_, format_);
     std::unique_ptr<uint8_t[]> gles2_data;
 
-    if (gl::GLContext::GetCurrent()->GetVersionInfo()->is_es) {
+    if (GLContext::GetCurrent()->GetVersionInfo()->is_es) {
       gles2_data = GLES2Data(rect.size(), format_, stride_, data, &data_format,
                              &data_type, &data_row_length);
     }
 
     if (data_row_length != rect.width())
       glPixelStorei(GL_UNPACK_ROW_LENGTH, data_row_length);
 
     glTexSubImage2D(target, 0, offset.x(), offset.y(), rect.width(),
                     rect.height(), data_format, data_type,
                     gles2_data ? gles2_data.get() : data);
@@ skipping 13 matching lines @@
   return false;
 }
 
 // static
 unsigned GLImageMemory::GetInternalFormatForTesting(gfx::BufferFormat format) {
   DCHECK(ValidFormat(format));
   return TextureFormat(format);
 }
 
 }  // namespace gl