Get rid of src_extension_id from TtsController.

chrome/browser/speech/extension_api/tts_extension_api.cc

Index: chrome/browser/speech/extension_api/tts_extension_api.cc
diff --git a/chrome/browser/speech/extension_api/tts_extension_api.cc b/chrome/browser/speech/extension_api/tts_extension_api.cc
index 236278ad1a4affb20c3d1eb10e57e6f659a4f9f5..eb9d8cf87a9f62822d294d5c8b72c459227eed92 100644
--- a/chrome/browser/speech/extension_api/tts_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_extension_api.cc
@@ -86,12 +86,22 @@ class TtsExtensionEventHandler
     : public UtteranceEventDelegate,
       public base::SupportsWeakPtr<TtsExtensionEventHandler> {
  public:
+  explicit TtsExtensionEventHandler(const std::string& src_extension_id);
+
   virtual void OnTtsEvent(Utterance* utterance,
                           TtsEventType event_type,
                           int char_index,
                           const std::string& error_message) OVERRIDE;
+
+ private:
+  std::string src_extension_id_;

[David Tseng, 2014/10/02 22:49:38]

nit: migrate the [modified] comment as well?

[dmazzoni, 2014/10/21 18:50:55]

Done.

 };
 
+TtsExtensionEventHandler::TtsExtensionEventHandler(
+    const std::string& src_extension_id)
+    : src_extension_id_(src_extension_id) {
+}
+
 void TtsExtensionEventHandler::OnTtsEvent(Utterance* utterance,
                                           TtsEventType event_type,
                                           int char_index,
@@ -130,7 +140,7 @@ void TtsExtensionEventHandler::OnTtsEvent(Utterance* utterance,
   event->restrict_to_browser_context = utterance->browser_context();
   event->event_url = utterance->src_url();
   extensions::EventRouter::Get(utterance->browser_context())
-      ->DispatchEventToExtension(utterance->src_extension_id(), event.Pass());
+      ->DispatchEventToExtension(src_extension_id_, event.Pass());
 
   if (utterance->finished())
     delete this;
@@ -267,7 +277,6 @@ bool TtsSpeakFunction::RunAsync() {
   Utterance* utterance = new Utterance(GetProfile());
   utterance->set_text(text);
   utterance->set_voice_name(voice_name);
-  utterance->set_src_extension_id(extension_id());
   utterance->set_src_id(src_id);
   utterance->set_src_url(source_url());
   utterance->set_lang(lang);
@@ -279,7 +288,7 @@ bool TtsSpeakFunction::RunAsync() {
   utterance->set_extension_id(voice_extension_id);
   utterance->set_options(options.get());
   utterance->set_event_delegate(
-      (new TtsExtensionEventHandler())->AsWeakPtr());
+      (new TtsExtensionEventHandler(extension_id()))->AsWeakPtr());
 
   TtsController* controller = TtsController::GetInstance();
   controller->SpeakOrEnqueue(utterance);