| Index: media/audio/audio_manager.cc
|
| diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
|
| index fae54bfd166dcf263aaf1bcb158fb5254590c7db..30304b231db697b275bb39d71b15336492a97645 100644
|
| --- a/media/audio/audio_manager.cc
|
| +++ b/media/audio/audio_manager.cc
|
| @@ -78,6 +78,9 @@ class AudioManagerHelper : public base::PowerObserver {
|
| base::Unretained(this)));
|
| }
|
|
|
| + base::SingleThreadTaskRunner* monitor_task_runner() const {
|
| + return monitor_task_runner_.get();
|
| + }
|
| AudioLogFactory* fake_log_factory() { return &fake_log_factory_; }
|
|
|
| #if defined(OS_WIN)
|
| @@ -327,8 +330,11 @@ ScopedAudioManagerPtr AudioManager::CreateForTesting(
|
| }
|
|
|
| // static
|
| -void AudioManager::StartHangMonitor(
|
| +void AudioManager::StartHangMonitorIfNeeded(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
|
| + if (g_helper.Pointer()->monitor_task_runner())
|
| + return;
|
| +
|
| DCHECK(AudioManager::Get());
|
| DCHECK(task_runner);
|
| DCHECK_NE(task_runner, AudioManager::Get()->GetTaskRunner());
|
|
|