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

content/renderer/media/webrtc_audio_renderer.cc

Index: content/renderer/media/webrtc_audio_renderer.cc
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index d5591d090a6267cd68fdb4e1b24839cbb833179d..f22b9cd7f77f78e812f777fc194e021a9cd0917e 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -8,9 +8,9 @@
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "content/renderer/media/audio_device_factory.h"
-#include "content/renderer/media/renderer_audio_output_device.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/render_thread_impl.h"
+#include "media/audio/audio_output_device.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/sample_rates.h"
 #include "media/base/audio_hardware_config.h"
@@ -111,9 +111,6 @@ bool WebRtcAudioRenderer::Initialize(WebRtcAudioRendererSource* source) {
   DCHECK(!sink_);
   DCHECK(!source_);
 
-  sink_ = AudioDeviceFactory::NewOutputDevice();
-  DCHECK(sink_);
-
   // Use mono on all platforms but Windows for now.
   // TODO(henrika): Tracking at http://crbug.com/166771.
   media::ChannelLayout channel_layout = media::CHANNEL_LAYOUT_MONO;
@@ -208,8 +205,8 @@ bool WebRtcAudioRenderer::Initialize(WebRtcAudioRendererSource* source) {
   source->SetRenderFormat(source_params);
 
   // Configure the audio rendering client and start rendering.
+  sink_ = AudioDeviceFactory::NewOutputDevice(source_render_view_id_);
   sink_->Initialize(sink_params, this);
-  sink_->SetSourceRenderView(source_render_view_id_);
   sink_->Start();
 
   // User must call Play() before any audio can be heard.