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

ui/ozone/demo/ozone_demo.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 <utility>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 25 matching lines @@
 const int kTestWindowHeight = 600;
 
 const char kDisableGpu[] = "disable-gpu";
 
 const char kDisableSurfaceless[] = "disable-surfaceless";
 
 const char kWindowSize[] = "window-size";
 
 class DemoWindow;
 
-scoped_refptr<gfx::GLSurface> CreateGLSurface(gfx::AcceleratedWidget widget) {
-  scoped_refptr<gfx::GLSurface> surface;
+scoped_refptr<gl::GLSurface> CreateGLSurface(gfx::AcceleratedWidget widget) {
+  scoped_refptr<gl::GLSurface> surface;
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableSurfaceless))
     surface = gl::init::CreateSurfacelessViewGLSurface(widget);
   if (!surface)
     surface = gl::init::CreateViewGLSurface(widget);
   return surface;
 }
 
 class RendererFactory {
  public:
   enum RendererType {
@@ skipping 149 matching lines @@
   }
 
   return true;
 }
 
 std::unique_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   switch (type_) {
     case GL: {
-      scoped_refptr<gfx::GLSurface> surface = CreateGLSurface(widget);
+      scoped_refptr<gl::GLSurface> surface = CreateGLSurface(widget);
       if (!surface)
         LOG(FATAL) << "Failed to create GL surface";
       if (surface->IsSurfaceless())
         return base::WrapUnique(
             new ui::SurfacelessGlRenderer(widget, surface, size));
       else
         return base::WrapUnique(new ui::GlRenderer(widget, surface, size));
     }
     case SOFTWARE:
       return base::WrapUnique(new ui::SoftwareRenderer(widget, size));
@@ skipping 109 matching lines @@
       ->SetCurrentLayoutByName("us");
 
   base::RunLoop run_loop;
 
   WindowManager window_manager(run_loop.QuitClosure());
 
   run_loop.Run();
 
   return 0;
 }