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

ui/gl/gl_context_glx.h

Index: ui/gl/gl_context_glx.h
diff --git a/ui/gfx/gl/gl_context_glx.h b/ui/gl/gl_context_glx.h
similarity index 88%
rename from ui/gfx/gl/gl_context_glx.h
rename to ui/gl/gl_context_glx.h
index 9b351526b9340d8781588ca6c7657408b23e67d9..60155dfae1678995d5853feb245ddee72f215399 100644
--- a/ui/gfx/gl/gl_context_glx.h
+++ b/ui/gl/gl_context_glx.h
@@ -2,14 +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_GLX_H_
-#define UI_GFX_GL_GL_CONTEXT_GLX_H_
+#ifndef UI_GL_GL_CONTEXT_GLX_H_
+#define UI_GL_GL_CONTEXT_GLX_H_
+#pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
@@ -44,4 +45,4 @@ class GLContextGLX : public GLContext {
 
 }  // namespace gfx
 
-#endif //UI_GFX_GL_GL_CONTEXT_GLX_H_
+#endif  // UI_GL_GL_CONTEXT_GLX_H_