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

content/renderer/media/webrtc_local_audio_renderer.cc

Index: content/renderer/media/webrtc_local_audio_renderer.cc
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc
index f24045ab759dab16fe0556cf9ca830528b64a452..987f484339ac00513eda6a2bae1a8e6ef6e75bb7 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.cc
+++ b/content/renderer/media/webrtc_local_audio_renderer.cc
@@ -13,8 +13,8 @@
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "content/renderer/media/audio_device_factory.h"
-#include "content/renderer/media/renderer_audio_output_device.h"
 #include "content/renderer/media/webrtc_audio_capturer.h"
+#include "media/audio/audio_output_device.h"
 #include "media/base/bind_to_loop.h"
 #include "media/base/media_switches.h"
 
@@ -169,7 +169,7 @@ void WebRtcLocalAudioRenderer::Start() {
                                      source_params.sample_rate(),
                                      source_params.bits_per_sample(),
                                      2 * source_params.frames_per_buffer());
-  sink_ = AudioDeviceFactory::NewOutputDevice();
+  sink_ = AudioDeviceFactory::NewOutputDevice(source_render_view_id_);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableWebAudioInput)) {
     // TODO(henrika): we could utilize the unified audio here instead and do
@@ -178,7 +178,6 @@ void WebRtcLocalAudioRenderer::Start() {
     DVLOG(1) << "enable-webaudio-input command-line flag is enabled";
   }
   sink_->Initialize(sink_params, callback_.get());
-  sink_->SetSourceRenderView(source_render_view_id_);
 
   // Start local rendering and the capturer. Note that, the capturer is owned
   // by the WebRTC ADM and might already bee running.