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

media/tools/tile_render_bench/tile_render_bench.cc

-// 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.
 
 // This tool is used to benchmark the technique of using tiles to render a
 // large tecture. This tool runs with different tile sizes so that developer
 // can determine the right dimensions for the tiles.
 
 #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;
 
 // The smallest texture size we're trying.
 static const int kEndSize = 16;
 
 // Factor for dividing the size from one step to another.
 static const int kSizeFactor = 2;
 
@@ skipping 204 matching lines @@
 
   // Cleanup GL.
   glXMakeCurrent(g_display, 0, NULL);
   glXDestroyContext(g_display, g_gl_context);
 
   // Destroy window and display.
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   return 0;
 }