Revert r94579, "chromeos: Simplify audio mixer code."

Various LTR tests are failing on the bots; no ideas why.
Original change description follows.

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
TBR=rtenneti

Review URL: http://codereview.chromium.org/7493069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94607 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index f6c888e..d6d69ef 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -970,7 +970,7 @@ void TestingAutomationProvider::GetVolumeInfo(DictionaryValue* args,
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
   return_value->SetDouble("volume", audio_handler->GetVolumePercent());
-  return_value->SetBoolean("is_mute", audio_handler->IsMuted());
+  return_value->SetBoolean("is_mute", audio_handler->IsMute());
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
@@ -998,6 +998,6 @@ void TestingAutomationProvider::SetMute(DictionaryValue* args,
   }
 
   chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
-  audio_handler->SetMuted(mute);
+  audio_handler->SetMute(mute);
   reply.SendSuccess(NULL);
 }