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

chrome/browser/speech/speech_input_dispatcher_host.cc

Index: chrome/browser/speech/speech_input_dispatcher_host.cc
===================================================================
--- chrome/browser/speech/speech_input_dispatcher_host.cc	(revision 70678)
+++ chrome/browser/speech/speech_input_dispatcher_host.cc	(working copy)
@@ -118,31 +118,19 @@
 }
 
 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(
Property changes on: chrome\browser\speech\speech_input_dispatcher_host.cc
___________________________________________________________________
Deleted: svn:eol-style
   - LF