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

content/renderer/media/audio_device_factory.h

Index: content/renderer/media/audio_device_factory.h
diff --git a/content/renderer/media/audio_device_factory.h b/content/renderer/media/audio_device_factory.h
index b06ace7aea31af2d27f23ac0b1570c55538151f0..0295877b2543855559b1ae6f44fc274f529376ff 100644
--- a/content/renderer/media/audio_device_factory.h
+++ b/content/renderer/media/audio_device_factory.h
@@ -10,19 +10,19 @@
 
 namespace media {
 class AudioInputDevice;
+class AudioOutputDevice;
 }
 
 namespace content {
 
-class RendererAudioOutputDevice;
-
-// A factory for creating RendererAudioOutputDevices.  There is a global factory
+// A factory for creating AudioOutputDevices.  There is a global factory
 // function that can be installed for the purposes of testing to provide
 // a specialized AudioRendererSink class.
 class AudioDeviceFactory {
  public:
-  // Creates a RendererAudioOutputDevice using the currently registered factory.
-  static scoped_refptr<RendererAudioOutputDevice> NewOutputDevice();
+  // Creates a AudioOutputDevice using the currently registered factory.
+  static scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
+      int source_render_view_id);
 
   // Creates an AudioInputDevice using the currently registered factory,
   static scoped_refptr<media::AudioInputDevice> NewInputDevice();
@@ -35,7 +35,8 @@ class AudioDeviceFactory {
   // functions to provide alternate audio device implementations.
   // If the return value of either of these function is NULL, we fall back
   // on the default implementation.
-  virtual RendererAudioOutputDevice* CreateOutputDevice() = 0;
+  virtual media::AudioOutputDevice* CreateOutputDevice(
+      int source_render_view_id) = 0;
   virtual media::AudioInputDevice* CreateInputDevice() = 0;
 
  private: