Allow speech input feature to be disabled.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2011 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 587 matching lines @@
   if (!device_orientation_client_mock_.get()) {
     device_orientation_client_mock_.reset(
         WebKit::WebDeviceOrientationClientMock::create());
   }
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebSpeechInputControllerMock*
 TestShell::CreateSpeechInputControllerMock(
     WebKit::WebSpeechInputListener* listener) {
+#if ENABLE_INPUT_SPEECH

[jam, 2011/10/12 03:08:07]

nit: around 10 and 11

   DCHECK(!speech_input_controller_mock_.get());
   speech_input_controller_mock_.reset(
       WebKit::WebSpeechInputControllerMock::create(listener));
   return speech_input_controller_mock_.get();
+#else
+  return NULL;
+#endif
 }
 
 WebKit::WebSpeechInputControllerMock*
 TestShell::speech_input_controller_mock() {
   return speech_input_controller_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
@@ skipping 43 matching lines @@
     webkit::WebPluginInfo plugin_info = plugins->at(i);
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue