Don't start speech synthesis until after the audio mixer is initialized.

chrome/browser/chromeos/accessibility_util.cc

 // Copyright (c) 2011 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/accessibility_util.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
+#include "chrome/browser/extensions/extension_tts_api_platform.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 70 matching lines @@
   }
 
   g_browser_process->local_state()->SetBoolean(
       prefs::kAccessibilityEnabled, enabled);
   g_browser_process->local_state()->ScheduleSavePersistentPrefs();
   ExtensionAccessibilityEventRouter::GetInstance()->
       SetAccessibilityEnabled(enabled);
 
   Speak(enabled ?
         l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_ENABLED).c_str() :
-        l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_DISABLED).c_str(),
-        false, true);
+        l10n_util::GetStringUTF8(IDS_CHROMEOS_ACC_ACCESS_DISABLED).c_str());
 
   // Load/Unload ChromeVox
   Profile* profile = ProfileManager::GetDefaultProfile();
   ExtensionService* extension_service =
       profile->GetExtensionService();
   std::string manifest = ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_CHROMEVOX_MANIFEST).as_string();
   FilePath path = FilePath(extension_misc::kAccessExtensionPath)
       .AppendASCII(extension_misc::kChromeVoxDirectoryName);
   if (enabled) { // Load ChromeVox
@@ skipping 26 matching lines @@
 }
 
 void ToggleAccessibility(WebUI* login_web_ui) {
   bool accessibility_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
           prefs::kAccessibilityEnabled);
   accessibility_enabled = !accessibility_enabled;
   EnableAccessibility(accessibility_enabled, login_web_ui);
 };
 
-void Speak(const char* speak_str, bool queue, bool interruptible) {
-  if (queue || !interruptible) {
-    std::string props = "";
-    props.append("enqueue=");
-    props.append(queue ? "1;" : "0;");
-    props.append("interruptible=");
-    props.append(interruptible ? "1;" : "0;");
-    chromeos::DBusThreadManager::Get()->GetSpeechSynthesizerClient()->
-        SetSpeakProperties(props);
-  }
-  chromeos::DBusThreadManager::Get()->GetSpeechSynthesizerClient()->
-      Speak(speak_str);
+void Speak(const char* utterance) {
+  UtteranceContinuousParameters params;
+  ExtensionTtsPlatformImpl::GetInstance()->Speak(
+      -1,  // No utterance ID because we don't need a callback when it finishes.
+      utterance,
+      g_browser_process->GetApplicationLocale(),
+      params);
 }
 
 
 }  // namespace accessibility
 }  // namespace chromeos