6 files changed, 10 insertions, 10 deletions
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;