Allow spoken feedback to be routed to TTS extensions, not just built-in TTS.

chrome/browser/chromeos/accessibility/accessibility_util.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/accessibility/accessibility_util.h"
 
 #include <queue>
 
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/speech/extension_api/tts_extension_api_platform.h"
+#include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 156 matching lines @@
 }
 
 void ToggleSpokenFeedback(content::WebUI* login_web_ui) {
   bool spoken_feedback_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
           prefs::kSpokenFeedbackEnabled);
   spoken_feedback_enabled = !spoken_feedback_enabled;
   EnableSpokenFeedback(spoken_feedback_enabled, login_web_ui);
 };
 
-void Speak(const std::string& utterance) {
+void Speak(const std::string& text) {
   UtteranceContinuousParameters params;
-  ExtensionTtsPlatformImpl::GetInstance()->Speak(
-      -1,  // No utterance ID because we don't need a callback when it finishes.
-      utterance.c_str(),
-      g_browser_process->GetApplicationLocale(),
-      params);
+
+  Profile* profile = ProfileManager::GetDefaultProfile();
+  Utterance* utterance = new Utterance(profile);
+  utterance->set_text(text);
+  utterance->set_lang(g_browser_process->GetApplicationLocale());
+  utterance->set_continuous_parameters(params);
+  utterance->set_can_enqueue(false);
+  utterance->set_options(new DictionaryValue());
+
+  ExtensionTtsController* controller = ExtensionTtsController::GetInstance();
+  controller->SpeakOrEnqueue(utterance);
 }
 
 bool IsSpokenFeedbackEnabled() {
   if (!g_browser_process) {
     return false;
   }
   PrefService* prefs = g_browser_process->local_state();
   bool spoken_feedback_enabled = prefs &&
       prefs->GetBoolean(prefs::kSpokenFeedbackEnabled);
   return spoken_feedback_enabled;
@@ skipping 18 matching lines @@
   return enabled;
 }
 
 void MaybeSpeak(const std::string& utterance) {
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 }  // namespace accessibility
 }  // namespace chromeos