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

gpu/tools/compositor_model_bench/render_tree.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.
 
 // Data structures for representing parts of Chromium's composited layer tree
 // and a function to load it from the JSON configuration file
 
 #ifndef GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_
 #define GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "gpu/tools/compositor_model_bench/shaders.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"
 
 // These are fairly arbitrary values based on how big my actual browser
 // window was.
 const int WINDOW_WIDTH = 1609;
 const int WINDOW_HEIGHT = 993;
 
 struct Tile {
   int x;
   int y;
   int texID;
@@ skipping 173 matching lines @@
   virtual void BeginVisitCCNode(CCNode* v);
   virtual void EndVisitRenderNode(RenderNode* v);
   virtual void EndVisitContentLayerNode(ContentLayerNode* v);
   virtual void EndVisitCCNode(CCNode* v);
 };
 
 RenderNode* BuildRenderTreeFromFile(const FilePath& path);
 
 #endif  // GPU_TOOLS_COMPOSITOR_MODEL_BENCH_RENDER_TREE_H_