| Index: chromecast/media/media.gyp
 | 
| diff --git a/chromecast/media/media.gyp b/chromecast/media/media.gyp
 | 
| index ad08911cf001f8652ca07030380413b98055f969..14bd5bdb89f76bacfc8337aa3863da468d2173b3 100644
 | 
| --- a/chromecast/media/media.gyp
 | 
| +++ b/chromecast/media/media.gyp
 | 
| @@ -147,16 +147,8 @@
 | 
|          '../..',
 | 
|        ],
 | 
|        'sources': [
 | 
| -        'cma/backend/audio_pipeline_device_default.cc',
 | 
| -        'cma/backend/audio_pipeline_device_default.h',
 | 
| -        'cma/backend/media_clock_device_default.cc',
 | 
| -        'cma/backend/media_clock_device_default.h',
 | 
| -        'cma/backend/media_component_device_default.cc',
 | 
| -        'cma/backend/media_component_device_default.h',
 | 
|          'cma/backend/media_pipeline_backend_default.cc',
 | 
|          'cma/backend/media_pipeline_backend_default.h',
 | 
| -        'cma/backend/video_pipeline_device_default.cc',
 | 
| -        'cma/backend/video_pipeline_device_default.h',
 | 
|        ],
 | 
|      },
 | 
|      {
 | 
| @@ -210,8 +202,6 @@
 | 
|          '../../third_party/boringssl/boringssl.gyp:boringssl',
 | 
|        ],
 | 
|        'sources': [
 | 
| -        'cma/pipeline/audio_pipeline.cc',
 | 
| -        'cma/pipeline/audio_pipeline.h',
 | 
|          'cma/pipeline/audio_pipeline_impl.cc',
 | 
|          'cma/pipeline/audio_pipeline_impl.h',
 | 
|          'cma/pipeline/av_pipeline_client.cc',
 | 
| @@ -220,49 +210,22 @@
 | 
|          'cma/pipeline/av_pipeline_impl.h',
 | 
|          'cma/pipeline/decrypt_util.cc',
 | 
|          'cma/pipeline/decrypt_util.h',
 | 
| -        'cma/pipeline/frame_status_cb_impl.cc',
 | 
| -        'cma/pipeline/frame_status_cb_impl.h',
 | 
|          'cma/pipeline/load_type.h',
 | 
| -        'cma/pipeline/media_component_device_client_impl.cc',
 | 
| -        'cma/pipeline/media_component_device_client_impl.h',
 | 
| -        'cma/pipeline/media_pipeline.h',
 | 
|          'cma/pipeline/media_pipeline_client.cc',
 | 
|          'cma/pipeline/media_pipeline_client.h',
 | 
|          'cma/pipeline/media_pipeline_impl.cc',
 | 
|          'cma/pipeline/media_pipeline_impl.h',
 | 
| -        'cma/pipeline/video_pipeline.cc',
 | 
| -        'cma/pipeline/video_pipeline.h',
 | 
|          'cma/pipeline/video_pipeline_client.cc',
 | 
|          'cma/pipeline/video_pipeline_client.h',
 | 
| -        'cma/pipeline/video_pipeline_device_client_impl.cc',
 | 
| -        'cma/pipeline/video_pipeline_device_client_impl.h',
 | 
|          'cma/pipeline/video_pipeline_impl.cc',
 | 
|          'cma/pipeline/video_pipeline_impl.h',
 | 
|        ],
 | 
|      },
 | 
|      {
 | 
| -      'target_name': 'cma_filters',
 | 
| -      'type': '<(component)',
 | 
| -      'dependencies': [
 | 
| -        '../../base/base.gyp:base',
 | 
| -        '../../media/media.gyp:media',
 | 
| -        'cma_base',
 | 
| -      ],
 | 
| -      'sources': [
 | 
| -        'cma/filters/cma_renderer.cc',
 | 
| -        'cma/filters/cma_renderer.h',
 | 
| -        'cma/filters/demuxer_stream_adapter.cc',
 | 
| -        'cma/filters/demuxer_stream_adapter.h',
 | 
| -        'cma/filters/hole_frame_factory.cc',
 | 
| -        'cma/filters/hole_frame_factory.h',
 | 
| -      ],
 | 
| -    },
 | 
| -    {
 | 
|        'target_name': 'cast_media',
 | 
|        'type': 'none',
 | 
|        'dependencies': [
 | 
|          'cma_base',
 | 
| -        'cma_filters',
 | 
|          'cma_ipc',
 | 
|          'cma_ipc_streamer',
 | 
|          'cma_pipeline',
 | 
| @@ -280,6 +243,7 @@
 | 
|          '../../base/base.gyp:base_i18n',
 | 
|          '../../base/base.gyp:test_support_base',
 | 
|          '../../chromecast/chromecast.gyp:cast_metrics_test_support',
 | 
| +        '../../chromecast/chromecast.gyp:cast_shell_media',
 | 
|          '../../gpu/gpu.gyp:gpu_unittest_utils',
 | 
|          '../../media/media.gyp:media_test_support',
 | 
|          '../../testing/gmock.gyp:gmock',
 | 
| @@ -294,21 +258,14 @@
 | 
|          'cma/base/balanced_media_task_runner_unittest.cc',
 | 
|          'cma/base/buffering_controller_unittest.cc',
 | 
|          'cma/base/buffering_frame_provider_unittest.cc',
 | 
| -        'cma/filters/demuxer_stream_adapter_unittest.cc',
 | 
| -        'cma/filters/multi_demuxer_stream_adapter_unittest.cc',
 | 
|          'cma/ipc/media_message_fifo_unittest.cc',
 | 
|          'cma/ipc/media_message_unittest.cc',
 | 
|          'cma/ipc_streamer/av_streamer_unittest.cc',
 | 
|          'cma/pipeline/audio_video_pipeline_impl_unittest.cc',
 | 
| -        'cma/test/cma_end_to_end_test.cc',
 | 
| -        'cma/test/demuxer_stream_for_test.cc',
 | 
| -        'cma/test/demuxer_stream_for_test.h',
 | 
|          'cma/test/frame_generator_for_test.cc',
 | 
|          'cma/test/frame_generator_for_test.h',
 | 
|          'cma/test/frame_segmenter_for_test.cc',
 | 
|          'cma/test/frame_segmenter_for_test.h',
 | 
| -        'cma/test/media_component_device_feeder_for_test.cc',
 | 
| -        'cma/test/media_component_device_feeder_for_test.h',
 | 
|          'cma/test/mock_frame_consumer.cc',
 | 
|          'cma/test/mock_frame_consumer.h',
 | 
|          'cma/test/mock_frame_provider.cc',
 | 
| 
 |