summaryrefslogtreecommitdiffstats
path: root/chrome/test/in_process_browser_test.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 23:27:00 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 23:27:00 +0000
commit4a897672921049e8e2d6422c688a502ba30f8cd1 (patch)
tree86c16e5ede06f751aae258cc61f57c9776bd20a0 /chrome/test/in_process_browser_test.cc
parent5bfe52255baf07910a03d48b686675741a15cb9b (diff)
downloadchromium_src-4a897672921049e8e2d6422c688a502ba30f8cd1.zip
chromium_src-4a897672921049e8e2d6422c688a502ba30f8cd1.tar.gz
chromium_src-4a897672921049e8e2d6422c688a502ba30f8cd1.tar.bz2
chromeos: Simplify audio mixer code.
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: cleared audio prefs and made sure that reasonable defaults were used; pressed volume keys just after boot and checked that nothing happened; waited a few seconds more and started seeing volume bubble; checked that muting and going to min and max volume worked as expected Review URL: http://codereview.chromium.org/7508006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.cc')
-rw-r--r--chrome/test/in_process_browser_test.cc4
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;