Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_surface.cc

 // Copyright (c) 2012 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_surface.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 180 matching lines @@
   NOTIMPLEMENTED();
   return SURFACE_DEFAULT;
 }
 
 gfx::VSyncProvider* GLSurface::GetVSyncProvider() {
   return NULL;
 }
 
 bool GLSurface::ScheduleOverlayPlane(int z_order,
                                      gfx::OverlayTransform transform,
-                                     gl::GLImage* image,
+                                     GLImage* image,
                                      const gfx::Rect& bounds_rect,
                                      const gfx::RectF& crop_rect) {
   NOTIMPLEMENTED();
   return false;
 }
 
-bool GLSurface::ScheduleCALayer(gl::GLImage* contents_image,
+bool GLSurface::ScheduleCALayer(GLImage* contents_image,
                                 const gfx::RectF& contents_rect,
                                 float opacity,
                                 unsigned background_color,
                                 unsigned edge_aa_mask,
                                 const gfx::RectF& rect,
                                 bool is_clipped,
                                 const gfx::RectF& clip_rect,
                                 const gfx::Transform& transform,
                                 int sorting_content_id,
                                 unsigned filter) {
@@ skipping 155 matching lines @@
 GLSurface::Format GLSurfaceAdapter::GetFormat() {
   return surface_->GetFormat();
 }
 
 gfx::VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
   return surface_->GetVSyncProvider();
 }
 
 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order,
                                             gfx::OverlayTransform transform,
-                                            gl::GLImage* image,
+                                            GLImage* image,
                                             const gfx::Rect& bounds_rect,
                                             const gfx::RectF& crop_rect) {
   return surface_->ScheduleOverlayPlane(
       z_order, transform, image, bounds_rect, crop_rect);
 }
 
 bool GLSurfaceAdapter::IsSurfaceless() const {
   return surface_->IsSurfaceless();
 }
 
 bool GLSurfaceAdapter::FlipsVertically() const {
   return surface_->FlipsVertically();
 }
 
 bool GLSurfaceAdapter::BuffersFlipped() const {
   return surface_->BuffersFlipped();
 }
 
 GLSurfaceAdapter::~GLSurfaceAdapter() {}
 
 }  // namespace gl