MediaStream audio: Refactor 3 separate "glue" implementations into one.

content/content_renderer.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_proto',
@@ skipping 292 matching lines @@
       'renderer/media/audio_message_filter.h',
       'renderer/media/audio_renderer_mixer_manager.cc',
       'renderer/media/audio_renderer_mixer_manager.h',
       'renderer/media/cdm/pepper_cdm_wrapper.h',
       'renderer/media/cdm/pepper_cdm_wrapper_impl.cc',
       'renderer/media/cdm/pepper_cdm_wrapper_impl.h',
       'renderer/media/cdm/ppapi_decryptor.cc',
       'renderer/media/cdm/ppapi_decryptor.h',
       'renderer/media/cdm/render_cdm_factory.cc',
       'renderer/media/cdm/render_cdm_factory.h',
+      'renderer/media/external_media_stream_audio_source.cc',
+      'renderer/media/external_media_stream_audio_source.h',
       'renderer/media/media_permission_dispatcher.cc',
       'renderer/media/media_permission_dispatcher.h',
+      'renderer/media/media_stream_audio_deliverer.h',
       'renderer/media/media_stream_audio_level_calculator.cc',
       'renderer/media/media_stream_audio_level_calculator.h',
+      'renderer/media/media_stream_audio_source.cc',
+      'renderer/media/media_stream_audio_source.h',
       'renderer/media/media_stream_audio_track.cc',
       'renderer/media/media_stream_audio_track.h',
       'renderer/media/media_stream_center.h',
       'renderer/media/media_stream_constraints_util.cc',
       'renderer/media/media_stream_constraints_util.h',
       'renderer/media/media_stream_dispatcher.h',
       'renderer/media/media_stream_dispatcher_eventhandler.h',
       'renderer/media/media_stream_track.cc',
       'renderer/media/media_stream_track.h',
       'renderer/media/midi_dispatcher.cc',
@@ skipping 13 matching lines @@
       'renderer/media/renderer_webmidiaccessor_impl.cc',
       'renderer/media/renderer_webmidiaccessor_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/web_media_element_source_utils.cc',
       'renderer/media/web_media_element_source_utils.h',
+      'renderer/media/webaudio_media_stream_source.cc',
+      'renderer/media/webaudio_media_stream_source.h',
       'renderer/media/webmediaplayer_ms.cc',
       'renderer/media/webmediaplayer_ms.h',
       'renderer/media/webmediaplayer_ms_compositor.cc',
       'renderer/media/webmediaplayer_ms_compositor.h',
       'renderer/menu_item_builder.cc',
       'renderer/menu_item_builder.h',
       'renderer/mojo/blink_service_registry_impl.cc',
       'renderer/mojo/blink_service_registry_impl.h',
       'renderer/mojo/service_registry_js_wrapper.cc',
       'renderer/mojo/service_registry_js_wrapper.h',
@@ skipping 277 matching lines @@
       'renderer/media/html_video_element_capturer_source.cc',
       'renderer/media/html_video_element_capturer_source.h',
       'renderer/media/media_recorder_handler.cc',
       'renderer/media/media_recorder_handler.h',
       'renderer/media/media_stream.cc',
       'renderer/media/media_stream.h',
       'renderer/media/media_stream_audio_processor.cc',
       'renderer/media/media_stream_audio_processor.h',
       'renderer/media/media_stream_audio_processor_options.cc',
       'renderer/media/media_stream_audio_processor_options.h',
-      'renderer/media/media_stream_audio_sink_owner.cc',
-      'renderer/media/media_stream_audio_sink_owner.h',
-      'renderer/media/media_stream_audio_source.cc',
-      'renderer/media/media_stream_audio_source.h',
-      'renderer/media/media_stream_audio_track_sink.h',
       'renderer/media/media_stream_center.cc',
       'renderer/media/media_stream_dispatcher.cc',
       'renderer/media/media_stream_registry_interface.h',
       'renderer/media/media_stream_renderer_factory_impl.cc',
       'renderer/media/media_stream_renderer_factory_impl.h',
       'renderer/media/media_stream_source.cc',
       'renderer/media/media_stream_source.h',
       'renderer/media/media_stream_video_capturer_source.cc',
       'renderer/media/media_stream_video_capturer_source.h',
       'renderer/media/media_stream_video_renderer_sink.cc',
