Associate audio streams with their source/destination RenderView.

content/renderer/media/audio_device_factory.cc

Index: content/renderer/media/audio_device_factory.cc
diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
index ad7968884e78c410b8e03094850e03da0efb7318..baf6877577523914250fcbbac2c5a4c1f5d07c64 100644
--- a/content/renderer/media/audio_device_factory.cc
+++ b/content/renderer/media/audio_device_factory.cc
@@ -8,8 +8,8 @@
 #include "content/common/child_process.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
+#include "content/renderer/media/renderer_audio_output_device.h"
 #include "media/audio/audio_input_device.h"
-#include "media/audio/audio_output_device.h"
 
 namespace content {
 
@@ -17,18 +17,18 @@ namespace content {
 AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
 
 // static
-media::AudioRendererSink* AudioDeviceFactory::NewOutputDevice() {
-  media::AudioRendererSink* device = NULL;
+scoped_refptr<RendererAudioOutputDevice> AudioDeviceFactory::NewOutputDevice() {
+  RendererAudioOutputDevice* device = NULL;
   if (factory_)
     device = factory_->CreateOutputDevice();
 
-  return device ? device : new media::AudioOutputDevice(
+  return device ? device : new RendererAudioOutputDevice(
       AudioMessageFilter::Get(),
       ChildProcess::current()->io_message_loop()->message_loop_proxy());
 }
 
 // static
-media::AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
+scoped_refptr<media::AudioInputDevice> AudioDeviceFactory::NewInputDevice() {
   media::AudioInputDevice* device = NULL;
   if (factory_)
     device = factory_->CreateInputDevice();