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

ui/gl/gl_interface.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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);
 
   static GLInterface* GetGLInterface();
 
   virtual void ActiveTexture(GLenum texture) = 0;
 
   virtual void AttachShader(GLuint program,
                             GLuint shader) = 0;
 
@@ skipping 600 matching lines @@
                                           GLsizei primcount) = 0;
 
   virtual void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) = 0;
 
  private:
   static GLInterface* interface_;
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_INTERFACE_H_
+#endif  // UI_GL_GL_INTERFACE_H_