| Index: media/BUILD.gn | 
| diff --git a/media/BUILD.gn b/media/BUILD.gn | 
| index d9e2399a57a3a42dc82af90fd2525ab789c4634e..311f17e42bb238382edb0fe2a92fbe8d24192fc0 100644 | 
| --- a/media/BUILD.gn | 
| +++ b/media/BUILD.gn | 
| @@ -95,10 +95,6 @@ component("media") { | 
| "ffmpeg/ffmpeg_deleters.h", | 
| "filters/audio_clock.cc", | 
| "filters/audio_clock.h", | 
| -    "filters/audio_renderer_algorithm.cc", | 
| -    "filters/audio_renderer_algorithm.h", | 
| -    "filters/audio_renderer_impl.cc", | 
| -    "filters/audio_renderer_impl.h", | 
| "filters/chunk_demuxer.cc", | 
| "filters/chunk_demuxer.h", | 
| "filters/context_3d.h", | 
| @@ -128,8 +124,6 @@ component("media") { | 
| "filters/h264_parser.h", | 
| "filters/jpeg_parser.cc", | 
| "filters/jpeg_parser.h", | 
| -    "filters/renderer_impl.cc", | 
| -    "filters/renderer_impl.h", | 
| "filters/source_buffer_platform.cc", | 
| "filters/source_buffer_platform.h", | 
| "filters/source_buffer_range.cc", | 
| @@ -143,8 +137,6 @@ component("media") { | 
| "filters/video_frame_scheduler_impl.h", | 
| "filters/video_frame_scheduler_proxy.cc", | 
| "filters/video_frame_scheduler_proxy.h", | 
| -    "filters/video_renderer_impl.cc", | 
| -    "filters/video_renderer_impl.h", | 
| "filters/vp8_bool_decoder.cc", | 
| "filters/vp8_bool_decoder.h", | 
| "filters/vp8_parser.cc", | 
| @@ -174,6 +166,14 @@ component("media") { | 
| "midi/usb_midi_jack.h", | 
| "midi/usb_midi_output_stream.cc", | 
| "midi/usb_midi_output_stream.h", | 
| +    "renderers/audio_renderer_algorithm.cc", | 
| +    "renderers/audio_renderer_algorithm.h", | 
| +    "renderers/audio_renderer_impl.cc", | 
| +    "renderers/audio_renderer_impl.h", | 
| +    "renderers/renderer_impl.cc", | 
| +    "renderers/renderer_impl.h", | 
| +    "renderers/video_renderer_impl.cc", | 
| +    "renderers/video_renderer_impl.h", | 
| "video/capture/file_video_capture_device.cc", | 
| "video/capture/file_video_capture_device.h", | 
| "video/capture/linux/video_capture_device_linux.cc", | 
| @@ -311,8 +311,8 @@ component("media") { | 
| ] | 
| if (!is_ensemble) { | 
| sources += [ | 
| -        "filters/default_renderer_factory.cc", | 
| -        "filters/default_renderer_factory.h", | 
| +        "renderers/default_renderer_factory.cc", | 
| +        "renderers/default_renderer_factory.h", | 
| ] | 
| } | 
| } else { | 
| @@ -482,8 +482,8 @@ component("media") { | 
| sources += [ | 
| "filters/gpu_video_decoder.cc", | 
| "filters/gpu_video_decoder.h", | 
| -      "filters/skcanvas_video_renderer.cc", | 
| -      "filters/skcanvas_video_renderer.h", | 
| +      "renderers/skcanvas_video_renderer.cc", | 
| +      "renderers/skcanvas_video_renderer.h", | 
| "video/capture/fake_video_capture_device.cc", | 
| "video/capture/fake_video_capture_device.h", | 
| "video/capture/fake_video_capture_device_factory.cc", | 
| @@ -528,8 +528,6 @@ test("media_unittests") { | 
| "cdm/json_web_key_unittest.cc", | 
| "filters/audio_clock_unittest.cc", | 
| "filters/audio_decoder_selector_unittest.cc", | 
| -    "filters/audio_renderer_algorithm_unittest.cc", | 
| -    "filters/audio_renderer_impl_unittest.cc", | 
| "filters/chunk_demuxer_unittest.cc", | 
| "filters/decrypting_audio_decoder_unittest.cc", | 
| "filters/decrypting_demuxer_stream_unittest.cc", | 
| @@ -545,14 +543,11 @@ test("media_unittests") { | 
| "filters/h264_bit_reader_unittest.cc", | 
| "filters/h264_parser_unittest.cc", | 
| "filters/jpeg_parser_unittest.cc", | 
| -    "filters/renderer_impl_unittest.cc", | 
| -    "filters/skcanvas_video_renderer_unittest.cc", | 
| "filters/source_buffer_stream_unittest.cc", | 
| "filters/video_decoder_selector_unittest.cc", | 
| "filters/video_frame_scheduler_impl_unittest.cc", | 
| "filters/video_frame_scheduler_unittest.cc", | 
| "filters/video_frame_stream_unittest.cc", | 
| -    "filters/video_renderer_impl_unittest.cc", | 
| "filters/vp8_bool_decoder_unittest.cc", | 
| "filters/vp8_parser_unittest.cc", | 
| "midi/midi_manager_unittest.cc", | 
| @@ -562,6 +557,11 @@ test("media_unittests") { | 
| "midi/usb_midi_descriptor_parser_unittest.cc", | 
| "midi/usb_midi_input_stream_unittest.cc", | 
| "midi/usb_midi_output_stream_unittest.cc", | 
| +    "renderers/audio_renderer_algorithm_unittest.cc", | 
| +    "renderers/audio_renderer_impl_unittest.cc", | 
| +    "renderers/renderer_impl_unittest.cc", | 
| +    "renderers/skcanvas_video_renderer_unittest.cc", | 
| +    "renderers/video_renderer_impl_unittest.cc", | 
| "video/capture/fake_video_capture_device_unittest.cc", | 
| "video/capture/video_capture_device_unittest.cc", | 
| "video/h264_poc_unittest.cc", | 
|  |