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

chrome/browser/chromeos/audio_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
 #define CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
@@ skipping 24 matching lines @@
   // blocking call.
   void AdjustVolumeByPercent(double adjust_by_percent);
 
   // Just returns true if mute, false if not or an error occurred.
   // Blocking call.
   bool IsMute();
 
   // Mutes all audio.  Non-blocking call.
   void SetMute(bool do_mute);
 
-  // AudioHandler is a singleton initialized at startup.  Use this to determine
-  // if there is a valid connection to a mixer.
-  bool IsValid();
-
  private:
   // Defines the delete on exit Singleton traits we like.  Best to have this
   // and constructor/destructor private as recommended for Singletons.
   friend struct DefaultSingletonTraits<AudioHandler>;
 
+  void OnMixerInitialized(bool success);
+
   AudioHandler();
   virtual ~AudioHandler();
   bool VerifyMixerConnection();
 
   // Conversion between our internal scaling (0-100%) and decibels.
   static double VolumeDbToPercent(double volume_db);
   static double PercentToVolumeDb(double volume_percent);
 
   scoped_ptr<PulseAudioMixer> mixer_;
   bool connected_;
   int reconnect_tries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_AUDIO_HANDLER_H_