82 files changed, 342 insertions, 320 deletions

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 2edd11c..abf0466 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -225,7 +225,7 @@
         '../../testing/gtest.gyp:gtest',
         '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
-        '../gfx/gl/gl.gyp:gl',
+        '../gl/gl.gyp:gl',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 4d1d333..f74757d 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -12,7 +12,7 @@
 #include "ui/compositor/compositor_setup.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace aura {
 namespace test {
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 4b23d86..5dc61aa1 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -17,9 +17,9 @@
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/test_web_graphics_context_3d.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 4640b4d0..99eebe9 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -15,7 +15,7 @@
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
@@ -100,7 +100,7 @@
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
         'compositor',
         'compositor_test_support',
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index ef72de0..33f6d6b 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -13,10 +13,10 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 #include "ui/compositor/compositor_export.h"
-#include "ui/gfx/gl/gl_share_group.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
+#include "ui/gl/gl_share_group.h"
 
 class SkBitmap;
 
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index fd749bb..4279c0b 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -10,7 +10,7 @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
diff --git a/ui/compositor/test_web_graphics_context_3d.cc b/ui/compositor/test_web_graphics_context_3d.cc
index 7d13815..0031da0 100644
--- a/ui/compositor/test_web_graphics_context_3d.cc
+++ b/ui/compositor/test_web_graphics_context_3d.cc
@@ -4,8 +4,8 @@
 
 #include "ui/compositor/test_web_graphics_context_3d.h"
 
-#include "ui/gfx/gl/gl_context_stub.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
+#include "ui/gl/gl_context_stub.h"
+#include "ui/gl/gl_surface_stub.h"
 
 namespace ui {
 
diff --git a/ui/compositor/test_web_graphics_context_3d.h b/ui/compositor/test_web_graphics_context_3d.h
index a136ddc..d8193a8 100644
--- a/ui/compositor/test_web_graphics_context_3d.h
+++ b/ui/compositor/test_web_graphics_context_3d.h
@@ -10,7 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace gfx {
 class GLContext;
diff --git a/ui/gfx/gl/DEPS b/ui/gl/DEPS
index 9a48305..4d34aad 100644
--- a/ui/gfx/gl/DEPS
+++ b/ui/gl/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
+  "+third_party/angle/include",
   "+third_party/mesa/MesaLib/include",
 ]
diff --git a/ui/gfx/gl/OWNERS b/ui/gl/OWNERS
index 9ce8991..9ce8991 100644
--- a/ui/gfx/gl/OWNERS
+++ b/ui/gl/OWNERS
diff --git a/ui/gfx/gl/android_native_window.cc b/ui/gl/android_native_window.cc
index c32444cf..f75b753 100644
--- a/ui/gfx/gl/android_native_window.cc
+++ b/ui/gl/android_native_window.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/android_native_window.h"
+#include "ui/gl/android_native_window.h"
 
 #include <android/native_window.h>
 
diff --git a/ui/gfx/gl/android_native_window.h b/ui/gl/android_native_window.h
index 4a8eab5..bde5904 100644
--- a/ui/gfx/gl/android_native_window.h
+++ b/ui/gl/android_native_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_
-#define UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_
+#ifndef UI_GL_ANDROID_NATIVE_WINDOW_H_
+#define UI_GL_ANDROID_NATIVE_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -29,4 +29,4 @@ class AndroidNativeWindow {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_
+#endif  // UI_GL_ANDROID_NATIVE_WINDOW_H_
diff --git a/ui/gfx/gl/egl_util.cc b/ui/gl/egl_util.cc
index cec4d3b..91d1b12 100644
--- a/ui/gfx/gl/egl_util.cc
+++ b/ui/gl/egl_util.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "ui/gfx/gl/egl_util.h"
+#include "ui/gl/egl_util.h"
 
 #if defined(OS_ANDROID)
 #include <EGL/egl.h>
@@ -11,7 +11,7 @@
 #endif
 
 // This needs to be after the EGL includes
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/egl_util.h b/ui/gl/egl_util.h
index 71f471f..bf6a019 100644
--- a/ui/gfx/gl/egl_util.h
+++ b/ui/gl/egl_util.h
@@ -1,9 +1,10 @@
-// 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_EGL_UTIL_H_
-#define UI_GFX_GL_EGL_UTIL_H_
+#ifndef UI_GL_EGL_UTIL_H_
+#define UI_GL_EGL_UTIL_H_
+#pragma once
 
 namespace gfx {
 
@@ -12,4 +13,4 @@ const char* GetLastEGLErrorString();
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_EGL_UTIL_H_
+#endif  // UI_GL_EGL_UTIL_H_
diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index b01fea7..22ab46a 100755
--- a/ui/gfx/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -1056,18 +1056,18 @@ GLX_FUNCTIONS = [
 ]
 
 FUNCTION_SETS = [
-  [GL_FUNCTIONS, 'gl', ['../../../third_party/mesa/MesaLib/include/GL/glext.h',
-    '../../../third_party/khronos/GLES2/gl2ext.h'], []],
+  [GL_FUNCTIONS, 'gl', ['../../third_party/mesa/MesaLib/include/GL/glext.h',
+    '../../third_party/khronos/GLES2/gl2ext.h'], []],
   [OSMESA_FUNCTIONS, 'osmesa', [], []],
-  [EGL_FUNCTIONS, 'egl', ['../../../third_party/khronos/EGL/eglext.h'],
+  [EGL_FUNCTIONS, 'egl', ['../../third_party/khronos/EGL/eglext.h'],
     [
       'EGL_ANGLE_d3d_share_handle_client_buffer',
     ],
   ],
   [WGL_FUNCTIONS, 'wgl', [
-    '../../../third_party/mesa/MesaLib/include/GL/wglext.h'], []],
+    '../../third_party/mesa/MesaLib/include/GL/wglext.h'], []],
   [GLX_FUNCTIONS, 'glx', [
-    '../../../third_party/mesa/MesaLib/include/GL/glxext.h'], []],
+    '../../third_party/mesa/MesaLib/include/GL/glxext.h'], []],
 ]
 
 def GenerateHeader(file, functions, set_name, used_extension_functions):
