Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_image_memory.cc

Index: ui/gl/gl_image_memory.cc
diff --git a/ui/gl/gl_image_memory.cc b/ui/gl/gl_image_memory.cc
index b98deb1f4bd32f140d0519790aca96144faf506b..42533eeb5ed986df0627865b86d15986c61b63d2 100644
--- a/ui/gl/gl_image_memory.cc
+++ b/ui/gl/gl_image_memory.cc
@@ -305,7 +305,7 @@ std::unique_ptr<uint8_t[]> GLES2Data(const gfx::Size& size,
       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(
@@ -410,7 +410,7 @@ bool GLImageMemory::CopyTexImage(unsigned target) {
     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);
     }
@@ -460,7 +460,7 @@ bool GLImageMemory::CopyTexSubImage(unsigned target,
     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);
     }