Switch audio hang monitor to default-off. Enable for non-beta,stable.

media/audio/audio_manager.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 "media/audio/audio_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "build/build_config.h"
 #include "media/audio/audio_manager_factory.h"
 #include "media/audio/fake_audio_log_factory.h"
+#include "media/base/media_switches.h"
 
 namespace media {
 namespace {
 
 // The singleton instance of AudioManager. This is set when Create() is called.
 AudioManager* g_last_created = NULL;
 
 // The singleton instance of AudioManagerFactory. This is only set if
 // SetFactory() is called. If it is set when Create() is called, its
 // CreateInstance() function is used to set |g_last_created|. Otherwise, the
@@ skipping 97 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> monitor_task_runner_;
 
   base::Lock hang_lock_;
   bool hang_detection_enabled_;
   base::TimeTicks last_audio_thread_timer_tick_;
   int hang_failures_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioManagerHelper);
 };
 
+static bool g_hang_monitor_enabled = false;
+
 static base::LazyInstance<AudioManagerHelper>::Leaky g_helper =
     LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
 // Forward declaration of the platform specific AudioManager factory function.
 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory);
 
 AudioManager::AudioManager() {}
 
 AudioManager::~AudioManager() {
@@ skipping 26 matching lines @@
     g_last_created = CreateAudioManager(audio_log_factory);
 
   return g_last_created;
 }
 
 // static
 AudioManager* AudioManager::CreateWithHangTimer(
     AudioLogFactory* audio_log_factory,
     const scoped_refptr<base::SingleThreadTaskRunner>& monitor_task_runner) {
   AudioManager* manager = Create(audio_log_factory);
-  // On OSX the audio thread is the UI thread, for which a hang monitor is not
-  // necessary.
-#if !defined(OS_MACOSX)
-  g_helper.Pointer()->StartHangTimer(monitor_task_runner);
-#endif
+  if (g_hang_monitor_enabled ||
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableAudioHangMonitor)) {
+    g_helper.Pointer()->StartHangTimer(monitor_task_runner);
+  }
   return manager;
 }
 
 // static
 AudioManager* AudioManager::CreateForTesting() {
   return Create(g_helper.Pointer()->fake_log_factory());
 }
 
 // static
+void AudioManager::EnableHangMonitor() {
+  CHECK(!g_last_created);
+// On OSX the audio thread is the UI thread, for which a hang monitor is not
+// necessary or recommended.  If it's manually requested, we should allow it
+// to start though.
+#if !defined(OS_MACOSX)
+  g_hang_monitor_enabled = true;
+#endif
+}
+
+// static
 AudioManager* AudioManager::Get() {
   return g_last_created;
 }
 
 }  // namespace media