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

ui/ozone/demo/ozone_demo.cc

Index: ui/ozone/demo/ozone_demo.cc
diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
index f3a0e4bb632a5c0bad268968ba34d6aa26b05b13..1a874ed426127e6fb85eab26de2130f3cdc833dd 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc
@@ -43,8 +43,8 @@ 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)
@@ -214,7 +214,7 @@ std::unique_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     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())