Implement TTS dispatcher using RenderProcessObserver instead of MessageFilter.

chrome/renderer/tts_dispatcher.cc

 // Copyright (c) 2013 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/renderer/tts_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/tts_messages.h"
 #include "chrome/common/tts_utterance_request.h"
 #include "content/public/renderer/render_thread.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSpeechSynthesisUtterance.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSpeechSynthesisVoice.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
 using content::RenderThread;
 using WebKit::WebSpeechSynthesizerClient;
 using WebKit::WebSpeechSynthesisUtterance;
 using WebKit::WebSpeechSynthesisVoice;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 int TtsDispatcher::next_utterance_id_ = 1;
 
 TtsDispatcher::TtsDispatcher(WebSpeechSynthesizerClient* client)
-    : synthesizer_client_(client),
-      main_loop_(base::MessageLoopProxy::current()) {
-  RenderThread::Get()->AddFilter(this);
+    : synthesizer_client_(client) {
+  RenderThread::Get()->AddObserver(this);
 }
 
 TtsDispatcher::~TtsDispatcher() {
 }
 
-bool TtsDispatcher::OnMessageReceived(const IPC::Message& message) {
+bool TtsDispatcher::OnControlMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(TtsDispatcher, message)
     IPC_MESSAGE_HANDLER(TtsMsg_SetVoiceList, OnSetVoiceList)
     IPC_MESSAGE_HANDLER(TtsMsg_DidStartSpeaking, OnDidStartSpeaking)
     IPC_MESSAGE_HANDLER(TtsMsg_DidFinishSpeaking, OnDidFinishSpeaking)
     IPC_MESSAGE_HANDLER(TtsMsg_DidPauseSpeaking, OnDidPauseSpeaking)
     IPC_MESSAGE_HANDLER(TtsMsg_DidResumeSpeaking, OnDidResumeSpeaking)
     IPC_MESSAGE_HANDLER(TtsMsg_WordBoundary, OnWordBoundary)
     IPC_MESSAGE_HANDLER(TtsMsg_SentenceBoundary, OnSentenceBoundary)
     IPC_MESSAGE_HANDLER(TtsMsg_MarkerEvent, OnMarkerEvent)
@@ skipping 143 matching lines @@
 void TtsDispatcher::OnSpeakingErrorOccurred(int utterance_id,
                                             const std::string& error_message) {
   WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
   if (utterance.isNull())
     return;
 
   // The web speech API doesn't support an error message.
   synthesizer_client_->speakingErrorOccurred(utterance);
   utterance_id_map_.erase(utterance_id);
 }