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

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 af4bf38823ba369f899bb1caafa298032c76cbd1..eb1025684730619110287b78cc5ecaefc0176e69 100644
--- a/content/renderer/media/webrtc_audio_renderer.h
+++ b/content/renderer/media/webrtc_audio_renderer.h
@@ -14,9 +14,12 @@
 #include "media/base/audio_renderer_sink.h"
 #include "webkit/media/media_stream_audio_renderer.h"
 
+namespace media {
+class AudioOutputDevice;
+}
+
 namespace content {
 
-class RendererAudioOutputDevice;
 class WebRtcAudioRendererSource;
 
 // This renderer handles calls from the pipeline and WebRtc ADM. It is used
@@ -71,7 +74,7 @@ class CONTENT_EXPORT WebRtcAudioRenderer
   const int source_render_view_id_;
 
   // The sink (destination) for rendered audio.
-  scoped_refptr<RendererAudioOutputDevice> sink_;
+  scoped_refptr<media::AudioOutputDevice> sink_;
 
   // Audio data source from the browser process.
   WebRtcAudioRendererSource* source_;