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

gpu/demos/demos.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.
 
 {
   'includes': [
     '../../ppapi/ppapi.gypi',
   ],
   'variables': {
     'chromium_code': 1,
@@ skipping 26 matching lines @@
     {
       'target_name': 'gpu_demo_framework_exe',
       'type': 'static_library',
       'dependencies': [
         'gpu_demo_framework',
         '../gpu.gyp:command_buffer_client',
         '../gpu.gyp:command_buffer_service',
         '../gpu.gyp:gles2_implementation',
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../ui/gfx/gl/gl.gyp:gl',
+        '../../ui/gl/gl.gyp:gl',
         '../../ui/ui.gyp:ui',
       ],
       'sources': [
         'framework/main_exe.cc',
         'framework/window.cc',
         'framework/window_linux.cc',
         'framework/window_mac.mm',
         'framework/window_win.cc',
         'framework/window.h',
       ],
@@ skipping 263 matching lines @@
             'gles2_book/example.h',
             'gles2_book/demo_texture_wrap.cc',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h',
           ],
         },
       ],
     }],
   ],
 }