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

ui/gl/gl_context_osmesa.h

Index: ui/gl/gl_context_osmesa.h
diff --git a/ui/gfx/gl/gl_context_osmesa.h b/ui/gl/gl_context_osmesa.h
similarity index 80%
rename from ui/gfx/gl/gl_context_osmesa.h
rename to ui/gl/gl_context_osmesa.h
index 2e21c4b8a1dc8924c0a5f0ce08c9620240bac686..cef3fd949c6311f862d34eb7d67b3ec1e4f122f1 100644
--- a/ui/gfx/gl/gl_context_osmesa.h
+++ b/ui/gl/gl_context_osmesa.h
@@ -2,13 +2,15 @@
 // 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_CONTEXT_OSMESA_H_
-#define UI_GFX_GL_GL_CONTEXT_OSMESA_H_
+#ifndef UI_GL_GL_CONTEXT_OSMESA_H_
+#define UI_GL_GL_CONTEXT_OSMESA_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_context.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ui/gl/gl_context.h"
 
-typedef struct osmesa_context *OSMesaContext;
+typedef struct osmesa_context* OSMesaContext;
 
 namespace gfx {
 
@@ -41,4 +43,4 @@ class GLContextOSMesa : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_OSMESA_H_
+#endif  // UI_GL_GL_CONTEXT_OSMESA_H_