Get rid of src_extension_id from TtsController.

chrome/browser/speech/extension_api/tts_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_extension_api.h"
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 68 matching lines @@
 }
 
 namespace extensions {
 
 // One of these is constructed for each utterance, and deleted
 // when the utterance gets any final event.
 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,
                                           const std::string& error_message) {
   if (utterance->src_id() < 0) {
     if (utterance->finished())
       delete this;
     return;
   }
 
@@ skipping 18 matching lines @@
   details->SetBoolean(constants::kIsFinalEventKey, utterance->finished());
 
   scoped_ptr<base::ListValue> arguments(new base::ListValue());
   arguments->Set(0, details.release());
 
   scoped_ptr<extensions::Event> event(
       new extensions::Event(events::kOnEvent, arguments.Pass()));
   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;
 }
 
 bool TtsSpeakFunction::RunAsync() {
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &text));
   if (text.size() > 32768) {
     error_ = constants::kErrorUtteranceTooLong;
@@ skipping 116 matching lines @@
   SendResponse(true);
 
   UtteranceContinuousParameters continuous_params;
   continuous_params.rate = rate;
   continuous_params.pitch = pitch;
   continuous_params.volume = volume;
 
   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);
   utterance->set_gender(gender);
   utterance->set_continuous_parameters(continuous_params);
   utterance->set_can_enqueue(can_enqueue);
   utterance->set_required_event_types(required_event_types);
   utterance->set_desired_event_types(desired_event_types);
   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);
   return true;
 }
 
 bool TtsStopSpeakingFunction::RunSync() {
   TtsController::GetInstance()->Stop();
   return true;
 }
@@ skipping 67 matching lines @@
 }
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<TtsAPI> > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 BrowserContextKeyedAPIFactory<TtsAPI>* TtsAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions