Revert 53992 - An earlier check-in (r51786, Issue 2769008) caused a memory le...

chrome/browser/chromeos/audio_handler.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/audio_handler.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/pulse_audio_mixer.h"
@@ skipping 77 matching lines @@
 
 void AudioHandler::SetMute(bool do_mute) {
   if (!VerifyMixerConnection())
     return;
 
   DLOG(INFO) << "Setting Mute to " << do_mute;
 
   mixer_->SetMute(do_mute);
 }
 
-bool AudioHandler::IsValid() {
-  return mixer_->CheckState() == PulseAudioMixer::READY;
+void AudioHandler::OnMixerInitialized(bool success) {
+  connected_ = success;
+  DLOG(INFO) << "OnMixerInitialized, success = " << success;
 }
 
 AudioHandler::AudioHandler()
-    : reconnect_tries_(0) {
+    : connected_(false),
+      reconnect_tries_(0) {
   mixer_.reset(new PulseAudioMixer());
-  connected_ = mixer_->InitSync();
-  DLOG(INFO) << "Mixer connected = " << connected_;
+  if (!mixer_->Init(NewCallback(this, &AudioHandler::OnMixerInitialized))) {
+    LOG(ERROR) << "Unable to connect to PulseAudio";
+  }
 }
 
 AudioHandler::~AudioHandler() {
 };
 
 bool AudioHandler::VerifyMixerConnection() {
   PulseAudioMixer::State mixer_state = mixer_->CheckState();
   if (mixer_state == PulseAudioMixer::READY)
     return true;
   if (connected_) {
@@ skipping 41 matching lines @@
       (kMaxVolumeDb - kMinVolumeDb), 1/kVolumeBias);
 }
 
 // static
 double AudioHandler::PercentToVolumeDb(double volume_percent) {
   return pow(volume_percent / 100.0, kVolumeBias) *
       (kMaxVolumeDb - kMinVolumeDb) + kMinVolumeDb;
 }
 
 }  // namespace chromeos