Plumb render view ID from audio-related code in renderer through IPCs to AudioRendererHost in brows…

content/renderer/media/audio_device_factory.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_device_factory.h"
 
 #include "base/logging.h"
 #include "content/common/child_process.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
+#include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_input_device.h"
 #include "media/audio/audio_output_device.h"
 
 namespace content {
 
 // static
 AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
 
 // static
-media::AudioRendererSink* AudioDeviceFactory::NewOutputDevice() {
+media::AudioRendererSink* AudioDeviceFactory::NewOutputDevice(
+    int render_view_id) {
   media::AudioRendererSink* device = NULL;
   if (factory_)
-    device = factory_->CreateOutputDevice();
+    device = factory_->CreateOutputDevice(render_view_id);
 
   return device ? device : new media::AudioOutputDevice(
-      AudioMessageFilter::Get(),
+      RenderThreadImpl::current()->audio_message_filter()->
+          CreateAudioOutputIPC(render_view_id),
       ChildProcess::current()->io_message_loop()->message_loop_proxy());
 }
 
 // static
-media::AudioInputDevice* AudioDeviceFactory::NewInputDevice() {
+media::AudioInputDevice* AudioDeviceFactory::NewInputDevice(
+    int render_view_id) {
   media::AudioInputDevice* device = NULL;
   if (factory_)
-    device = factory_->CreateInputDevice();
+    device = factory_->CreateInputDevice(render_view_id);
 
   return device ? device : new media::AudioInputDevice(
-      AudioInputMessageFilter::Get(),
+      RenderThreadImpl::current()->audio_input_message_filter()->
+          CreateAudioInputIPC(render_view_id),
       ChildProcess::current()->io_message_loop()->message_loop_proxy());
 }
 
 AudioDeviceFactory::AudioDeviceFactory() {
   DCHECK(!factory_) << "Can't register two factories at once.";
   factory_ = this;
 }
 
 AudioDeviceFactory::~AudioDeviceFactory() {
   factory_ = NULL;
 }
 
 }  // namespace content