Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_surface.h

 // 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.
 
 #ifndef UI_GL_GL_SURFACE_H_
 #define UI_GL_GL_SURFACE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 153 matching lines @@
   // main framebuffer located at index 0. For the case where there is no
   // main framebuffer, overlays may be scheduled at 0, taking its place.
   // |transform| specifies how the buffer is to be transformed during
   // composition.
   // |image| to be presented by the overlay.
   // |bounds_rect| specify where it is supposed to be on the screen in pixels.
   // |crop_rect| specifies the region within the buffer to be placed inside
   // |bounds_rect|.
   virtual bool ScheduleOverlayPlane(int z_order,
                                     gfx::OverlayTransform transform,
-                                    gl::GLImage* image,
+                                    GLImage* image,
                                     const gfx::Rect& bounds_rect,
                                     const gfx::RectF& crop_rect);
 
   // Schedule a CALayer to be shown at swap time.
   // All arguments correspond to their CALayer properties.
-  virtual bool ScheduleCALayer(gl::GLImage* contents_image,
+  virtual bool 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 86 matching lines @@
   bool OnMakeCurrent(GLContext* context) override;
   bool SetBackbufferAllocation(bool allocated) override;
   void SetFrontbufferAllocation(bool allocated) override;
   void* GetShareHandle() override;
   void* GetDisplay() override;
   void* GetConfig() override;
   GLSurface::Format GetFormat() override;
   gfx::VSyncProvider* GetVSyncProvider() override;
   bool ScheduleOverlayPlane(int z_order,
                             gfx::OverlayTransform transform,
-                            gl::GLImage* image,
+                            GLImage* image,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   bool IsSurfaceless() const override;
   bool FlipsVertically() const override;
   bool BuffersFlipped() const override;
 
   GLSurface* surface() const { return surface_.get(); }
 
  protected:
   ~GLSurfaceAdapter() override;
 
  private:
   scoped_refptr<GLSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_SURFACE_H_