Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_context.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_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
@@ skipping 74 matching lines @@
   return std::string(version ? version : "");
 }
 
 std::string GLContext::GetGLRenderer() {
   DCHECK(IsCurrent(nullptr));
   const char *renderer =
       reinterpret_cast<const char*>(glGetString(GL_RENDERER));
   return std::string(renderer ? renderer : "");
 }
 
-gl::YUVToRGBConverter* GLContext::GetYUVToRGBConverter() {
+YUVToRGBConverter* GLContext::GetYUVToRGBConverter() {
   return nullptr;
 }
 
 bool GLContext::HasExtension(const char* name) {
   std::string extensions = GetExtensions();
   extensions += " ";
 
   std::string delimited_name(name);
   delimited_name += " ";
 
   return extensions.find(delimited_name) != std::string::npos;
 }
 
 const GLVersionInfo* GLContext::GetVersionInfo() {
-  if(!version_info_) {
+  if (!version_info_) {
     std::string version = GetGLVersion();
     std::string renderer = GetGLRenderer();
     version_info_ = base::WrapUnique(new GLVersionInfo(
         version.c_str(), renderer.c_str(), GetExtensions().c_str()));
   }
   return version_info_.get();
 }
 
 GLShareGroup* GLContext::share_group() {
   return share_group_.get();
@@ skipping 85 matching lines @@
     virtual_gl_api_->OnReleaseVirtuallyCurrent(virtual_context);
 }
 
 void GLContext::SetRealGLApi() {
   SetGLToRealGLApi();
 }
 
 GLContextReal::GLContextReal(GLShareGroup* share_group)
     : GLContext(share_group) {}
 
-scoped_refptr<gl::GPUTimingClient> GLContextReal::CreateGPUTimingClient() {
+scoped_refptr<GPUTimingClient> GLContextReal::CreateGPUTimingClient() {
   if (!gpu_timing_) {
     gpu_timing_.reset(GPUTiming::CreateGPUTiming(this));
   }
   return gpu_timing_->CreateGPUTimingClient();
 }
 
 GLContextReal::~GLContextReal() {
   if (GetRealCurrent() == this)
     current_real_context_.Pointer()->Set(nullptr);
 }
 
 void GLContextReal::SetCurrent(GLSurface* surface) {
   GLContext::SetCurrent(surface);
   current_real_context_.Pointer()->Set(surface ? this : nullptr);
 }
 
 }  // namespace gl