Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Unified Diff: content/browser/browser_main_loop.cc

Issue 1036703002: Add a hang monitor for the audio thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable for OSX. Created 5 years, 9 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
« no previous file with comments | « no previous file | media/audio/audio_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 86cc1a6243abfe6790abc9f611ead394876f2eb1..9e74e35d6f167f9653f2840abb93f43ba3d909b0 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -516,15 +516,6 @@ void BrowserMainLoop::MainMessageLoopStart() {
media::InitializeCPUSpecificMediaFeatures();
}
{
- TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:AudioMan");
- audio_manager_.reset(media::AudioManager::Create(
- MediaInternals::GetInstance()));
- }
- {
- TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MidiManager");
- midi_manager_.reset(media::MidiManager::Create());
- }
- {
TRACE_EVENT0("startup",
"BrowserMainLoop::Subsystem:ContentWebUIController");
WebUIControllerFactory::RegisterFactory(
@@ -1085,6 +1076,17 @@ int BrowserMainLoop::BrowserThreadsStarted() {
BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
#endif
+ {
+ TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan");
+ audio_manager_.reset(media::AudioManager::CreateWithHangTimer(
+ MediaInternals::GetInstance(), io_thread_->task_runner()));
+ }
+
+ {
+ TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:MidiManager");
+ midi_manager_.reset(media::MidiManager::Create());
+ }
+
#if defined(OS_LINUX) && defined(USE_UDEV)
device_monitor_linux_.reset(new DeviceMonitorLinux());
#elif defined(OS_MACOSX)
« no previous file with comments | « no previous file | media/audio/audio_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698