Revert of Eliminate the dependence of tts extension API for tts_controller.cc

chrome/browser/speech/extension_api/tts_engine_extension_api.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/speech/extension_api/tts_engine_extension_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 42 matching lines @@
       ExtensionSystem::Get(profile)->process_manager();
   extensions::ExtensionHost* host =
       process_manager->GetBackgroundHostForExtension(extension_id);
   host->render_process_host()->Send(new ExtensionMsg_AddMessageToConsole(
       host->render_view_host()->GetRoutingID(),
       content::CONSOLE_MESSAGE_LEVEL_WARNING,
       constants::kErrorMissingPauseOrResume));
 };
 }  // anonymous namespace
 
-TtsExtensionEngine* TtsExtensionEngine::GetInstance() {
-  return Singleton<TtsExtensionEngine>::get();
-}
-
-void TtsExtensionEngine::GetVoices(Profile* profile,
-    std::vector<VoiceData>* out_voices) {
+void GetExtensionVoices(Profile* profile, std::vector<VoiceData>* out_voices) {
   ExtensionService* service = profile->GetExtensionService();
   DCHECK(service);
   EventRouter* event_router =
       ExtensionSystem::Get(profile)->event_router();
   DCHECK(event_router);
 
   bool is_offline = (net::NetworkChangeNotifier::GetConnectionType() ==
                      net::NetworkChangeNotifier::CONNECTION_NONE);
 
   const extensions::ExtensionSet* extensions = service->extensions();
@@ skipping 46 matching lines @@
       // queueing and send interrupted and cancelled events.
       if (voice.event_types.find(constants::kEventTypeEnd) !=
           voice.event_types.end()) {
         result_voice.events.insert(TTS_EVENT_CANCELLED);
         result_voice.events.insert(TTS_EVENT_INTERRUPTED);
       }
     }
   }
 }
 
-void TtsExtensionEngine::Speak(Utterance* utterance,
-                               const VoiceData& voice) {
+void ExtensionTtsEngineSpeak(Utterance* utterance, const VoiceData& voice) {
   // See if the engine supports the "end" event; if so, we can keep the
   // utterance around and track it. If not, we're finished with this
   // utterance now.
   bool sends_end_event = voice.events.find(TTS_EVENT_END) != voice.events.end();
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Set(0, base::Value::CreateStringValue(utterance->text()));
 
   // Pass through most options to the speech engine, but remove some
   // that are handled internally.
@@ skipping 23 matching lines @@
   args->Set(1, options.release());
   args->Set(2, base::Value::CreateIntegerValue(utterance->id()));
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnSpeak, args.Pass()));
   event->restrict_to_browser_context = utterance->profile();
   ExtensionSystem::Get(utterance->profile())->event_router()->
       DispatchEventToExtension(utterance->extension_id(), event.Pass());
 }
 
-void TtsExtensionEngine::Stop(Utterance* utterance) {
+void ExtensionTtsEngineStop(Utterance* utterance) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnStop, args.Pass()));
   event->restrict_to_browser_context = utterance->profile();
   ExtensionSystem::Get(utterance->profile())->event_router()->
       DispatchEventToExtension(utterance->extension_id(), event.Pass());
 }
 
-void TtsExtensionEngine::Pause(Utterance* utterance) {
+void ExtensionTtsEnginePause(Utterance* utterance) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnPause, args.Pass()));
   Profile* profile = utterance->profile();
   event->restrict_to_browser_context = profile;
   EventRouter* event_router = ExtensionSystem::Get(profile)->event_router();
   std::string id = utterance->extension_id();
   event_router->DispatchEventToExtension(id, event.Pass());
   WarnIfMissingPauseOrResumeListener(profile, event_router, id);
 }
 
-void TtsExtensionEngine::Resume(Utterance* utterance) {
+void ExtensionTtsEngineResume(Utterance* utterance) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<extensions::Event> event(new extensions::Event(
       tts_engine_events::kOnResume, args.Pass()));
   Profile* profile = utterance->profile();
   event->restrict_to_browser_context = profile;
   EventRouter* event_router = ExtensionSystem::Get(profile)->event_router();
   std::string id = utterance->extension_id();
   event_router->DispatchEventToExtension(id, event.Pass());
   WarnIfMissingPauseOrResumeListener(profile, event_router, id);
 }
@@ skipping 63 matching lines @@
         utterance_id, TTS_EVENT_PAUSE, char_index, std::string());
   } else if (event_type == constants::kEventTypeResume) {
     controller->OnTtsEvent(
         utterance_id, TTS_EVENT_RESUME, char_index, std::string());
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
 
   return true;
 }