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

content/renderer/media/audio_renderer_mixer_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/renderer/media/audio_device_factory.h"
-#include "content/renderer/media/renderer_audio_output_device.h"
+#include "media/audio/audio_output_device.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
 
 namespace content {
 
 AudioRendererMixerManager::AudioRendererMixerManager(
     media::AudioHardwareConfig* hardware_config)
     : hardware_config_(hardware_config),
       sink_for_testing_(NULL) {
@@ skipping 49 matching lines @@
   // If we've created invalid output parameters, simply pass on the input params
   // and let the browser side handle automatic fallback.
   if (!output_params.IsValid())
     output_params = params;
 
   media::AudioRendererMixer* mixer;
   if (sink_for_testing_) {
     mixer = new media::AudioRendererMixer(
         params, output_params, sink_for_testing_);
   } else {
-    scoped_refptr<RendererAudioOutputDevice> device =
-        AudioDeviceFactory::NewOutputDevice();
-    device->SetSourceRenderView(source_render_view_id);
-    mixer = new media::AudioRendererMixer(params, output_params, device);
+    mixer = new media::AudioRendererMixer(
+        params, output_params, AudioDeviceFactory::NewOutputDevice(
+            source_render_view_id));
   }
 
   AudioRendererMixerReference mixer_reference = { mixer, 1 };
   mixers_[key] = mixer_reference;
   return mixer;
 }
 
 void AudioRendererMixerManager::RemoveMixer(
     int source_render_view_id,
     const media::AudioParameters& params) {
   const MixerKey key(source_render_view_id, params);
   base::AutoLock auto_lock(mixers_lock_);
 
   AudioRendererMixerMap::iterator it = mixers_.find(key);
   DCHECK(it != mixers_.end());
 
   // Only remove the mixer if AudioRendererMixerManager is the last owner.
   it->second.ref_count--;
   if (it->second.ref_count == 0) {
     delete it->second.mixer;
     mixers_.erase(it);
   }
 }
 
 }  // namespace content