Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_context.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_H_
 #define UI_GL_GL_CONTEXT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 42 matching lines @@
   virtual void ReleaseCurrent(GLSurface* surface) = 0;
 
   // Returns true if this context and surface is current. Pass a null surface
   // if the current surface is not important.
   virtual bool IsCurrent(GLSurface* surface) = 0;
 
   // Get the underlying platform specific GL context "handle".
   virtual void* GetHandle() = 0;
 
   // Creates a GPUTimingClient class which abstracts various GPU Timing exts.
-  virtual scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() = 0;
+  virtual scoped_refptr<GPUTimingClient> CreateGPUTimingClient() = 0;
 
   // Gets the GLStateRestorer for the context.
   GLStateRestorer* GetGLStateRestorer();
 
   // Sets the GLStateRestorer for the context (takes ownership).
   void SetGLStateRestorer(GLStateRestorer* state_restorer);
 
   // Set swap interval. This context must be current.
   void SetSwapInterval(int interval);
 
@@ skipping 52 matching lines @@
   // being released or destroyed.
   void OnReleaseVirtuallyCurrent(GLContext* virtual_context);
 
   // Returns the GL version string. The context must be current.
   virtual std::string GetGLVersion();
 
   // Returns the GL renderer string. The context must be current.
   virtual std::string GetGLRenderer();
 
   // Returns a helper structure to convert YUV textures to RGB textures.
-  virtual gl::YUVToRGBConverter* GetYUVToRGBConverter();
+  virtual YUVToRGBConverter* GetYUVToRGBConverter();
 
  protected:
   virtual ~GLContext();
 
   // Will release the current context when going out of scope, unless canceled.
   class ScopedReleaseCurrent {
    public:
     ScopedReleaseCurrent();
     ~ScopedReleaseCurrent();
 
@@ skipping 32 matching lines @@
 
   int swap_interval_;
   bool force_swap_interval_zero_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 class GL_EXPORT GLContextReal : public GLContext {
  public:
   explicit GLContextReal(GLShareGroup* share_group);
-  scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override;
+  scoped_refptr<GPUTimingClient> CreateGPUTimingClient() override;
 
  protected:
   ~GLContextReal() override;
 
   void SetCurrent(GLSurface* surface) override;
 
  private:
-  std::unique_ptr<gl::GPUTiming> gpu_timing_;
+  std::unique_ptr<GPUTiming> gpu_timing_;
   DISALLOW_COPY_AND_ASSIGN(GLContextReal);
 };
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_CONTEXT_H_