Decouple c/b/cros/audio from c/b/speech.

chrome/browser/chromeos/audio/audio_mixer_alsa.h

 // Copyright (c) 2012 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_AUDIO_MIXER_ALSA_H_
 #define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_ALSA_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 namespace chromeos {
 
 // Simple wrapper around ALSA's mixer functions.
 // Interaction with ALSA takes place on a background thread.
 class AudioMixerAlsa : public AudioMixer {
  public:
   AudioMixerAlsa();
   virtual ~AudioMixerAlsa();
 
   // AudioMixer implementation.
-  virtual void Init() OVERRIDE;
+  virtual void Init(const base::Closure& on_connected) OVERRIDE;
   virtual double GetVolumePercent() OVERRIDE;
   virtual void SetVolumePercent(double percent) OVERRIDE;
   virtual bool IsMuted() OVERRIDE;
   virtual void SetMuted(bool mute) OVERRIDE;
   virtual bool IsMuteLocked() OVERRIDE;
   virtual void SetMuteLocked(bool locked) OVERRIDE;
   virtual bool IsCaptureMuted() OVERRIDE;
   virtual void SetCaptureMuted(bool mute) OVERRIDE;
   virtual bool IsCaptureMuteLocked() OVERRIDE;
   virtual void SetCaptureMuteLocked(bool locked) OVERRIDE;
 
  private:
   // Tries to connect to ALSA.  On failure, posts a delayed Connect() task to
   // try again.
-  void Connect();
+  void Connect(const base::Closure& on_connected);
 
   // Helper method called by Connect().  On success, initializes
   // |min_volume_db_|, |max_volume_db_|, |alsa_mixer_|, and |element_*| and
   // returns true.
-  bool ConnectInternal();
+  bool ConnectInternal(const base::Closure& on_connected);
 
   // Disconnects from ALSA if currently connected and signals
   // |disconnected_event_|.
   void Disconnect();
 
   // Updates |alsa_mixer_| for current values of |volume_db_| and |is_muted_|.
   // No-op if not connected.
   void ApplyState();
 
   // Finds the element named |element_name|.  Returns NULL on failure.
@@ skipping 80 matching lines @@
   // Number of times that we've attempted to connect to ALSA.  Just used to keep
   // us from spamming the logs.
   int num_connection_attempts_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioMixerAlsa);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_ALSA_H_