Follow-up fixes to changing namespace gfx to gl.

ui/gl/gl_context_cgl.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_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 
 #include <memory>
@@ skipping 121 matching lines @@
   // Contexts that prefer integrated gpu are known to use only the subset of GL
   // that can be safely migrated between the iGPU and the dGPU. Mark those
   // contexts as safe to forcibly transition between the GPUs by default.
   // http://crbug.com/180876, http://crbug.com/227228
   safe_to_force_gpu_switch_ = gpu_preference == PreferIntegratedGpu;
   return true;
 }
 
 void GLContextCGL::Destroy() {
   if (yuv_to_rgb_converter_) {
-    gl::ScopedCGLSetCurrentContext(static_cast<CGLContextObj>(context_));
+    ScopedCGLSetCurrentContext(static_cast<CGLContextObj>(context_));
     yuv_to_rgb_converter_.reset();
   }
   if (discrete_pixelformat_) {
     if (base::MessageLoop::current() != nullptr) {
       // Delay releasing the pixel format for 10 seconds to reduce the number of
       // unnecessary GPU switches.
       base::MessageLoop::current()->PostDelayedTask(
           FROM_HERE, base::Bind(&CGLReleasePixelFormat, discrete_pixelformat_),
           base::TimeDelta::FromSeconds(10));
     } else {
@@ skipping 41 matching lines @@
           screen_ = i;
           break;
         }
       }
       renderer_id_ = renderer_id;
     }
   }
   return true;
 }
 
-gl::YUVToRGBConverter* GLContextCGL::GetYUVToRGBConverter() {
+YUVToRGBConverter* GLContextCGL::GetYUVToRGBConverter() {
   if (!yuv_to_rgb_converter_)
-    yuv_to_rgb_converter_.reset(new gl::YUVToRGBConverter);
+    yuv_to_rgb_converter_.reset(new YUVToRGBConverter);
   return yuv_to_rgb_converter_.get();
 }
 
 bool GLContextCGL::MakeCurrent(GLSurface* surface) {
   DCHECK(context_);
 
   if (!ForceGpuSwitchIfNeeded())
     return false;
 
   if (IsCurrent(surface))
@@ skipping 62 matching lines @@
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
 }  // namespace gl