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

gpu/gpu_common.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': [
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           # For GLES2/gl2.h
           '<(DEPTH)/third_party/khronos',
         ],
       },
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
       ],
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
     },
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation_client_side_arrays',
       'type': '<(component)',
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
         'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1',
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           # For GLES2/gl2.h
           '<(DEPTH)/third_party/khronos',
         ],
       },
       'sources': [
@@ skipping 66 matching lines @@
     {
       'target_name': 'gpu_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gmock.gyp:gmock_main',
         '../testing/gtest.gyp:gtest',
         '../third_party/angle/src/build_angle.gyp:translator_glsl',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',
         'command_buffer_common',
         'command_buffer_service',
         'gpu',
         'gpu_unittest_utils',
         'gles2_implementation_client_side_arrays',
         'gles2_cmd_helper',
       ],
@@ skipping 93 matching lines @@
         'command_buffer/tests/gl_texture_mailbox_unittests.cc',
         'command_buffer/tests/gl_unittests.cc',
       ],
     },
     {
       'target_name': 'gpu_unittest_utils',
       'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
       ],
       'include_dirs': [
         '..',
         '<(DEPTH)/third_party/khronos',
       ],
       'sources': [
         'command_buffer/common/gl_mock.h',
         'command_buffer/common/gl_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],
     },
   ],
 }