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

content/renderer/media/webrtc_local_audio_renderer.h

Index: content/renderer/media/webrtc_local_audio_renderer.h
diff --git a/content/renderer/media/webrtc_local_audio_renderer.h b/content/renderer/media/webrtc_local_audio_renderer.h
index 0bd310ab2d36d403a84b6b2ff14e2322808bee5b..0bdb316d9e0be6fd261c9b1a7fc599cf3cc2c5d1 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.h
+++ b/content/renderer/media/webrtc_local_audio_renderer.h
@@ -16,6 +16,7 @@
 
 namespace media {
 class AudioBus;
+class AudioOutputDevice;
 class AudioParameters;
 }
 
@@ -25,7 +26,6 @@ class AudioTrackInterface;
 
 namespace content {
 
-class RendererAudioOutputDevice;
 class WebRtcAudioCapturer;
 
 // WebRtcLocalAudioRenderer is a webkit_media::MediaStreamAudioRenderer
@@ -105,7 +105,7 @@ class CONTENT_EXPORT WebRtcLocalAudioRenderer
   const int source_render_view_id_;
 
   // The sink (destination) for rendered audio.
-  scoped_refptr<RendererAudioOutputDevice> sink_;
+  scoped_refptr<media::AudioOutputDevice> sink_;
 
   // Used to DCHECK that we are called on the correct thread.
   base::ThreadChecker thread_checker_;