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

media/tools/tile_render_bench/tile_render_bench.cc

Index: media/tools/tile_render_bench/tile_render_bench.cc
diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc
index 1f19b408776b85ef54138b18fb90a432b0a65aee..c067ca361e936b30fe74fed60ea3987e7f8e0103 100644
--- a/media/tools/tile_render_bench/tile_render_bench.cc
+++ b/media/tools/tile_render_bench/tile_render_bench.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/keysym.h>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.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"
 
 // Initial size of the window and the texture.
 static const int kStartSize = 1024;