@@ -1140,9 +1140,9 @@ def GenerateSource(file, functions, set_name, used_extension_functions):
   file.write('\n')
   file.write('#include <string>\n')
   file.write('#include "gpu/command_buffer/common/gles2_cmd_utils.h"\n')
-  file.write('#include "ui/gfx/gl/gl_bindings.h"\n')
-  file.write('#include "ui/gfx/gl/gl_context.h"\n')
-  file.write('#include "ui/gfx/gl/gl_implementation.h"\n')
+  file.write('#include "ui/gl/gl_bindings.h"\n')
+  file.write('#include "ui/gl/gl_context.h"\n')
+  file.write('#include "ui/gl/gl_implementation.h"\n')
 
   # Write definitions for booleans indicating which extensions are available.
   file.write('\n')
@@ -1332,7 +1332,7 @@ def GenerateMockSource(file, functions):
   file.write('\n')
   file.write('#include <string.h>\n')
   file.write('\n')
-  file.write('#include "ui/gfx/gl/gl_interface.h"\n')
+  file.write('#include "ui/gl/gl_interface.h"\n')
 
   file.write('\n')
   file.write('namespace gfx {\n')
diff --git a/ui/gfx/gl/gl.gyp b/ui/gl/gl.gyp
index 45fe1e2..87f9803 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -20,7 +20,7 @@
         '<(DEPTH)/ui/ui.gyp:ui',
       ],
       'variables': {
-        'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gl',
+        'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
       },
       'defines': [
         'GL_IMPLEMENTATION',
diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gl/gl_bindings.h
index 751c7af..625dac9 100644
--- a/ui/gfx/gl/gl_bindings.h
+++ b/ui/gl/gl_bindings.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef UI_GL_GL_BINDINGS_H_
+#define UI_GL_GL_BINDINGS_H_
+#pragma once
+
 // Includes the platform independent and platform dependent GL headers.
 // Only include this in cc files. It pulls in system headers, including
 // the X11 headers on linux, which define all kinds of macros that are
 // liable to cause conflicts.
 
-#ifndef UI_GFX_GL_GL_BINDINGS_H_
-#define UI_GFX_GL_GL_BINDINGS_H_
-#pragma once
-
 #include <GL/gl.h>
 #include <GL/glext.h>
 
-#include "build/build_config.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_export.h"
+#include "build/build_config.h"
+#include "ui/gl/gl_export.h"
 
 // The standard OpenGL native extension headers are also included.
 #if defined(OS_WIN)
@@ -102,4 +102,4 @@ void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_BINDINGS_H_
+#endif  // UI_GL_GL_BINDINGS_H_
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index eeae0d2..a2f6433 100644
--- a/ui/gfx/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -1,14 +1,14 @@
-// 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.
 
 
-#include "ui/gfx/gl/gl_bindings_skia_in_process.h"
+#include "ui/gl/gl_bindings_skia_in_process.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace {
 
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.h b/ui/gl/gl_bindings_skia_in_process.h
index 4ae208c..5bd356a 100644
--- a/ui/gfx/gl/gl_bindings_skia_in_process.h
+++ b/ui/gl/gl_bindings_skia_in_process.h
@@ -1,12 +1,12 @@
-// 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_BINDINGS_SKIA_IN_PROCESS_H_
-#define UI_GFX_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_
+#ifndef UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_
+#define UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_export.h"
+#include "ui/gl/gl_export.h"
 
 struct GrGLInterface;
 
@@ -16,7 +16,6 @@ namespace gfx {
 // creates a binding for skia-gpu to the in-process GL
 GL_EXPORT GrGLInterface* CreateInProcessSkiaGLBinding();
 
-}
-
-#endif  // UI_GFX_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_
+}  // namespace gfx
 
