Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_image_surface_texture.h

 // 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.
 
 #ifndef UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
 #define UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image.h"
 
 namespace gl {
 
 class SurfaceTexture;
 
 class GL_EXPORT GLImageSurfaceTexture : public GLImage {
  public:
   explicit GLImageSurfaceTexture(const gfx::Size& size);
 
-  bool Initialize(gl::SurfaceTexture* surface_texture);
+  bool Initialize(SurfaceTexture* surface_texture);
 
   // Overridden from GLImage:
   void Destroy(bool have_context) override;
   gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override {}
   bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
                        const gfx::Point& offset,
                        const gfx::Rect& rect) override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int z_order,
                             gfx::OverlayTransform transform,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
                     uint64_t process_tracing_id,
                     const std::string& dump_name) override;
 
  protected:
   ~GLImageSurfaceTexture() override;
 
  private:
-  scoped_refptr<gl::SurfaceTexture> surface_texture_;
+  scoped_refptr<SurfaceTexture> surface_texture_;
   const gfx::Size size_;
   GLint texture_id_;
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_