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

ui/gl/gl_context_osmesa.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_GFX_GL_GL_CONTEXT_OSMESA_H_
-#define UI_GFX_GL_GL_CONTEXT_OSMESA_H_
+#ifndef UI_GL_GL_CONTEXT_OSMESA_H_
+#define UI_GL_GL_CONTEXT_OSMESA_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_context.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ui/gl/gl_context.h"
 
-typedef struct osmesa_context *OSMesaContext;
+typedef struct osmesa_context* OSMesaContext;
 
 namespace gfx {
 
 class GLShareGroup;
 class GLSurface;
 
 // Encapsulates an OSMesa OpenGL context that uses software rendering.
 class GLContextOSMesa : public GLContext {
  public:
   explicit GLContextOSMesa(GLShareGroup* share_group);
@@ skipping 12 matching lines @@
   virtual ~GLContextOSMesa();
 
  private:
   OSMesaContext context_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextOSMesa);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_OSMESA_H_
+#endif  // UI_GL_GL_CONTEXT_OSMESA_H_