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

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 169 matching lines @@
         '../ipc/ipc.gyp:test_support_ipc',
         '../jingle/jingle.gyp:jingle_glue_test_util',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libvpx/libvpx.gyp:libvpx',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 279 matching lines @@
               'include_dirs': [
                 '<(DEPTH)/third_party/openmax/il',
               ],
             }],
             ['OS=="win"', {
               'target_name': 'dxva_video_decode_accelerator_unittest',
               'dependencies': [
                 '../third_party/angle/src/build_angle.gyp:libEGL',
                 '../third_party/angle/src/build_angle.gyp:libGLESv2',
                 '../media/media.gyp:media',
-                '../ui/gfx/gl/gl.gyp:gl',
+                '../ui/gl/gl.gyp:gl',
                 '../ui/ui.gyp:ui',
               ],
               'conditions': [
                 ['win_use_allocator_shim==1', {
                   'dependencies': [
                     '../base/allocator/allocator.gyp:allocator',
                   ],
                 }],
               ],
             }],
@@ skipping 10 matching lines @@
           ],
           'sources': [
             'common/gpu/media/video_decode_accelerator_unittest.cc',
           ],
         }
       ],
     },
    ],
   ],
 }