diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:56:28 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:56:28 +0000 |
| commit | e2e2411a8144afd467a0b558541521355b543506 (patch) | |
| tree | bc7f5924c37624220a4fd0ebabbe9044b59a7942 /chrome/browser/chromeos/audio_handler.h | |
| parent | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (diff) | |
| download | chromium_src-e2e2411a8144afd467a0b558541521355b543506.zip chromium_src-e2e2411a8144afd467a0b558541521355b543506.tar.gz chromium_src-e2e2411a8144afd467a0b558541521355b543506.tar.bz2 | |
Disable Alsa mixer in browser tests
This is a workaround for race condition bug crosbug.com/17058.
BUG=chromium-os:17058, chromium:78764
TEST=chromium os builder should stay green.
Review URL: http://codereview.chromium.org/6823082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/audio_handler.h')
| -rw-r--r-- | chrome/browser/chromeos/audio_handler.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/audio_handler.h b/chrome/browser/chromeos/audio_handler.h index 096c26d..a6b5c8b 100644 --- a/chrome/browser/chromeos/audio_handler.h +++ b/chrome/browser/chromeos/audio_handler.h @@ -10,6 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" +class InProcessBrowserTest; template <typename T> struct DefaultSingletonTraits; namespace chromeos { @@ -55,6 +56,11 @@ class AudioHandler { // and constructor/destructor private as recommended for Singletons. friend struct DefaultSingletonTraits<AudioHandler>; + friend class ::InProcessBrowserTest; + // Disable audio in browser tests. This is a workaround for the bug + // crosbug.com/17058. Remove this once it's fixed. + static void Disable(); + // Connect to the current mixer_type_. bool TryToConnect(bool async); @@ -89,4 +95,3 @@ class AudioHandler { DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::AudioHandler); #endif // CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_ - |