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

ui/gl/gl_surface.h

Index: ui/gl/gl_surface.h
diff --git a/ui/gfx/gl/gl_surface.h b/ui/gl/gl_surface.h
similarity index 97%
rename from ui/gfx/gl/gl_surface.h
rename to ui/gl/gl_surface.h
index 92a2d399cdfa45c3adee239d360ea8b41f52a16f..efa4f233862a9fc80525656022603a854cc49c0f 100644
--- a/ui/gfx/gl/gl_surface.h
+++ b/ui/gl/gl_surface.h
@@ -2,15 +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_SURFACE_H_
-#define UI_GFX_GL_GL_SURFACE_H_
+#ifndef UI_GL_GL_SURFACE_H_
+#define UI_GL_GL_SURFACE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
-#include "ui/gfx/gl/gl_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_export.h"
 
 namespace gfx {
 
@@ -114,6 +114,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
  private:
   friend class base::RefCounted<GLSurface>;
   friend class GLContext;
+
   DISALLOW_COPY_AND_ASSIGN(GLSurface);
 };
 
@@ -147,9 +148,10 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface {
 
  private:
   scoped_refptr<GLSurface> surface_;
+
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_H_
+#endif  // UI_GL_GL_SURFACE_H_