Revert 138278 - Fix the volume controlling behaviors.

chrome/browser/chromeos/audio/audio_handler.cc

Index: chrome/browser/chromeos/audio/audio_handler.cc
===================================================================
--- chrome/browser/chromeos/audio/audio_handler.cc	(revision 138298)
+++ chrome/browser/chromeos/audio/audio_handler.cc	(working copy)
@@ -40,11 +40,7 @@
 // static
 void AudioHandler::Initialize() {
   CHECK(!g_audio_handler);
-#if defined(USE_CRAS)
-  g_audio_handler = new AudioHandler(new AudioMixerCras());
-#else
-  g_audio_handler = new AudioHandler(new AudioMixerAlsa());
-#endif
+  g_audio_handler = new AudioHandler();
 }
 
 // static
@@ -57,12 +53,6 @@
 }
 
 // static
-void AudioHandler::InitializeForTesting(AudioMixer* mixer) {
-  CHECK(!g_audio_handler);
-  g_audio_handler = new AudioHandler(mixer);
-}
-
-// static
 AudioHandler* AudioHandler::GetInstance() {
   VLOG_IF(1, !g_audio_handler)
       << "AudioHandler::GetInstance() called with NULL global instance.";
@@ -125,8 +115,12 @@
   volume_observers_.RemoveObserver(observer);
 }
 
-AudioHandler::AudioHandler(AudioMixer* mixer)
-    : mixer_(mixer),
+AudioHandler::AudioHandler()
+#if defined(USE_CRAS)
+    : mixer_(new AudioMixerCras()),
+#else
+    : mixer_(new AudioMixerAlsa()),
+#endif
       prefs_(g_browser_process->local_state()) {
   mixer_->SetVolumePercent(prefs_->GetDouble(prefs::kAudioVolumePercent));
   mixer_->SetMuted(prefs_->GetInteger(prefs::kAudioMute) == kPrefMuteOn);