@@ skipping 28 matching lines @@
       'renderer/media/rtc_video_encoder_factory.h',
       'renderer/media/speech_recognition_audio_sink.cc',
       'renderer/media/speech_recognition_audio_sink.h',
       'renderer/media/track_audio_renderer.cc',
       'renderer/media/track_audio_renderer.h',
       'renderer/media/user_media_client_impl.cc',
       'renderer/media/video_track_adapter.cc',
       'renderer/media/video_track_adapter.h',
       'renderer/media/video_track_recorder.cc',
       'renderer/media/video_track_recorder.h',
-      'renderer/media/webaudio_capturer_source.cc',
-      'renderer/media/webaudio_capturer_source.h',
-      'renderer/media/webrtc/media_stream_remote_audio_track.cc',
-      'renderer/media/webrtc/media_stream_remote_audio_track.h',
       'renderer/media/webrtc/media_stream_remote_video_source.cc',
       'renderer/media/webrtc/media_stream_remote_video_source.h',
       'renderer/media/webrtc/media_stream_track_metrics.cc',
       'renderer/media/webrtc/media_stream_track_metrics.h',
       'renderer/media/webrtc/media_stream_video_webrtc_sink.cc',
       'renderer/media/webrtc/media_stream_video_webrtc_sink.h',
       'renderer/media/webrtc/peer_connection_dependency_factory.cc',
       'renderer/media/webrtc/peer_connection_dependency_factory.h',
+      'renderer/media/webrtc/peer_connection_remote_audio_source.cc',
+      'renderer/media/webrtc/peer_connection_remote_audio_source.h',
+      'renderer/media/webrtc/processed_local_audio_source.cc',
+      'renderer/media/webrtc/processed_local_audio_source.h',
       'renderer/media/webrtc/stun_field_trial.cc',
       'renderer/media/webrtc/stun_field_trial.h',
       'renderer/media/webrtc/track_observer.cc',
       'renderer/media/webrtc/track_observer.h',
-      'renderer/media/webrtc/webrtc_audio_sink_adapter.cc',
-      'renderer/media/webrtc/webrtc_audio_sink_adapter.h',
-      'renderer/media/webrtc/webrtc_local_audio_track_adapter.cc',
-      'renderer/media/webrtc/webrtc_local_audio_track_adapter.h',
+      'renderer/media/webrtc/webrtc_audio_sink.cc',
+      'renderer/media/webrtc/webrtc_audio_sink.h',
       'renderer/media/webrtc/webrtc_media_stream_adapter.cc',
       'renderer/media/webrtc/webrtc_media_stream_adapter.h',
       'renderer/media/webrtc/webrtc_video_capturer_adapter.cc',
       'renderer/media/webrtc/webrtc_video_capturer_adapter.h',
       'renderer/media/webrtc/webrtc_video_frame_adapter.cc',
       'renderer/media/webrtc/webrtc_video_frame_adapter.h',
-      'renderer/media/webrtc_audio_capturer.cc',
-      'renderer/media/webrtc_audio_capturer.h',
       'renderer/media/webrtc_audio_device_impl.cc',
       'renderer/media/webrtc_audio_device_impl.h',
       'renderer/media/webrtc_audio_device_not_impl.cc',
       'renderer/media/webrtc_audio_device_not_impl.h',
       'renderer/media/webrtc_audio_renderer.cc',
       'renderer/media/webrtc_audio_renderer.h',
       'renderer/media/webrtc_identity_service.cc',
       'renderer/media/webrtc_identity_service.h',
       'renderer/media/webrtc_local_audio_source_provider.cc',
       'renderer/media/webrtc_local_audio_source_provider.h',
-      'renderer/media/webrtc_local_audio_track.cc',
-      'renderer/media/webrtc_local_audio_track.h',
       'renderer/media/webrtc_logging.cc',
       'renderer/media/webrtc_logging.h',
       'renderer/media/webrtc_uma_histograms.cc',
       'renderer/media/webrtc_uma_histograms.h',
       'renderer/p2p/empty_network_manager.cc',
       'renderer/p2p/empty_network_manager.h',
       'renderer/p2p/filtering_network_manager.cc',
       'renderer/p2p/filtering_network_manager.h',
       'renderer/p2p/host_address_request.cc',
       'renderer/p2p/host_address_request.h',
@@ skipping 164 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }