Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / speech / extension_api / tts_extension_api.cc

diff --git a/src/chrome/browser/speech/extension_api/tts_extension_api.cc b/src/chrome/browser/speech/extension_api/tts_extension_api.cc
index bc8baf5..89db1c5 100644 (file)
--- a/src/chrome/browser/speech/extension_api/tts_extension_api.cc
+++ b/src/chrome/browser/speech/extension_api/tts_extension_api.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/speech/tts_controller.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_registry.h"
-#include "extensions/browser/extension_system.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace constants = tts_extension_api_constants;
@@ -129,15 +128,14 @@ void TtsExtensionEventHandler::OnTtsEvent(Utterance* utterance,
       new extensions::Event(events::kOnEvent, arguments.Pass()));
   event->restrict_to_browser_context = utterance->profile();
   event->event_url = utterance->src_url();
-  extensions::ExtensionSystem::Get(utterance->profile())->event_router()->
-      DispatchEventToExtension(utterance->src_extension_id(), event.Pass());
+  extensions::EventRouter::Get(utterance->profile())
+      ->DispatchEventToExtension(utterance->src_extension_id(), event.Pass());
 
   if (utterance->finished())
     delete this;
 }
 
-
-bool TtsSpeakFunction::RunImpl() {
+bool TtsSpeakFunction::RunAsync() {
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &text));
   if (text.size() > 32768) {
@@ -287,28 +285,28 @@ bool TtsSpeakFunction::RunImpl() {
   return true;
 }
 
-bool TtsStopSpeakingFunction::RunImpl() {
+bool TtsStopSpeakingFunction::RunSync() {
   TtsController::GetInstance()->Stop();
   return true;
 }
 
-bool TtsPauseFunction::RunImpl() {
+bool TtsPauseFunction::RunSync() {
   TtsController::GetInstance()->Pause();
   return true;
 }
 
-bool TtsResumeFunction::RunImpl() {
+bool TtsResumeFunction::RunSync() {
   TtsController::GetInstance()->Resume();
   return true;
 }
 
-bool TtsIsSpeakingFunction::RunImpl() {
+bool TtsIsSpeakingFunction::RunSync() {
   SetResult(base::Value::CreateBooleanValue(
       TtsController::GetInstance()->IsSpeaking()));
   return true;
 }
 
-bool TtsGetVoicesFunction::RunImpl() {
+bool TtsGetVoicesFunction::RunSync() {
   std::vector<VoiceData> voices;
   TtsController::GetInstance()->GetVoices(GetProfile(), &voices);