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

ui/gl/gl_surface_android.h

Index: ui/gl/gl_surface_android.h
diff --git a/ui/gfx/gl/gl_surface_android.h b/ui/gl/gl_surface_android.h
similarity index 89%
rename from ui/gfx/gl/gl_surface_android.h
rename to ui/gl/gl_surface_android.h
index d46d9fdb9e5cd5227514055080f5a1a8f23a49da..904274e7f26cc7df651bd638dca85a282e969b09 100644
--- a/ui/gfx/gl/gl_surface_android.h
+++ b/ui/gl/gl_surface_android.h
@@ -2,12 +2,12 @@
 // 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_ANDROID_H_
-#define UI_GFX_GL_GL_SURFACE_ANDROID_H_
+#ifndef UI_GL_GL_SURFACE_ANDROID_H_
+#define UI_GL_GL_SURFACE_ANDROID_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_egl.h"
 
 namespace gfx {
 
@@ -33,6 +33,7 @@ class AndroidViewSurface : public NativeViewGLSurfaceEGL {
 
  private:
   bool CreateWindowSurface(AndroidNativeWindow* window);
+
   scoped_refptr<PbufferGLSurfaceEGL>  pbuffer_surface_;
   AndroidNativeWindow* window_;
 
@@ -41,4 +42,4 @@ class AndroidViewSurface : public NativeViewGLSurfaceEGL {
 
 }  // namespace gfx
 
-#endif /* UI_GFX_GL_GL_SURFACE_ANDROID_H_ */
+#endif  // UI_GL_GL_SURFACE_ANDROID_H_