Adds AudioDevice factory for all audio clients in Chrome

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3d29c1d9d06ebf3d3b18b454650097f3ecfbd3db..f64968c09a088f887026dd681efdce58b25f4b36 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -71,6 +71,8 @@
 #include "content/renderer/input_tag_speech_dispatcher.h"
 #include "content/renderer/java/java_bridge_dispatcher.h"
 #include "content/renderer/load_progress_tracker.h"
+#include "content/renderer/media/audio_device.h"
+#include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
@@ -565,6 +567,12 @@ RenderViewImpl::RenderViewImpl(
   notification_provider_ = NULL;
 #endif
 
+  // Create the audio device factory to ensure that it can be injected into
+  // WebRTC, WebAudio and HTML5 <audio>/<video> clients.
+  audio_device_factory_.reset(
+      new AudioDeviceFactory<AudioDevice, AudioMessageFilter>(
+          RenderThreadImpl::current()->audio_message_filter()));
+
   webwidget_ = WebView::create(this);
   webwidget_mouse_lock_target_.reset(new WebWidgetLockTarget(webwidget_));
 
@@ -2351,7 +2359,8 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // audio_source_provider is a "provider" to WebKit, and a sink
     // from the perspective of the audio renderer.
-    audio_source_provider = new RenderAudioSourceProvider();
+    audio_source_provider = new RenderAudioSourceProvider(
+        audio_device_factory());
 
     // Add the chrome specific audio renderer, using audio_source_provider
     // as the sink.
@@ -3497,6 +3506,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 
   if (!media_stream_impl_) {
+    DCHECK(audio_device_factory());
     MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory(
         RenderThreadImpl::current()->video_capture_impl_manager());
     media_stream_impl_ = new MediaStreamImpl(
@@ -3504,7 +3514,8 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
         media_stream_dispatcher_,
         p2p_socket_dispatcher_,
         RenderThreadImpl::current()->video_capture_impl_manager(),
-        factory);
+        factory,
+        audio_device_factory());
   }
 #endif
 }