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

chrome/browser/chromeos/audio/audio_mixer_cras.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_CRAS_H_
 #define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_CRAS_H_
 
 #include <cras_client.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/audio/audio_mixer.h"
 
 namespace chromeos {
 
 // Simple wrapper for sending volume and mute commands to the audio server on
 // ChromeOS.  Interaction happens on a background thread so that initialization
 // can poll until the server is started.
 class AudioMixerCras : public AudioMixer {
  public:
   AudioMixerCras();
   virtual ~AudioMixerCras();
 
   // 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 CRAS.  On failure, posts a delayed Connect() task to
   // try again.  Failure could occur if the CRAS server isn't running yet.
-  void Connect();
+  void Connect(const base::Closure& on_connected);
 
   // Updates |client_| for current values of |volume_percent_| and
   // |is_muted_|. No-op if not connected.
   void ApplyState();
 
   // Calls ApplyState on the proper thread only if no other call is currently
   // pending.
   void ApplyStateIfNeeded();
 
   // Interfaces to the audio server.
@@ skipping 22 matching lines @@
   // Guards |volume_percent_|, |is_muted_|, |is_mute_locked_|,
   // |is_capture_muted_|, |is_capture_mute_locked_|, and |apply_is_pending_|.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioMixerCras);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_MIXER_CRAS_H_