content/browser/browser_main_loop.cc - Issue 1806313003: Pass task runners to AudioManager constructor.

Unified Diff: content/browser/browser_main_loop.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: DCHECK -> CHECK Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chromecast/media/audio/cast_audio_manager_factory.cc ('K') | « content/browser/browser_main_loop.h ('k') | content/browser/renderer_host/media/audio_input_device_manager_unittest.cc » ('j') | media/audio/audio_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 65e88aced2e3117ad82bb6682e2fccfdfa859280..1a3e5aa495bbc651fe2ba9a4a99f6949170fb608 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -75,7 +75,6 @@

#include "content/public/common/result_codes.h"

#include "device/battery/battery_status_service.h"

#include "ipc/mojo/scoped_ipc_support.h"

-#include "media/audio/audio_manager.h"

#include "media/base/media.h"

#include "media/base/user_input_monitor.h"

#include "media/midi/midi_manager.h"

@@ -1228,8 +1227,31 @@ int BrowserMainLoop::BrowserThreadsStarted() {

{

TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");

- audio_manager_.reset(media::AudioManager::CreateWithHangTimer(

- MediaInternals::GetInstance(), io_thread_->task_runner()));

+ // TODO(alokp): Allow content embedders to override the default

tommi (sloooow) - chröme 2016/04/13 07:31:51 nit: in order to keep the size of BrowserThreadsSt

alokp 2016/04/17 16:55:19 Done.

+ // task runners by defining ContentBrowserClient::GetAudioTaskRunner.

+ scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner;

+ scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner;

+ scoped_refptr<base::SingleThreadTaskRunner> monitor_task_runner;

+ audio_thread_.reset(new base::Thread("AudioThread"));

+#if defined(OS_WIN)

+ audio_thread_->init_com_with_mta(true);

+#endif // defined(OS_WIN)

+ CHECK(audio_thread_->Start());

+#if defined(OS_MACOSX)

+ // On Mac audio task runner must belong to the main thread.

+ // See http://crbug.com/158170.

+ // Since the audio thread is the UI thread, a hang monitor is not

+ // necessary or recommended.

+ audio_task_runner = base::ThreadTaskRunnerHandle::Get();

+ worker_task_runner = audio_thread_->task_runner();

+#else

+ audio_task_runner = audio_thread_->task_runner();

+ worker_task_runner = audio_thread_->task_runner();

+ monitor_task_runner = io_thread_->task_runner();

+#endif // defined(OS_MACOSX)

+ audio_manager_ = media::AudioManager::Create(

+ std::move(audio_task_runner), std::move(worker_task_runner),

+ std::move(monitor_task_runner), MediaInternals::GetInstance());

}

{