Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_image_shared_memory_unittest.cc

Index: ui/gl/gl_image_shared_memory_unittest.cc
diff --git a/ui/gl/gl_image_shared_memory_unittest.cc b/ui/gl/gl_image_shared_memory_unittest.cc
index 9c3060811403d3f3fdec9d8260d3dccc1aaf956b..316bef7f42dd1633be1d1dee5a15f5285c7976a4 100644
--- a/ui/gl/gl_image_shared_memory_unittest.cc
+++ b/ui/gl/gl_image_shared_memory_unittest.cc
@@ -17,9 +17,8 @@ namespace {
 template <gfx::BufferFormat format>
 class GLImageSharedMemoryTestDelegate {
  public:
-  scoped_refptr<gl::GLImage> CreateSolidColorImage(
-      const gfx::Size& size,
-      const uint8_t color[4]) const {
+  scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size,
+                                               const uint8_t color[4]) const {
     DCHECK_EQ(NumberOfPlanesForBufferFormat(format), 1u);
     base::SharedMemory shared_memory;
     bool rv = shared_memory.CreateAndMapAnonymous(
@@ -29,8 +28,8 @@ class GLImageSharedMemoryTestDelegate {
         size.width(), size.height(),
         static_cast<int>(RowSizeForBufferFormat(size.width(), format, 0)), 0,
         format, color, reinterpret_cast<uint8_t*>(shared_memory.memory()));
-    scoped_refptr<gl::GLImageSharedMemory> image(new gl::GLImageSharedMemory(
-        size, gl::GLImageMemory::GetInternalFormatForTesting(format)));
+    scoped_refptr<GLImageSharedMemory> image(new GLImageSharedMemory(
+        size, GLImageMemory::GetInternalFormatForTesting(format)));
     rv = image->Initialize(
         base::SharedMemory::DuplicateHandle(shared_memory.handle()),
         gfx::GenericSharedMemoryId(0), format, 0,
@@ -59,9 +58,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageSharedMemory,
 
 class GLImageSharedMemoryPoolTestDelegate {
  public:
-  scoped_refptr<gl::GLImage> CreateSolidColorImage(
-      const gfx::Size& size,
-      const uint8_t color[4]) const {
+  scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size,
+                                               const uint8_t color[4]) const {
     // Create a shared memory segment that holds an image with a stride that is
     // twice the row size and 2 pages larger than image.
     size_t stride = gfx::RowSizeForBufferFormat(
@@ -80,8 +78,8 @@ class GLImageSharedMemoryPoolTestDelegate {
         size.width(), size.height(), static_cast<int>(stride), 0,
         gfx::BufferFormat::RGBA_8888, color,
         reinterpret_cast<uint8_t*>(shared_memory.memory()) + buffer_offset);
-    scoped_refptr<gl::GLImageSharedMemory> image(
-        new gl::GLImageSharedMemory(size, GL_RGBA));
+    scoped_refptr<GLImageSharedMemory> image(
+        new GLImageSharedMemory(size, GL_RGBA));
     rv = image->Initialize(
         base::SharedMemory::DuplicateHandle(shared_memory.handle()),
         gfx::GenericSharedMemoryId(0), gfx::BufferFormat::RGBA_8888,