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

gpu/demos/framework/main_exe.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.
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "gpu/demos/framework/window.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_surface.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif  // TOOLKIT_GTK
 
 namespace {
 static const int kWindowWidth = 512;
 static const int kWindowHeight = 512;
 }  // namespace.
 
@@ skipping 10 matching lines @@
 
   gfx::GLSurface::InitializeOneOff();
 
   gpu::demos::Window window;
   CHECK(window.Init(kWindowWidth, kWindowHeight));
 
   window.MainLoop();
   return EXIT_SUCCESS;
 }