Move code in ui/gl/* from gfx:: to gl::

ui/ozone/demo/gl_renderer.cc

 // 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.
 
 #include "ui/ozone/demo/gl_renderer.h"
 
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/init/gl_factory.h"
 
 namespace ui {
 
 GlRenderer::GlRenderer(gfx::AcceleratedWidget widget,
-                       const scoped_refptr<gfx::GLSurface>& surface,
+                       const scoped_refptr<gl::GLSurface>& surface,
                        const gfx::Size& size)
     : RendererBase(widget, size), surface_(surface), weak_ptr_factory_(this) {}
 
 GlRenderer::~GlRenderer() {
 }
 
 bool GlRenderer::Initialize() {
   context_ = gl::init::CreateGLContext(nullptr, surface_.get(),
-                                       gfx::PreferIntegratedGpu);
+                                       gl::PreferIntegratedGpu);
   if (!context_.get()) {
     LOG(ERROR) << "Failed to create GL context";
     return false;
   }
 
   surface_->Resize(size_, 1.f, true);
 
   if (!context_->MakeCurrent(surface_.get())) {
     LOG(ERROR) << "Failed to make GL context current";
     return false;
@@ skipping 18 matching lines @@
                                         weak_ptr_factory_.GetWeakPtr()));
 }
 
 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace ui