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

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
@@ skipping 820 matching lines @@
     }],
     ['OS == "win" or toolkit_uses_gtk == 1', {
       'targets': [
         {
           'target_name': 'shader_bench',
           'type': 'executable',
           'dependencies': [
             'media',
             'yuv_convert',
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
             'tools/shader_bench/shader_bench.cc',
             'tools/shader_bench/cpu_color_painter.cc',
             'tools/shader_bench/cpu_color_painter.h',
             'tools/shader_bench/gpu_color_painter.cc',
             'tools/shader_bench/gpu_color_painter.h',
             'tools/shader_bench/gpu_painter.cc',
             'tools/shader_bench/gpu_painter.h',
             'tools/shader_bench/painter.cc',
@@ skipping 23 matching lines @@
         },
       ],
     }],
     ['OS == "linux" and target_arch != "arm"', {
       'targets': [
         {
           'target_name': 'tile_render_bench',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'libraries': [
             '-lGL',
             '-ldl',
           ],
           'sources': [
             'tools/tile_render_bench/tile_render_bench.cc',
           ],
         },
       ],
     }],
     ['os_posix == 1 and OS != "mac" and OS != "android"', {
       'targets': [
         {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
             'yuv_convert',
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'link_settings': {
             'libraries': [
               '-ldl',
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'sources': [
@@ skipping 144 matching lines @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }