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

chrome/browser/chromeos/audio/audio_mixer_cras.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_mixer_cras.h"
 
 #include <cmath>
 #include <cras_client.h>
 #include <unistd.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/speech/extension_api/tts_extension_api_chromeos.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 // Default volume as a percentage in the range [0.0, 100.0].
 const double kDefaultVolumePercent = 75.0;
@@ skipping 19 matching lines @@
     return;
   DCHECK(MessageLoop::current() != thread_->message_loop());
 
   base::ThreadRestrictions::ScopedAllowIO allow_io_for_thread_join;
   thread_->Stop();
   thread_.reset();
 
   cras_client_destroy(client_);
 }
 
-void AudioMixerCras::Init() {
+void AudioMixerCras::Init(const base::Closure& on_connected) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!thread_.get()) << "Init() called twice";
 
   thread_.reset(new base::Thread("AudioMixerCras"));
   CHECK(thread_->Start());
   thread_->message_loop()->PostTask(
-      FROM_HERE, base::Bind(&AudioMixerCras::Connect, base::Unretained(this)));
+      FROM_HERE, base::Bind(&AudioMixerCras::Connect,
+                            base::Unretained(this),
+                            on_connected));
 }
 
 double AudioMixerCras::GetVolumePercent() {
   base::AutoLock lock(lock_);
   return volume_percent_;
 }
 
 void AudioMixerCras::SetVolumePercent(double percent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 57 matching lines @@
   return is_capture_mute_locked_;
 }
 
 void AudioMixerCras::SetCaptureMuteLocked(bool locked) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::AutoLock lock(lock_);
   is_capture_mute_locked_ = locked;
   ApplyStateIfNeeded();
 }
 
-void AudioMixerCras::Connect() {
+void AudioMixerCras::Connect(const base::Closure& on_connected) {
   DCHECK(MessageLoop::current() == thread_->message_loop());
 
   // Create the client structure.
   if (client_ == NULL && cras_client_create(&client_) < 0) {
     LOG(DFATAL) << "cras_client_create() failed";
     return; // TODO(dgreid) change interface so this can return an error.
   }
 
   if (cras_client_connect(client_) != 0) {
-    thread_->message_loop()->PostDelayedTask(FROM_HERE,
-        base::Bind(&AudioMixerCras::Connect, base::Unretained(this)),
+    thread_->message_loop()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&AudioMixerCras::Connect,
+                   base::Unretained(this),
+                   on_connected),
         base::TimeDelta::FromSeconds(kConnectionRetrySleepSec));
     return;
   }
   client_connected_ = true;
 
-  // The speech synthesis service shouldn't be initialized until after
-  // we get to this point, so we call this function to tell it that it's
-  // safe to do TTS now.  NotificationService would be cleaner,
-  // but it's not available at this point.
-  EnableChromeOsTts();
+  on_connected.Run();
 
   ApplyState();
 }
 
 void AudioMixerCras::ApplyState() {
   DCHECK(MessageLoop::current() == thread_->message_loop());
   if (!client_connected_)
     return;
 
   bool should_mute = false;
@@ skipping 27 matching lines @@
 void AudioMixerCras::ApplyStateIfNeeded() {
   lock_.AssertAcquired();
   if (client_connected_ && !apply_is_pending_) {
     thread_->message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&AudioMixerCras::ApplyState, base::Unretained(this)));
   }
 }
 
 }  // namespace chromeos