Add a mojo implementation of AudioOutputIPC.

content/renderer/media/audio_device_factory.cc

Index: content/renderer/media/audio_device_factory.cc
diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
index e83ca0fab5458495eb578981cdeb9739149d8682..104d205918f72eec6f618a7ce5efe84506f15598 100644
--- a/content/renderer/media/audio_device_factory.cc
+++ b/content/renderer/media/audio_device_factory.cc
@@ -5,12 +5,16 @@
 #include "content/renderer/media/audio_device_factory.h"
 
 #include <algorithm>
+#include <memory>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "content/common/content_constants_internal.h"
+#include "content/public/common/content_features.h"

[o1ka, 2017/05/11 10:58:40]

Not needed?

[Max Morin, 2017/05/11 15:31:17]

Done.

 #include "content/renderer/media/audio_input_message_filter.h"
+#include "content/renderer/media/audio_ipc_factory.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/render_thread_impl.h"
@@ -43,14 +47,16 @@ scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
     int session_id,
     const std::string& device_id,
     const url::Origin& security_origin) {
-  AudioMessageFilter* const filter = AudioMessageFilter::Get();
-  scoped_refptr<media::AudioOutputDevice> device(new media::AudioOutputDevice(
-      filter->CreateAudioOutputIPC(render_frame_id), filter->io_task_runner(),
-      session_id, device_id, security_origin,
-      // Set authorization request timeout at 80% of renderer hung timeout, but
-      // no more than kMaxAuthorizationTimeout.
-      base::TimeDelta::FromMilliseconds(std::min(kHungRendererDelayMs * 8 / 10,
-                                                 kMaxAuthorizationTimeoutMs))));
+  std::unique_ptr<media::AudioOutputIPC> ipc;
+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner;
+  ipc = AudioIPCFactory::get()->CreateAudioOutputIPC(render_frame_id);
+  io_task_runner = AudioIPCFactory::get()->io_task_runner();
+  scoped_refptr<media::AudioOutputDevice> device = new media::AudioOutputDevice(
+      std::move(ipc), io_task_runner, session_id, device_id, security_origin,

[o1ka, 2017/05/11 10:58:40]

std::move(io_task_runner)?

[Max Morin, 2017/05/11 15:31:17]

Done.

+      // Set authorization request timeout at 80% of renderer hung timeout,
+      // but no more than kMaxAuthorizationTimeout.
+      base::TimeDelta::FromMilliseconds(
+          std::min(kHungRendererDelayMs * 8 / 10, kMaxAuthorizationTimeoutMs)));
   device->RequestDeviceAuthorization();
   return device;
 }