Revert r95841 due to failing media_unittests on linux_shared bot.

media/media.gyp

Index: media/media.gyp
===================================================================
--- media/media.gyp	(revision 95843)
+++ media/media.gyp	(working copy)
@@ -9,7 +9,7 @@
   'targets': [
     {
       'target_name': 'media',
-      'type': '<(component)',
+      'type': 'static_library',
       'dependencies': [
         'yuv_convert',
         '../base/base.gyp:base',
@@ -17,11 +17,7 @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '../third_party/openmax/openmax.gyp:il',
-        '../ui/ui.gyp:ui',
       ],
-      'defines': [
-        'MEDIA_IMPLEMENTATION',
-      ],
       'include_dirs': [
         '..',
       ],
@@ -108,7 +104,6 @@
         'base/h264_bitstream_converter.cc',
         'base/h264_bitstream_converter.h',
         'base/media.h',
-        'base/media_export.h',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
@@ -397,7 +392,6 @@
       'dependencies': [
         'media',
         'media_test_support',
-        'yuv_convert',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
@@ -506,7 +500,6 @@
       'type': 'executable',
       'dependencies': [
         'media',
-        'yuv_convert',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
       ],
@@ -553,9 +546,7 @@
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
@@ -607,7 +598,6 @@
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
           ],
           'include_dirs': [
@@ -633,7 +623,6 @@
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gfx/gl/gl.gyp:gl',
           ],
@@ -700,7 +689,6 @@
           'type': 'executable',
           'dependencies': [
             'media',
-            'yuv_convert',
             '../base/base.gyp:base',
             '../ui/gfx/gl/gl.gyp:gl',
           ],