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

trunk/src/media/media.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,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 31 matching lines @@
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
         '../gpu/gpu.gyp:command_buffer_common',
         '../skia/skia.gyp:skia',
         '../third_party/opus/opus.gyp:opus',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
         'shared_memory_support',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 789 matching lines @@
         'media',
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'sources': [
         'audio/android/audio_android_unittest.cc',
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_unittest.cc',
         'audio/audio_input_volume_unittest.cc',
         'audio/audio_low_latency_input_output_unittest.cc',
         'audio/audio_manager_unittest.cc',
         'audio/audio_output_controller_unittest.cc',
@@ skipping 447 matching lines @@
     }],
     ['use_x11==1', {
       'targets': [
         {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
             '../base/base.gyp:base',
             '../ui/gl/gl.gyp:gl',
-            '../ui/gfx/gfx.gyp:gfx',
             '../ui/ui.gyp:ui',
           ],
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'conditions': [
@@ skipping 199 matching lines @@
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }