Enable speech input by default and remove unused code.

content/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 "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/common/speech_input_messages.h"
 
 namespace speech_input {
@@ skipping 111 matching lines @@
     manager()->CancelAllRequestsWithDelegate(this);
 }
 
 SpeechInputManager* SpeechInputDispatcherHost::manager() {
   return (*manager_accessor_)();
 }
 
 bool SpeechInputDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* message_was_ok) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  uint32 message_type = message.type();
-  if (message_type == SpeechInputHostMsg_StartRecognition::ID ||
-      message_type == SpeechInputHostMsg_CancelRecognition::ID ||
-      message_type == SpeechInputHostMsg_StopRecording::ID) {
-    if (!SpeechInputManager::IsFeatureEnabled()) {
-      *message_was_ok = false;
-      return true;
-    }
-
-    may_have_pending_requests_ = true;
-    IPC_BEGIN_MESSAGE_MAP_EX(SpeechInputDispatcherHost, message,
-                             *message_was_ok)
-      IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StartRecognition,
-                          OnStartRecognition)
-      IPC_MESSAGE_HANDLER(SpeechInputHostMsg_CancelRecognition,
-                          OnCancelRecognition)
-      IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StopRecording,
-                          OnStopRecording)
-    IPC_END_MESSAGE_MAP()
-    return true;
-  }
-
-  return false;
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP_EX(SpeechInputDispatcherHost, message,
+                           *message_was_ok)
+    IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StartRecognition,
+                        OnStartRecognition)
+    IPC_MESSAGE_HANDLER(SpeechInputHostMsg_CancelRecognition,
+                        OnCancelRecognition)
+    IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StopRecording,
+                        OnStopRecording)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
 }
 
 void SpeechInputDispatcherHost::OnStartRecognition(
     const SpeechInputHostMsg_StartRecognition_Params &params) {
   int caller_id = g_speech_input_callers.Get().CreateId(
       render_process_id_, params.render_view_id, params.request_id);
   manager()->StartRecognition(this, caller_id,
                               render_process_id_,
                               params.render_view_id, params.element_rect,
                               params.language, params.grammar,
@@ skipping 50 matching lines @@
     g_speech_input_callers.Get().render_view_id(caller_id);
   int caller_request_id = g_speech_input_callers.Get().request_id(caller_id);
   Send(new SpeechInputMsg_RecognitionComplete(caller_render_view_id,
                                               caller_request_id));
   // Request sequence ended, so remove mapping.
   g_speech_input_callers.Get().RemoveId(caller_id);
   VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit";
 }
 
 }  // namespace speech_input