Revert 225857 "gfx: Create a separate gfx component out of ui."

trunk/src/gpu/gpu.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': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
   ],
   'targets': [
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../ui/ui.gyp:ui',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
       ],
       'sources': [
         '<@(gles2_implementation_source_files)',
         'command_buffer/client/gl_in_process_context.h',
         'command_buffer/client/gl_in_process_context.cc',
@@ skipping 87 matching lines @@
     {
       'target_name': 'gpu_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
         '../ui/gl/gl.gyp:gl',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../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',
       ],
       'defines': [
@@ skipping 105 matching lines @@
     },
     {
       'target_name': 'gl_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
-        '../ui/gfx/gfx.gyp:gfx',
+        '../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',
         #'gl_unittests',
       ],
@@ skipping 275 matching lines @@
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [
             '../build/apk_test.gypi',
           ],
         },
       ],
     }],
   ],
 }