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

ui/gl/gl_context_nsview.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_NSVIEW_H_
-#define UI_GFX_GL_GL_CONTEXT_NSVIEW_H_
+#ifndef UI_GL_GL_CONTEXT_NSVIEW_H_
+#define UI_GL_GL_CONTEXT_NSVIEW_H_
 #pragma once
 
 #import <AppKit/NSOpenGL.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_nsobject.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
 class GLSurface;
 
 // GLContextNSView encapsulates an NSView-based GLContext.  This is paired with
 // the GLSurfaceNSView class.
 class GLContextNSView : public GLContext {
  public:
   explicit GLContextNSView(GLShareGroup* group);
@@ skipping 14 matching lines @@
 
  private:
   scoped_nsobject<NSOpenGLContext> context_;
   GpuPreference gpu_preference_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextNSView);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_NSVIEW_H_
+#endif  // UI_GL_GL_CONTEXT_NSVIEW_H_