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

media/tools/shader_bench/shader_bench.cc

 // 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 <stdio.h>
+#include <stdlib.h>
 #include <deque>
 #include <ostream>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "media/base/video_frame.h"
 #include "media/tools/shader_bench/cpu_color_painter.h"
 #include "media/tools/shader_bench/gpu_color_painter.h"
 #include "media/tools/shader_bench/painter.h"
 #include "media/tools/shader_bench/window.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 static const int kNumFramesToPaint = 500;
 static base::TimeTicks g_start_;
 static base::TimeTicks g_end_;
 
 long CalculateYUVFrameSize(FILE* file_handle, int num_frames) {
@@ skipping 119 matching lines @@
     scoped_ptr<GPUPainter> painter(painters[i].painter);
     painter->LoadFrames(&frames);
     painter->SetGLContext(surface, context);
     painter->Initialize(width, height);
     printf("Running %s tests...", painters[i].name);
     RunTest(window.get(), painter.get());
   }
 
   return 0;
 }