Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_context_cgl.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_CONTEXT_CGL_H_
 #define UI_GL_GL_CONTEXT_CGL_H_
 
 #include <OpenGL/CGLTypes.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
   // Implement GLContext.
   bool Initialize(GLSurface* compatible_surface,
                   GpuPreference gpu_preference) override;
   bool MakeCurrent(GLSurface* surface) override;
   void ReleaseCurrent(GLSurface* surface) override;
   bool IsCurrent(GLSurface* surface) override;
   void* GetHandle() override;
   void OnSetSwapInterval(int interval) override;
   void SetSafeToForceGpuSwitch() override;
   bool ForceGpuSwitchIfNeeded() override;
-  gl::YUVToRGBConverter* GetYUVToRGBConverter() override;
+  YUVToRGBConverter* GetYUVToRGBConverter() override;
 
  protected:
   ~GLContextCGL() override;
 
  private:
   void Destroy();
   GpuPreference GetGpuPreference();
 
   void* context_;
   GpuPreference gpu_preference_;
-  std::unique_ptr<gl::YUVToRGBConverter> yuv_to_rgb_converter_;
+  std::unique_ptr<YUVToRGBConverter> yuv_to_rgb_converter_;
 
   CGLPixelFormatObj discrete_pixelformat_;
 
   int screen_;
   int renderer_id_;
   bool safe_to_force_gpu_switch_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextCGL);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_CONTEXT_CGL_H_