Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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 fae521e5dd6248255888957ddde42f5aef3144ca..2dd11100fa2429ee5e73a548a3b631557e6503b8 100644
--- a/content/renderer/media/audio_device_factory.cc
+++ b/content/renderer/media/audio_device_factory.cc
@@ -7,8 +7,8 @@
 #include "base/logging.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 {
 
@@ -16,23 +16,24 @@ namespace content {
 AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
 
 // static
-scoped_refptr<RendererAudioOutputDevice> AudioDeviceFactory::NewOutputDevice() {
-  RendererAudioOutputDevice* device = NULL;
+scoped_refptr<media::AudioOutputDevice> AudioDeviceFactory::NewOutputDevice(
+    int render_view_id) {
+  media::AudioOutputDevice* device = NULL;
   if (factory_)
-    device = factory_->CreateOutputDevice();
-
-  return device ? device : new RendererAudioOutputDevice(
-      AudioMessageFilter::Get(), AudioMessageFilter::Get()->io_message_loop());
+    device = factory_->CreateOutputDevice(render_view_id);
+  return device ? device : new media::AudioOutputDevice(
+      AudioMessageFilter::Get()->CreateAudioOutputIPC(render_view_id),
+      AudioMessageFilter::Get()->io_message_loop());
 }
 
 // static
-scoped_refptr<media::AudioInputDevice> AudioDeviceFactory::NewInputDevice() {
+scoped_refptr<media::AudioInputDevice> AudioDeviceFactory::NewInputDevice(
+    int render_view_id) {
   media::AudioInputDevice* device = NULL;
   if (factory_)
-    device = factory_->CreateInputDevice();
-
+    device = factory_->CreateInputDevice(render_view_id);
   return device ? device : new media::AudioInputDevice(
-      AudioInputMessageFilter::Get(),
+      AudioInputMessageFilter::Get()->CreateAudioInputIPC(render_view_id),
       AudioInputMessageFilter::Get()->io_message_loop());
 }