Revert 70671 - If speech input is disabled and we receive IPC calls, terminat...

chrome/browser/speech/speech_input_dispatcher_host.cc

 // Copyright (c) 2010 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/speech_input_dispatcher_host.h"
 
 #include "base/singleton.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
@@ skipping 100 matching lines @@
 }
 
 SpeechInputDispatcherHost::~SpeechInputDispatcherHost() {
 }
 
 SpeechInputManager* SpeechInputDispatcherHost::manager() {
   return (*manager_accessor_)();
 }
 
 bool SpeechInputDispatcherHost::OnMessageReceived(
-    const IPC::Message& message, bool* message_was_ok) {
+    const IPC::Message& msg, bool* msg_was_ok) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  uint32 message_type = message.type();
-  if (message_type == ViewHostMsg_SpeechInput_StartRecognition::ID ||
-      message_type == ViewHostMsg_SpeechInput_CancelRecognition::ID ||
-      message_type == ViewHostMsg_SpeechInput_StopRecording::ID) {
-    if (!SpeechInputManager::IsFeatureEnabled()) {
-      *message_was_ok = false;
-      return true;
-    }
-
-    IPC_BEGIN_MESSAGE_MAP_EX(SpeechInputDispatcherHost, message,
-                             *message_was_ok)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_StartRecognition,
-                          OnStartRecognition)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_CancelRecognition,
-                          OnCancelRecognition)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_StopRecording,
-                          OnStopRecording)
-    IPC_END_MESSAGE_MAP()
-    return true;
-  }
-
-  return false;
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP_EX(SpeechInputDispatcherHost, msg, *msg_was_ok)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_StartRecognition,
+                        OnStartRecognition)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_CancelRecognition,
+                        OnCancelRecognition)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_SpeechInput_StopRecording,
+                        OnStopRecording)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
 }
 
 void SpeechInputDispatcherHost::OnStartRecognition(
     int render_view_id,
     int request_id,
     const gfx::Rect& element_rect) {
   int caller_id = callers_->CreateId(resource_message_filter_process_id_,
                                      render_view_id, request_id);
   manager()->StartRecognition(this, caller_id,
                               resource_message_filter_process_id_,
@@ skipping 55 matching lines @@
   int caller_request_id = callers_->request_id(caller_id);
   SendMessageToRenderView(
       new ViewMsg_SpeechInput_RecognitionComplete(caller_render_view_id,
                                                   caller_request_id),
       caller_render_view_id);
   callers_->RemoveId(caller_id);  // Request sequence ended, so remove mapping.
   LOG(INFO) << "SpeechInputDispatcherHost::DidCompleteRecognition exit";
 }
 
 }  // namespace speech_input