+#endif  // UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_
diff --git a/ui/gfx/gl/gl_context.cc b/ui/gl/gl_context.cc
index dc94b04..8652e25 100644
--- a/ui/gfx/gl/gl_context.cc
+++ b/ui/gl/gl_context.cc
@@ -8,11 +8,11 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/gl/gl_switches.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context.h b/ui/gl/gl_context.h
index 67fe57e..dc76c00 100644
--- a/ui/gfx/gl/gl_context.h
+++ b/ui/gl/gl_context.h
@@ -1,17 +1,17 @@
-// 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_H_
-#define UI_GFX_GL_GL_CONTEXT_H_
+#ifndef UI_GL_GL_CONTEXT_H_
+#define UI_GL_GL_CONTEXT_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_share_group.h"
-#include "ui/gfx/gl/gpu_preference.h"
+#include "ui/gl/gl_share_group.h"
+#include "ui/gl/gpu_preference.h"
 
 namespace gfx {
 
@@ -83,11 +83,13 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
   bool InitializeExtensionBindings();
 
  private:
-  scoped_refptr<GLShareGroup> share_group_;
   friend class base::RefCounted<GLContext>;
+
+  scoped_refptr<GLShareGroup> share_group_;
+
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_H_
+#endif  // UI_GL_GL_CONTEXT_H_
diff --git a/ui/gfx/gl/gl_context_android.cc b/ui/gl/gl_context_android.cc
index efae3ba..38d91e8 100644
--- a/ui/gfx/gl/gl_context_android.cc
+++ b/ui/gl/gl_context_android.cc
@@ -1,15 +1,15 @@
-// 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.
 
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context_egl.h"
-#include "ui/gfx/gl/gl_context_stub.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context_egl.h"
+#include "ui/gl/gl_context_stub.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc
index 46bb7ab..790baad 100644
--- a/ui/gfx/gl/gl_context_cgl.cc
+++ b/ui/gl/gl_context_cgl.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context_cgl.h"
+#include "ui/gl/gl_context_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_cgl.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_cgl.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_cgl.h b/ui/gl/gl_context_cgl.h
index a33e2ad..0331568 100644
--- a/ui/gfx/gl/gl_context_cgl.h
+++ b/ui/gl/gl_context_cgl.h
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context.h"
+#ifndef UI_GL_GL_CONTEXT_CGL_H_
+#define UI_GL_GL_CONTEXT_CGL_H_
+#pragma once
+
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
@@ -43,3 +47,5 @@ class GLContextCGL : public GLContext {
 };
 
 }  // namespace gfx
