Associate audio streams with their source/destination RenderView.

content/renderer/media/webrtc_audio_renderer.h

Index: content/renderer/media/webrtc_audio_renderer.h
diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h
index 02bcbd13537c20e50595e68b99094e7b2b4dc65a..47d6822033de51706855923111c70a37761c6db1 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -8,8 +8,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
+#include "media/audio/audio_output_device.h"
 #include "media/base/audio_decoder.h"
-#include "media/base/audio_renderer_sink.h"
 #include "webkit/media/media_stream_audio_renderer.h"
 
 namespace content {
@@ -22,7 +22,7 @@ class CONTENT_EXPORT WebRtcAudioRenderer
     : NON_EXPORTED_BASE(public media::AudioRendererSink::RenderCallback),
       NON_EXPORTED_BASE(public webkit_media::MediaStreamAudioRenderer) {
  public:
-  WebRtcAudioRenderer();
+  explicit WebRtcAudioRenderer(int source_render_view_id);
 
   // Initialize function called by clients like WebRtcAudioDeviceImpl. Note,
   // Stop() has to be called before |source| is deleted.
@@ -53,8 +53,11 @@ class CONTENT_EXPORT WebRtcAudioRenderer
                      int audio_delay_milliseconds) OVERRIDE;
   virtual void OnRenderError() OVERRIDE;
 
+  // The render view in which the audio is rendered into |sink_|.
+  const int source_render_view_id_;
+
   // The sink (destination) for rendered audio.
-  scoped_refptr<media::AudioRendererSink> sink_;
+  scoped_refptr<media::AudioOutputDevice> sink_;
 
   // Audio data source from the browser process.
   WebRtcAudioRendererSource* source_;