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

ui/gl/gl_interface.h

Index: ui/gl/gl_interface.h
diff --git a/ui/gfx/gl/gl_interface.h b/ui/gl/gl_interface.h
similarity index 99%
rename from ui/gfx/gl/gl_interface.h
rename to ui/gl/gl_interface.h
index e5f1b46f2c94657c0773cce6536114af51ee7b79..db120b6e19efa1eab2caccfae8b92f3bb75e385b 100644
--- a/ui/gfx/gl/gl_interface.h
+++ b/ui/gl/gl_interface.h
@@ -2,22 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef UI_GL_GL_INTERFACE_H_
+#define UI_GL_GL_INTERFACE_H_
+#pragma once
+
 // This file implements glue to a GL interface so we can mock it for unit
 // testing. It has to be Desktop GL, not GLES2 as it is used to test the service
 // side code.
 
-#ifndef UI_GFX_GL_GL_INTERFACE_H_
-#define UI_GFX_GL_GL_INTERFACE_H_
-#pragma once
-
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace gfx {
 
 class GL_EXPORT GLInterface {
  public:
-  virtual ~GLInterface() {
-  }
+  virtual ~GLInterface() {}
 
   static void SetGLInterface(GLInterface* gl_interface);
 
@@ -638,4 +637,4 @@ class GL_EXPORT GLInterface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_INTERFACE_H_
+#endif  // UI_GL_GL_INTERFACE_H_