| 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..7f72d259d0721d20607cc252dfd8bb5961ae3336 100644
|
| --- a/content/renderer/media/audio_device_factory.cc
|
| +++ b/content/renderer/media/audio_device_factory.cc
|
| @@ -11,7 +11,7 @@
|
| #include "build/build_config.h"
|
| #include "content/common/content_constants_internal.h"
|
| #include "content/renderer/media/audio_input_message_filter.h"
|
| -#include "content/renderer/media/audio_message_filter.h"
|
| +#include "content/renderer/media/audio_ipc_factory.h"
|
| #include "content/renderer/media/audio_renderer_mixer_manager.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "media/audio/audio_input_device.h"
|
| @@ -43,14 +43,14 @@ 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))));
|
| + auto device = base::MakeRefCounted<media::AudioOutputDevice>(
|
| + AudioIPCFactory::get()->CreateAudioOutputIPC(render_frame_id),
|
| + AudioIPCFactory::get()->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)));
|
| device->RequestDeviceAuthorization();
|
| return device;
|
| }
|
|
|