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

content/common/gpu/media/video_decode_accelerator_unittest.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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11, EGL, and GLES2.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
 //   to be written sequentially and wait for the decode client to see certain
@@ skipping 34 matching lines @@
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #else  // OS_WIN
 #include "content/common/gpu/media/omx_video_decode_accelerator.h"
 #endif  // defined(OS_WIN)
 
 #include "third_party/angle/include/EGL/egl.h"
 
 #if defined(OS_WIN)
-#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/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
 #else  // OS_WIN
 #include "third_party/angle/include/GLES2/gl2.h"
 #endif  // OS_WIN
 
 using media::VideoDecodeAccelerator;
 
 namespace {
 
 // Values optionally filled in from flags; see main() below.
 // The syntax of this variable is:
@@ skipping 1097 matching lines @@
         gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
     scoped_refptr<gfx::GLContext> context(
         gfx::GLContext::CreateGLContext(NULL, surface.get(),
                                         gfx::PreferIntegratedGpu));
     context->MakeCurrent(surface.get());
   }
   DXVAVideoDecodeAccelerator::PreSandboxInitialization();
 #endif  // OS_WIN
   return RUN_ALL_TESTS();
 }