diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 02:09:56 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 02:09:56 +0000 |
| commit | c190ba40cef7262e1504642352ed0380114c832a (patch) | |
| tree | 449f524427e5efb6b878e83b38fb05bfc76ffe11 /chrome/test | |
| parent | 7763a6a02fcd4479111530b64b9f6e00899aad2d (diff) | |
| download | chromium_src-c190ba40cef7262e1504642352ed0380114c832a.zip chromium_src-c190ba40cef7262e1504642352ed0380114c832a.tar.gz chromium_src-c190ba40cef7262e1504642352ed0380114c832a.tar.bz2 | |
chromeos: Simplify audio mixer code.
Reverts r94607, which reverted r94579. I've changed my
LOG(ERROR)s to LOG(WARNING)s to avoid tickling
http://crbug.com/90933.
This cleans up the code that talks to ALSA. All changes are
now made asynchronously on a background thread. The volume
and muting states are now tracked separately, as well.
This makes it possible to make some requested changes to the
behavior of the volume keys. I'm hoping that there's also a
chance that it'll fix some related bugs that people have
been seeing, or at least make it easier to debug them.
BUG=chromium-os:17588, chromium-os:14058, chromium-os:13618,
chromium-os:8473
TEST=manual
TBR=scherkus (already LGTMed it once; this just changes the LOG(ERROR)s to LOG(WARNING)s)
Review URL: http://codereview.chromium.org/7523044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 195ed7e..8575d1f 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -129,10 +129,6 @@ void InProcessBrowserTest::SetUp() { // Make sure that the log directory exists. FilePath log_dir = logging::GetSessionLogFile(*command_line).DirName(); file_util::CreateDirectory(log_dir); - - // Disable audio mixer as it can cause hang. - // see http://crosbug.com/17058. - chromeos::AudioHandler::Disable(); #endif // defined(OS_CHROMEOS) SandboxInitWrapper sandbox_wrapper; |