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

content/renderer/media/webrtc_audio_capturer.cc

Index: content/renderer/media/webrtc_audio_capturer.cc
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index 6641d7e965a76f5fbb7fbc2cd478bfaa372cb555..252bf724e8884e1845d98a0e663ed6f669cd334c 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -109,7 +109,7 @@ class WebRtcAudioCapturer::ConfiguredBuffer :
 
 // static
 scoped_refptr<WebRtcAudioCapturer> WebRtcAudioCapturer::CreateCapturer() {
-  scoped_refptr<WebRtcAudioCapturer> capturer = new  WebRtcAudioCapturer();
+  scoped_refptr<WebRtcAudioCapturer> capturer = new WebRtcAudioCapturer();
   return capturer;
 }
 
@@ -134,7 +134,8 @@ bool WebRtcAudioCapturer::Reconfigure(int sample_rate,
   return true;
 }
 
-bool WebRtcAudioCapturer::Initialize(media::ChannelLayout channel_layout,
+bool WebRtcAudioCapturer::Initialize(int render_view_id,
+                                     media::ChannelLayout channel_layout,
                                      int sample_rate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!sinks_.empty());
@@ -171,8 +172,8 @@ bool WebRtcAudioCapturer::Initialize(media::ChannelLayout channel_layout,
 
   // Create and configure the default audio capturing source. The |source_|
   // will be overwritten if an external client later calls SetCapturerSource()
-  // providing an alternaive media::AudioCapturerSource.
-  SetCapturerSource(AudioDeviceFactory::NewInputDevice(),
+  // providing an alternative media::AudioCapturerSource.
+  SetCapturerSource(AudioDeviceFactory::NewInputDevice(render_view_id),
                     channel_layout,
                     static_cast<float>(sample_rate));