+
+#endif  // UI_GL_GL_CONTEXT_CGL_H_
diff --git a/ui/gfx/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc
index b41fea7..fa655a0 100644
--- a/ui/gfx/gl/gl_context_egl.cc
+++ b/ui/gl/gl_context_egl.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context_egl.h"
+#include "ui/gl/gl_context_egl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "third_party/angle/include/EGL/egl.h"
-#include "ui/gfx/gl/egl_util.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/egl_util.h"
+#include "ui/gl/gl_surface.h"
 
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 #if defined(USE_X11)
 extern "C" {
diff --git a/ui/gfx/gl/gl_context_egl.h b/ui/gl/gl_context_egl.h
index 7c8c62c..4e98da8 100644
--- a/ui/gfx/gl/gl_context_egl.h
+++ b/ui/gl/gl_context_egl.h
@@ -1,15 +1,15 @@
-// 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_EGL_H_
-#define UI_GFX_GL_GL_CONTEXT_EGL_H_
+#ifndef UI_GL_GL_CONTEXT_EGL_H_
+#define UI_GL_GL_CONTEXT_EGL_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 typedef void* EGLContext;
 typedef void* EGLDisplay;
@@ -46,4 +46,4 @@ class GLContextEGL : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_EGL_H_
+#endif  // UI_GL_GL_CONTEXT_EGL_H_
diff --git a/ui/gfx/gl/gl_context_glx.cc b/ui/gl/gl_context_glx.cc
index 8cb65db..af94040 100644
--- a/ui/gfx/gl/gl_context_glx.cc
+++ b/ui/gl/gl_context_glx.cc
@@ -6,15 +6,15 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "ui/gfx/gl/gl_context_glx.h"
+#include "ui/gl/gl_context_glx.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_glx.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_glx.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_glx.h b/ui/gl/gl_context_glx.h
index 9b35152..60155df 100644
--- a/ui/gfx/gl/gl_context_glx.h
+++ b/ui/gl/gl_context_glx.h
@@ -2,14 +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_CONTEXT_GLX_H_
-#define UI_GFX_GL_GL_CONTEXT_GLX_H_
+#ifndef UI_GL_GL_CONTEXT_GLX_H_
+#define UI_GL_GL_CONTEXT_GLX_H_
+#pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
@@ -44,4 +45,4 @@ class GLContextGLX : public GLContext {
 
 }  // namespace gfx
 
-#endif //UI_GFX_GL_GL_CONTEXT_GLX_H_
+#endif  // UI_GL_GL_CONTEXT_GLX_H_
diff --git a/ui/gfx/gl/gl_context_linux.cc b/ui/gl/gl_context_linux.cc
index 121abee..2b5d16f 100644
--- a/ui/gfx/gl/gl_context_linux.cc
+++ b/ui/gl/gl_context_linux.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context_egl.h"
-#include "ui/gfx/gl/gl_context_glx.h"
-#include "ui/gfx/gl/gl_context_osmesa.h"
-#include "ui/gfx/gl/gl_context_stub.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_glx.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context_egl.h"
+#include "ui/gl/gl_context_glx.h"
+#include "ui/gl/gl_context_osmesa.h"
+#include "ui/gl/gl_context_stub.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_glx.h"
+#include "ui/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_surface_stub.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_mac.mm b/ui/gl/gl_context_mac.mm
index 2e556e0..06829be 100644
--- a/ui/gfx/gl/gl_context_mac.mm
+++ b/ui/gl/gl_context_mac.mm
@@ -9,16 +9,16 @@
 #include "base/memory/scoped_generic_obj.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context_cgl.h"
-#include "ui/gfx/gl/gl_context_osmesa.h"
-#include "ui/gfx/gl/gl_context_stub.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context_cgl.h"
+#include "ui/gl/gl_context_osmesa.h"
+#include "ui/gl/gl_context_stub.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(USE_AURA)
-#include "ui/gfx/gl/gl_context_nsview.h"
+#include "ui/gl/gl_context_nsview.h"
 #endif
 
 namespace {
diff --git a/ui/gfx/gl/gl_context_nsview.h b/ui/gl/gl_context_nsview.h
index 674df63..3c54157f 100644
--- a/ui/gfx/gl/gl_context_nsview.h
+++ b/ui/gl/gl_context_nsview.h
@@ -1,16 +1,16 @@
-// 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 {
 
@@ -45,4 +45,4 @@ class GLContextNSView : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_NSVIEW_H_
+#endif  // UI_GL_GL_CONTEXT_NSVIEW_H_
diff --git a/ui/gfx/gl/gl_context_nsview.mm b/ui/gl/gl_context_nsview.mm
index 03e3c03..898bf01 100644
--- a/ui/gfx/gl/gl_context_nsview.mm
+++ b/ui/gl/gl_context_nsview.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context_nsview.h"
+#include "ui/gl/gl_context_nsview.h"
 
 #include <vector>
 
@@ -11,7 +11,7 @@
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_surface_nsview.h"
+#include "ui/gl/gl_surface_nsview.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_osmesa.cc b/ui/gl/gl_context_osmesa.cc
index b7a7618..1787ef9 100644
--- a/ui/gfx/gl/gl_context_osmesa.cc
+++ b/ui/gl/gl_context_osmesa.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <GL/osmesa.h>
+#include "ui/gl/gl_context_osmesa.h"
 
-#include "ui/gfx/gl/gl_context_osmesa.h"
+#include <GL/osmesa.h>
 
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_osmesa.h b/ui/gl/gl_context_osmesa.h
index 2e21c4b..cef3fd9 100644
--- a/ui/gfx/gl/gl_context_osmesa.h
+++ b/ui/gl/gl_context_osmesa.h
@@ -2,13 +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_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 {
 
@@ -41,4 +43,4 @@ class GLContextOSMesa : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_OSMESA_H_
+#endif  // UI_GL_GL_CONTEXT_OSMESA_H_
diff --git a/ui/gfx/gl/gl_context_stub.cc b/ui/gl/gl_context_stub.cc
index 6361124..d1364c4 100644
--- a/ui/gfx/gl/gl_context_stub.cc
+++ b/ui/gl/gl_context_stub.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_context_stub.h"
+#include "ui/gl/gl_context_stub.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_stub.h b/ui/gl/gl_context_stub.h
index f9e81835..a602f4b 100644
--- a/ui/gfx/gl/gl_context_stub.h
+++ b/ui/gl/gl_context_stub.h
@@ -2,11 +2,11 @@
 // 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_STUB_H_
-#define UI_GFX_GL_GL_CONTEXT_STUB_H_
+#ifndef UI_GL_GL_CONTEXT_STUB_H_
+#define UI_GL_GL_CONTEXT_STUB_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
@@ -35,4 +35,4 @@ class GL_EXPORT GLContextStub : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_STUB_H_
+#endif  // UI_GL_GL_CONTEXT_STUB_H_
diff --git a/ui/gfx/gl/gl_context_wgl.cc b/ui/gl/gl_context_wgl.cc
index d977302..e6b8307 100644
--- a/ui/gfx/gl/gl_context_wgl.cc
+++ b/ui/gl/gl_context_wgl.cc
@@ -4,13 +4,13 @@
 
 // This file implements the GLContextWGL and PbufferGLContext classes.
 
-#include "ui/gfx/gl/gl_context_wgl.h"
+#include "ui/gl/gl_context_wgl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_wgl.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_wgl.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_context_wgl.h b/ui/gl/gl_context_wgl.h
index 4d20bc7..1fc6177 100644
--- a/ui/gfx/gl/gl_context_wgl.h
+++ b/ui/gl/gl_context_wgl.h
@@ -1,14 +1,15 @@
-// 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_WGL_H_
-#define UI_GFX_GL_GL_CONTEXT_WGL_H_
+#ifndef UI_GL_GL_CONTEXT_WGL_H_
+#define UI_GL_GL_CONTEXT_WGL_H_
+#pragma once
 
 #include <string>
 
-#include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
@@ -39,4 +40,4 @@ class GLContextWGL : public GLContext {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_WGL_H_
+#endif  // UI_GL_GL_CONTEXT_WGL_H_
diff --git a/ui/gfx/gl/gl_context_win.cc b/ui/gl/gl_context_win.cc
index 65ce32d..c42daa9 100644
--- a/ui/gfx/gl/gl_context_win.cc
+++ b/ui/gl/gl_context_win.cc
@@ -1,22 +1,22 @@
-// 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.
 
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context_egl.h"
-#include "ui/gfx/gl/gl_context_osmesa.h"
-#include "ui/gfx/gl/gl_context_stub.h"
-#include "ui/gfx/gl/gl_context_wgl.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
-#include "ui/gfx/gl/gl_surface_wgl.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context_egl.h"
+#include "ui/gl/gl_context_osmesa.h"
+#include "ui/gl/gl_context_stub.h"
+#include "ui/gl/gl_context_wgl.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_surface_stub.h"
+#include "ui/gl/gl_surface_wgl.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_export.h b/ui/gl/gl_export.h
index a9cbe98..30e6979 100644
--- a/ui/gfx/gl/gl_export.h
+++ b/ui/gl/gl_export.h
@@ -1,9 +1,9 @@
-// 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_EXPORT_H_
-#define UI_GFX_GL_GL_EXPORT_H_
+#ifndef UI_GL_GL_EXPORT_H_
+#define UI_GL_GL_EXPORT_H_
 #pragma once
 
 #if defined(COMPONENT_BUILD)
@@ -23,4 +23,4 @@
 #define GL_EXPORT
 #endif
 
-#endif  // UI_GFX_GL_GL_EXPORT_H_
+#endif  // UI_GL_GL_EXPORT_H_
diff --git a/ui/gfx/gl/gl_fence.cc b/ui/gl/gl_fence.cc
index ae09115..82cdf30 100644
--- a/ui/gfx/gl/gl_fence.cc
+++ b/ui/gl/gl_fence.cc
@@ -1,12 +1,12 @@
-// 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.
 
-#include "ui/gfx/gl/gl_fence.h"
+#include "ui/gl/gl_fence.h"
 
 #include "base/compiler_specific.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
 
 namespace {
 
diff --git a/ui/gfx/gl/gl_fence.h b/ui/gl/gl_fence.h
index c901707..62a7116 100644
--- a/ui/gfx/gl/gl_fence.h
+++ b/ui/gl/gl_fence.h
@@ -1,13 +1,13 @@
-// 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_FENCE_H_
-#define UI_GFX_GL_GL_FENCE_H_
+#ifndef UI_GL_GL_FENCE_H_
+#define UI_GL_GL_FENCE_H_
+#pragma once
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_export.h"
+#include "ui/gl/gl_export.h"
 
 namespace gfx {
 
@@ -28,4 +28,4 @@ class GL_EXPORT GLFence {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_FENCE_H_
+#endif  // UI_GL_GL_FENCE_H_
diff --git a/ui/gfx/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
index d225d57..0a10f22 100644
--- a/ui/gfx/gl/gl_implementation.cc
+++ b/ui/gl/gl_implementation.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 #include <algorithm>
 #include <string>
diff --git a/ui/gfx/gl/gl_implementation.h b/ui/gl/gl_implementation.h
index cd27dff..9ee1f2d 100644
--- a/ui/gfx/gl/gl_implementation.h
+++ b/ui/gl/gl_implementation.h
@@ -1,9 +1,9 @@
-// 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_IMPLEMENTATION_H_
-#define UI_GFX_GL_GL_IMPLEMENTATION_H_
+#ifndef UI_GL_GL_IMPLEMENTATION_H_
+#define UI_GL_GL_IMPLEMENTATION_H_
 #pragma once
 
 #include <string>
@@ -11,8 +11,8 @@
 
 #include "base/native_library.h"
 #include "build/build_config.h"
-#include "ui/gfx/gl/gl_export.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_export.h"
+#include "ui/gl/gl_switches.h"
 
 namespace gfx {
 
@@ -83,4 +83,4 @@ void* GetGLProcAddress(const char* name);
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_IMPLEMENTATION_H_
+#endif  // UI_GL_GL_IMPLEMENTATION_H_
diff --git a/ui/gfx/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc
index f1aa6dd..254c037 100644
--- a/ui/gfx/gl/gl_implementation_android.cc
+++ b/ui/gl/gl_implementation_android.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gl/gl_implementation_linux.cc
index 378321a..35f68ac 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gl/gl_implementation_linux.cc
@@ -11,9 +11,9 @@
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 
 namespace gfx {
 namespace {
diff --git a/ui/gfx/gl/gl_implementation_mac.cc b/ui/gl/gl_implementation_mac.cc
index c2ba2e2..f05e3eb9 100644
--- a/ui/gfx/gl/gl_implementation_mac.cc
+++ b/ui/gl/gl_implementation_mac.cc
@@ -1,16 +1,16 @@
-// 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.
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/threading/thread_restrictions.h"
 #include "base/mac/foundation_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "base/threading/thread_restrictions.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 namespace {
diff --git a/ui/gfx/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index 25122de..7625b20 100644
--- a/ui/gfx/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -16,8 +16,8 @@
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 #if defined(ENABLE_SWIFTSHADER)
 #include "software_renderer.h"
diff --git a/ui/gfx/gl/gl_interface.cc b/ui/gl/gl_interface.cc
index a671973..0cb61e7 100644
--- a/ui/gfx/gl/gl_interface.cc
+++ b/ui/gl/gl_interface.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "ui/gfx/gl/gl_interface.h"
+#include "ui/gl/gl_interface.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_interface.h b/ui/gl/gl_interface.h
index e5f1b46..db120b6 100644
--- a/ui/gfx/gl/gl_interface.h
+++ b/ui/gl/gl_interface.h
@@ -2,22 +2,21 @@
 // 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);
 
@@ -638,4 +637,4 @@ class GL_EXPORT GLInterface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_INTERFACE_H_
+#endif  // UI_GL_GL_INTERFACE_H_
diff --git a/ui/gfx/gl/gl_share_group.cc b/ui/gl/gl_share_group.cc
index 21c175e..8ab0cc7 100644
--- a/ui/gfx/gl/gl_share_group.cc
+++ b/ui/gl/gl_share_group.cc
@@ -1,10 +1,10 @@
-// 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.
 
-#include "ui/gfx/gl/gl_share_group.h"
+#include "ui/gl/gl_share_group.h"
 
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_share_group.h b/ui/gl/gl_share_group.h
index 8df2fb2..2b39ba5 100644
--- a/ui/gfx/gl/gl_share_group.h
+++ b/ui/gl/gl_share_group.h
@@ -1,16 +1,16 @@
-// 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_SHARE_GROUP_H_
-#define UI_GFX_GL_GL_SHARE_GROUP_H_
+#ifndef UI_GL_GL_SHARE_GROUP_H_
+#define UI_GL_GL_SHARE_GROUP_H_
 #pragma once
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_export.h"
+#include "ui/gl/gl_export.h"
 
 namespace gfx {
 
@@ -36,15 +36,17 @@ class GL_EXPORT GLShareGroup : public base::RefCounted<GLShareGroup> {
 
  private:
   friend class base::RefCounted<GLShareGroup>;
+
   ~GLShareGroup();
 
   // References to GLContext are by raw pointer to avoid a reference count
   // cycle.
   typedef std::set<GLContext*> ContextSet;
   ContextSet contexts_;
+
   DISALLOW_COPY_AND_ASSIGN(GLShareGroup);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SHARE_GROUP_H_
+#endif  // UI_GL_GL_SHARE_GROUP_H_
diff --git a/ui/gfx/gl/gl_surface.cc b/ui/gl/gl_surface.cc
index 401ecb2..cc6c3b3 100644
--- a/ui/gfx/gl/gl_surface.cc
+++ b/ui/gl/gl_surface.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 #include <algorithm>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface.h b/ui/gl/gl_surface.h
index 92a2d39..efa4f23 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_
diff --git a/ui/gfx/gl/gl_surface_android.cc b/ui/gl/gl_surface_android.cc
index 7f66fd8..5500ba0 100644
--- a/ui/gfx/gl/gl_surface_android.cc
+++ b/ui/gl/gl_surface_android.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_android.h"
+#include "ui/gl/gl_surface_android.h"
 
 #include <EGL/egl.h>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/egl_util.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/android_native_window.h"
+#include "ui/gl/android_native_window.h"
+#include "ui/gl/egl_util.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_android.h b/ui/gl/gl_surface_android.h
index d46d9fd..904274e 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_
diff --git a/ui/gfx/gl/gl_surface_cgl.cc b/ui/gl/gl_surface_cgl.cc
index a453b5a..4f2fba2 100644
--- a/ui/gfx/gl/gl_surface_cgl.cc
+++ b/ui/gl/gl_surface_cgl.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_cgl.h"
+#include "ui/gl/gl_surface_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_cgl.h b/ui/gl/gl_surface_cgl.h
index e6a6d06..00886cf 100644
--- a/ui/gfx/gl/gl_surface_cgl.h
+++ b/ui/gl/gl_surface_cgl.h
@@ -2,11 +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_CGL_H_
-#define UI_GFX_GL_GL_SURFACE_CGL_H_
+#ifndef UI_GL_GL_SURFACE_CGL_H_
+#define UI_GL_GL_SURFACE_CGL_H_
+#pragma once
 
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -52,4 +53,4 @@ class GL_EXPORT NoOpGLSurfaceCGL : public GLSurfaceCGL {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_CGL_H_
+#endif  // UI_GL_GL_SURFACE_CGL_H_
diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 99a689b..f3d3e0f 100644
--- a/ui/gfx/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_egl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -12,8 +12,8 @@
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
 #endif
-#include "ui/gfx/gl/egl_util.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/egl_util.h"
+#include "ui/gl/gl_context.h"
 
 #if defined(OS_ANDROID)
 #include <EGL/egl.h>
@@ -21,7 +21,7 @@
 
 // This header must come after the above third-party include, as
 // it brings in #defines that cause conflicts.
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 #if defined(USE_X11)
 extern "C" {
diff --git a/ui/gfx/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h
index a4a010b..423ef06 100644
--- a/ui/gfx/gl/gl_surface_egl.h
+++ b/ui/gl/gl_surface_egl.h
@@ -2,8 +2,8 @@
 // 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_EGL_H_
-#define UI_GFX_GL_GL_SURFACE_EGL_H_
+#ifndef UI_GL_GL_SURFACE_EGL_H_
+#define UI_GL_GL_SURFACE_EGL_H_
 #pragma once
 
 #if defined(OS_WIN)
@@ -11,9 +11,9 @@
 #endif
 
 #include "base/compiler_specific.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 typedef void* EGLConfig;
 typedef void* EGLDisplay;
@@ -103,4 +103,4 @@ class GL_EXPORT PbufferGLSurfaceEGL : public GLSurfaceEGL {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_EGL_H_
+#endif  // UI_GL_GL_SURFACE_EGL_H_
diff --git a/ui/gfx/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 1440e5c..ba8ce92 100644
--- a/ui/gfx/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -6,7 +6,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "ui/gfx/gl/gl_surface_glx.h"
+#include "ui/gl/gl_surface_glx.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -15,8 +15,8 @@ extern "C" {
 #include "base/process_util.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
index bad9cd7..ac4655e 100644
--- a/ui/gfx/gl/gl_surface_glx.h
+++ b/ui/gl/gl_surface_glx.h
@@ -2,16 +2,16 @@
 // 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_GLX_H_
-#define UI_GFX_GL_GL_SURFACE_GLX_H_
-
-#include "ui/gfx/gl/gl_surface.h"
+#ifndef UI_GL_GL_SURFACE_GLX_H_
+#define UI_GL_GL_SURFACE_GLX_H_
+#pragma once
 
 #include "base/compiler_specific.h"
 #include "ui/base/x/x11_util.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"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -66,6 +66,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
  private:
   void* config_;
   gfx::Size size_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
 };
 
@@ -88,9 +89,10 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
   gfx::Size size_;
   void* config_;
   XID pbuffer_;
+
   DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_GLX_H_
+#endif  // UI_GL_GL_SURFACE_GLX_H_
diff --git a/ui/gfx/gl/gl_surface_linux.cc b/ui/gl/gl_surface_linux.cc
index 23164b9..a7dbdf0 100644
--- a/ui/gfx/gl/gl_surface_linux.cc
+++ b/ui/gl/gl_surface_linux.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_glx.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_glx.h"
+#include "ui/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_surface_stub.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc
index 30ad6b7..0431628 100644
--- a/ui/gfx/gl/gl_surface_mac.cc
+++ b/ui/gl/gl_surface_mac.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_cgl.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_cgl.h"
+#include "ui/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_surface_stub.h"
 
 #if defined(USE_AURA)
-#include "ui/gfx/gl/gl_surface_nsview.h"
+#include "ui/gl/gl_surface_nsview.h"
 #endif
 
 namespace gfx {
diff --git a/ui/gfx/gl/gl_surface_nsview.h b/ui/gl/gl_surface_nsview.h
index 67b4e26..440458b 100644
--- a/ui/gfx/gl/gl_surface_nsview.h
+++ b/ui/gl/gl_surface_nsview.h
@@ -2,12 +2,13 @@
 // 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_NSVIEW_H_
-#define UI_GFX_GL_GL_SURFACE_NSVIEW_H_
+#ifndef UI_GL_GL_SURFACE_NSVIEW_H_
+#define UI_GL_GL_SURFACE_NSVIEW_H_
+#pragma once
 
 #include "base/compiler_specific.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -43,4 +44,4 @@ class GLSurfaceNSView : public GLSurface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_NSVIEW_H_
+#endif  // UI_GL_GL_SURFACE_NSVIEW_H_
diff --git a/ui/gfx/gl/gl_surface_nsview.mm b/ui/gl/gl_surface_nsview.mm
index 455be56..ded0719 100644
--- a/ui/gfx/gl/gl_surface_nsview.mm
+++ b/ui/gl/gl_surface_nsview.mm
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_nsview.h"
+#include "ui/gl/gl_surface_nsview.h"
 
 #import <AppKit/NSOpenGL.h>
 #import <AppKit/NSView.h>
 
-#include "ui/gfx/gl/gl_context_nsview.h"
+#include "ui/gl/gl_context_nsview.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_osmesa.cc b/ui/gl/gl_surface_osmesa.cc
index f416432..a1fd360 100644
--- a/ui/gfx/gl/gl_surface_osmesa.cc
+++ b/ui/gl/gl_surface_osmesa.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_osmesa.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface_osmesa.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h
index 8d8c224..ab3feec 100644
--- a/ui/gfx/gl/gl_surface_osmesa.h
+++ b/ui/gl/gl_surface_osmesa.h
@@ -2,13 +2,13 @@
 // 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_OSMESA_H_
-#define UI_GFX_GL_GL_SURFACE_OSMESA_H_
+#ifndef UI_GL_GL_SURFACE_OSMESA_H_
+#define UI_GL_GL_SURFACE_OSMESA_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -42,4 +42,4 @@ class GL_EXPORT GLSurfaceOSMesa : public GLSurface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_OSMESA_H_
+#endif  // UI_GL_GL_SURFACE_OSMESA_H_
diff --git a/ui/gfx/gl/gl_surface_stub.cc b/ui/gl/gl_surface_stub.cc
index 15ec1b2..a27d2af 100644
--- a/ui/gfx/gl/gl_surface_stub.cc
+++ b/ui/gl/gl_surface_stub.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_stub.h"
+#include "ui/gl/gl_surface_stub.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_stub.h b/ui/gl/gl_surface_stub.h
index 404d699..86bbd15 100644
--- a/ui/gfx/gl/gl_surface_stub.h
+++ b/ui/gl/gl_surface_stub.h
@@ -2,11 +2,11 @@
 // 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_STUB_H_
-#define UI_GFX_GL_GL_SURFACE_STUB_H_
+#ifndef UI_GL_GL_SURFACE_STUB_H_
+#define UI_GL_GL_SURFACE_STUB_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -31,4 +31,4 @@ class GL_EXPORT GLSurfaceStub : public GLSurface {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_STUB_H_
+#endif  // UI_GL_GL_SURFACE_STUB_H_
diff --git a/ui/gfx/gl/gl_surface_wgl.cc b/ui/gl/gl_surface_wgl.cc
index 3d7571d..a72c825 100644
--- a/ui/gfx/gl/gl_surface_wgl.cc
+++ b/ui/gl/gl_surface_wgl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface_wgl.h"
+#include "ui/gl/gl_surface_wgl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_surface_wgl.h b/ui/gl/gl_surface_wgl.h
index 4082a26..6e4f0cd 100644
--- a/ui/gfx/gl/gl_surface_wgl.h
+++ b/ui/gl/gl_surface_wgl.h
@@ -2,11 +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_WGL_H_
-#define UI_GFX_GL_GL_SURFACE_WGL_H_
+#ifndef UI_GL_GL_SURFACE_WGL_H_
+#define UI_GL_GL_SURFACE_WGL_H_
+#pragma once
 
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -73,4 +74,4 @@ class PbufferGLSurfaceWGL : public GLSurfaceWGL {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_WGL_H_
+#endif  // UI_GL_GL_SURFACE_WGL_H_
diff --git a/ui/gfx/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc
index 73f074d..ae55568 100644
--- a/ui/gfx/gl/gl_surface_win.cc
+++ b/ui/gl/gl_surface_win.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
-#include "ui/gfx/gl/gl_surface_stub.h"
-#include "ui/gfx/gl/gl_surface_wgl.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_osmesa.h"
+#include "ui/gl/gl_surface_stub.h"
+#include "ui/gl/gl_surface_wgl.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_switches.cc b/ui/gl/gl_switches.cc
index 0e29f33..d30c958 100644
--- a/ui/gfx/gl/gl_switches.cc
+++ b/ui/gl/gl_switches.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gl/gl_switches.h b/ui/gl/gl_switches.h
index 922c58b..ffda704 100644
--- a/ui/gfx/gl/gl_switches.h
+++ b/ui/gl/gl_switches.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Defines all the command-line switches used by ui/gfx/gl.
-
-#ifndef UI_GFX_GL_GL_SWITCHES_H_
-#define UI_GFX_GL_GL_SWITCHES_H_
+#ifndef UI_GL_GL_SWITCHES_H_
+#define UI_GL_GL_SWITCHES_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_export.h"
+// Defines all the command-line switches used by ui/gl.
+
+#include "ui/gl/gl_export.h"
 
 namespace gfx {
 
@@ -36,4 +36,4 @@ GL_EXPORT extern const char kTestGLLib[];
 
 }  // namespace switches
 
-#endif  // UI_GFX_GL_GL_SWITCHES_H_
+#endif  // UI_GL_GL_SWITCHES_H_
diff --git a/ui/gfx/gl/gpu_preference.h b/ui/gl/gpu_preference.h
index 189ed3d..54f814a 100644
--- a/ui/gfx/gl/gpu_preference.h
+++ b/ui/gl/gpu_preference.h
@@ -1,9 +1,9 @@
-// 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_GPU_PREFERENCE_H_
-#define UI_GFX_GL_GPU_PREFERENCE_H_
+#ifndef UI_GL_GPU_PREFERENCE_H_
+#define UI_GL_GPU_PREFERENCE_H_
 #pragma once
 
 namespace gfx {
@@ -22,4 +22,4 @@ enum GpuPreference {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GPU_PREFERENCE_H_
+#endif  // UI_GL_GPU_PREFERENCE_H_
diff --git a/ui/gfx/gl/scoped_make_current.cc b/ui/gl/scoped_make_current.cc
index 6939861..54dac6d 100644
--- a/ui/gfx/gl/scoped_make_current.cc
+++ b/ui/gl/scoped_make_current.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "ui/gfx/gl/scoped_make_current.h"
+#include "ui/gl/scoped_make_current.h"
 
 #include "base/logging.h"
 
diff --git a/ui/gfx/gl/scoped_make_current.h b/ui/gl/scoped_make_current.h
index d0d74f7..3c336f3 100644
--- a/ui/gfx/gl/scoped_make_current.h
+++ b/ui/gl/scoped_make_current.h
@@ -1,13 +1,13 @@
-// 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_SCOPED_MAKE_CURRENT_H_
-#define UI_GFX_GL_SCOPED_MAKE_CURRENT_H_
+#ifndef UI_GL_SCOPED_MAKE_CURRENT_H_
+#define UI_GL_SCOPED_MAKE_CURRENT_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -24,10 +24,10 @@ class GL_EXPORT ScopedMakeCurrent {
   scoped_refptr<GLContext> context_;
   scoped_refptr<GLSurface> surface_;
   bool succeeded_;
+
   DISALLOW_COPY_AND_ASSIGN(ScopedMakeCurrent);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_SCOPED_MAKE_CURRENT_H_
-
+#endif  // UI_GL_SCOPED_MAKE_CURRENT_H_
diff --git a/ui/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc
index 5f2f12f..5714420 100644
--- a/ui/surface/accelerated_surface_mac.cc
+++ b/ui/surface/accelerated_surface_mac.cc
@@ -6,12 +6,12 @@
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
-#include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/rect.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/gl/scoped_make_current.h"
 #include "ui/surface/io_surface_support_mac.h"
 
 AcceleratedSurface::AcceleratedSurface()
diff --git a/ui/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h
index fc37640..73a90fc 100644
--- a/ui/surface/accelerated_surface_mac.h
+++ b/ui/surface/accelerated_surface_mac.h
@@ -11,11 +11,11 @@
 #include "base/callback.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/gl/gpu_preference.h"
 #include "ui/surface/surface_export.h"
 #include "ui/surface/transport_dib.h"
 
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index ee1b6c6..4f2bb0e 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -25,7 +25,7 @@
 #include "base/tracked_objects.h"
 #include "base/win/wrapped_window_proc.h"
 #include "ui/base/win/hwnd_util.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 namespace {
 
diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp
index af52fef..4858b54 100644
--- a/ui/surface/surface.gyp
+++ b/ui/surface/surface.gyp
@@ -24,7 +24,7 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
       ],
       'sources': [