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

ui/surface/surface.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,
   },
 
   'target_defaults': {
     'conditions': [
       ['use_x11 == 1', {
         'include_dirs': [
           '<(DEPTH)/third_party/angle/include',
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'surface',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
       ],
       'sources': [
         'accelerated_surface_mac.cc',
         'accelerated_surface_mac.h',
         'accelerated_surface_win.cc',
         'accelerated_surface_win.h',
         'io_surface_support_mac.cc',
         'io_surface_support_mac.h',
         'surface_export.h',
@@ skipping 10 matching lines @@
         ['use_aura==1', {
           'sources/': [
             ['exclude', 'accelerated_surface_win.cc'],
             ['exclude', 'accelerated_surface_win.h'],
           ],
         }],
       ],
     },
   ],
 }