| Index: content/content_renderer.gypi
 | 
| diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
 | 
| index 0e1acfbda7741341effacd207d26910adadf1d6e..76514cf3e6c5e3f382060003a0c575d06f6586db 100644
 | 
| --- a/content/content_renderer.gypi
 | 
| +++ b/content/content_renderer.gypi
 | 
| @@ -12,6 +12,7 @@
 | 
|      '../gin/gin.gyp:gin',
 | 
|      '../gpu/gpu.gyp:gpu',
 | 
|      '../jingle/jingle.gyp:jingle_glue',
 | 
| +    '../media/blink/media_blink.gyp:media_blink',
 | 
|      '../media/media.gyp:media',
 | 
|      '../mojo/mojo_base.gyp:mojo_application_bindings',
 | 
|      '../mojo/mojo_base.gyp:mojo_environment_chromium',
 | 
| @@ -208,8 +209,6 @@
 | 
|        'renderer/java/gin_java_bridge_object.h',
 | 
|        'renderer/java/gin_java_bridge_value_converter.cc',
 | 
|        'renderer/java/gin_java_bridge_value_converter.h',
 | 
| -      'renderer/media/active_loader.cc',
 | 
| -      'renderer/media/active_loader.h',
 | 
|        'renderer/media/aec_dump_message_filter.cc',
 | 
|        'renderer/media/aec_dump_message_filter.h',
 | 
|        'renderer/media/android/audio_decoder_android.cc',
 | 
| @@ -239,20 +238,10 @@
 | 
|        'renderer/media/audio_message_filter.h',
 | 
|        'renderer/media/audio_renderer_mixer_manager.cc',
 | 
|        'renderer/media/audio_renderer_mixer_manager.h',
 | 
| -      'renderer/media/buffered_data_source.cc',
 | 
| -      'renderer/media/buffered_data_source.h',
 | 
| -      'renderer/media/buffered_data_source_host_impl.h',
 | 
| -      'renderer/media/buffered_data_source_host_impl.cc',
 | 
| -      'renderer/media/buffered_resource_loader.cc',
 | 
| -      'renderer/media/buffered_resource_loader.h',
 | 
| -      'renderer/media/cache_util.cc',
 | 
| -      'renderer/media/cache_util.h',
 | 
|        'renderer/media/cdm_session_adapter.cc',
 | 
|        'renderer/media/cdm_session_adapter.h',
 | 
|        'renderer/media/crypto/content_decryption_module_factory.cc',
 | 
|        'renderer/media/crypto/content_decryption_module_factory.h',
 | 
| -      'renderer/media/crypto/encrypted_media_player_support.cc',
 | 
| -      'renderer/media/crypto/encrypted_media_player_support.h',
 | 
|        'renderer/media/crypto/encrypted_media_player_support_impl.cc',
 | 
|        'renderer/media/crypto/encrypted_media_player_support_impl.h',
 | 
|        'renderer/media/crypto/key_systems.cc',
 | 
| @@ -290,39 +279,20 @@
 | 
|        'renderer/media/renderer_webaudiodevice_impl.h',
 | 
|        'renderer/media/renderer_webmidiaccessor_impl.cc',
 | 
|        'renderer/media/renderer_webmidiaccessor_impl.h',
 | 
| -      'renderer/media/texttrack_impl.cc',
 | 
| -      'renderer/media/texttrack_impl.h',
 | 
|        'renderer/media/video_capture_impl.cc',
 | 
|        'renderer/media/video_capture_impl.h',
 | 
|        'renderer/media/video_capture_impl_manager.cc',
 | 
|        'renderer/media/video_capture_impl_manager.h',
 | 
|        'renderer/media/video_capture_message_filter.cc',
 | 
|        'renderer/media/video_capture_message_filter.h',
 | 
| -      'renderer/media/video_frame_compositor.cc',
 | 
| -      'renderer/media/video_frame_compositor.h',
 | 
|        'renderer/media/video_frame_provider.cc',
 | 
|        'renderer/media/video_frame_provider.h',
 | 
| -      'renderer/media/webaudiosourceprovider_impl.cc',
 | 
| -      'renderer/media/webaudiosourceprovider_impl.h',
 | 
|        'renderer/media/webcontentdecryptionmodule_impl.cc',
 | 
|        'renderer/media/webcontentdecryptionmodule_impl.h',
 | 
|        'renderer/media/webcontentdecryptionmodulesession_impl.cc',
 | 
|        'renderer/media/webcontentdecryptionmodulesession_impl.h',
 | 
| -      'renderer/media/webinbandtexttrack_impl.cc',
 | 
| -      'renderer/media/webinbandtexttrack_impl.h',
 | 
| -      'renderer/media/webmediaplayer_delegate.h',
 | 
| -      'renderer/media/webmediaplayer_impl.cc',
 | 
| -      'renderer/media/webmediaplayer_impl.h',
 | 
|        'renderer/media/webmediaplayer_ms.cc',
 | 
|        'renderer/media/webmediaplayer_ms.h',
 | 
| -      'renderer/media/webmediaplayer_params.cc',
 | 
| -      'renderer/media/webmediaplayer_params.h',
 | 
| -      'renderer/media/webmediaplayer_util.cc',
 | 
| -      'renderer/media/webmediaplayer_util.h',
 | 
| -      'renderer/media/webmediasource_impl.cc',
 | 
| -      'renderer/media/webmediasource_impl.h',
 | 
| -      'renderer/media/websourcebuffer_impl.cc',
 | 
| -      'renderer/media/websourcebuffer_impl.h',
 | 
|        'renderer/memory_benchmarking_extension.cc',
 | 
|        'renderer/memory_benchmarking_extension.h',
 | 
|        'renderer/menu_item_builder.cc',
 | 
| 
 |