Add a mojo implementation of AudioOutputIPC.

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 <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"
 #include "media/audio/audio_input_device.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/media_switches.h"
 #include "url/origin.h"
 
 namespace content {
@@ skipping 12 matching lines @@
 const int64_t kMaxAuthorizationTimeoutMs = 10000;
 #else
 const int64_t kMaxAuthorizationTimeoutMs = 0;  // No timeout.
 #endif
 
 scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
     int render_frame_id,
     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;
 }
 
 // This is where we decide which audio will go to mixers and which one to
 // AudioOutpuDevice directly.
 bool IsMixable(AudioDeviceFactory::SourceType source_type) {
   if (source_type == AudioDeviceFactory::kSourceMediaElement)
     return true;  // Must ALWAYS go through mixer.
 
@@ skipping 151 matching lines @@
                                                device_id, security_origin);
     if (sink)
       return sink;
   }
 
   return NewOutputDevice(render_frame_id, session_id, device_id,
                          security_origin);
 }
 
 }  // namespace content