ui: Move gl/ directory out of gfx/, up to ui/.

ui/gl/gl_surface_osmesa.h

Index: ui/gl/gl_surface_osmesa.h
diff --git a/ui/gfx/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h
similarity index 88%
rename from ui/gfx/gl/gl_surface_osmesa.h
rename to ui/gl/gl_surface_osmesa.h
index 8d8c2247256c87fc8966202bd28f85e3ef37d1f4..ab3feec031017d020a379c95cdc7d17184c868fb 100644
--- a/ui/gfx/gl/gl_surface_osmesa.h
+++ b/ui/gl/gl_surface_osmesa.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_GL_GL_SURFACE_OSMESA_H_
-#define UI_GFX_GL_GL_SURFACE_OSMESA_H_
+#ifndef UI_GL_GL_SURFACE_OSMESA_H_
+#define UI_GL_GL_SURFACE_OSMESA_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -42,4 +42,4 @@ class GL_EXPORT GLSurfaceOSMesa : public GLSurface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_OSMESA_H_
+#endif  // UI_GL_GL_SURFACE_OSMESA_H_