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

chrome/browser/chromeos/audio/audio_handler.cc

 // 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.
 
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 
 // Values used for muted preference.
 const int kPrefMuteOff = 0;
 const int kPrefMuteOn = 1;
 
 static AudioHandler* g_audio_handler = NULL;
 
 }  // namespace
 
 // static
-void AudioHandler::Initialize() {
+void AudioHandler::Initialize(const base::Closure& on_connected) {
   CHECK(!g_audio_handler);
 #if defined(USE_CRAS)
-  g_audio_handler = new AudioHandler(new AudioMixerCras());
+  g_audio_handler = new AudioHandler(new AudioMixerCras(), on_connected);
 #else
-  g_audio_handler = new AudioHandler(new AudioMixerAlsa());
+  g_audio_handler = new AudioHandler(new AudioMixerAlsa(), on_connected);
 #endif
 }
 
 // static
 void AudioHandler::Shutdown() {
   // We may call Shutdown without calling Initialize, e.g. if we exit early.
   if (g_audio_handler) {
     delete g_audio_handler;
     g_audio_handler = NULL;
   }
 }
 
 // static
 void AudioHandler::InitializeForTesting(AudioMixer* mixer) {
   CHECK(!g_audio_handler);
-  g_audio_handler = new AudioHandler(mixer);
+  g_audio_handler = new AudioHandler(mixer, base::Closure());
 }
 
 // static
 AudioHandler* AudioHandler::GetInstance() {
   VLOG_IF(1, !g_audio_handler)
       << "AudioHandler::GetInstance() called with NULL global instance.";
   return g_audio_handler;
 }
 
 // static
@@ skipping 86 matching lines @@
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kAudioOutputAllowed ||
         *pref_name == prefs::kAudioCaptureAllowed) {
       ApplyAudioPolicy();
     }
   } else {
     NOTREACHED() << "Unexpected notification type : " << type;
   }
 }
 
-AudioHandler::AudioHandler(AudioMixer* mixer)
+AudioHandler::AudioHandler(AudioMixer* mixer, const base::Closure& on_connected)
     : mixer_(mixer),
       local_state_(g_browser_process->local_state()) {
   InitializePrefObservers();
-  mixer_->Init();
+  mixer_->Init(on_connected);
   ApplyAudioPolicy();
   SetMuted(local_state_->GetInteger(prefs::kAudioMute) == kPrefMuteOn);
   SetVolumePercentInternal(local_state_->GetDouble(prefs::kAudioVolumePercent));
 }
 
 AudioHandler::~AudioHandler() {
   mixer_.reset();
 };
 
 void AudioHandler::InitializePrefObservers() {
@@ skipping 15 matching lines @@
   mixer_->SetCaptureMuteLocked(false);
   if (local_state_->GetBoolean(prefs::kAudioCaptureAllowed)) {
     mixer_->SetCaptureMuted(false);
   } else {
     mixer_->SetCaptureMuted(true);
     mixer_->SetCaptureMuteLocked(true);
   }
 }
 
 }  // namespace chromeos