8 files changed, 0 insertions, 68 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi
index c7f19b1..c6d9dc9 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -25,7 +25,6 @@
       'ENABLE_GEOLOCATION=1',
       'ENABLE_ICONDATABASE=0',
       'ENABLE_INDEXED_DATABASE=1',
-      'ENABLE_INPUT_SPEECH=1',
       'ENABLE_JAVASCRIPT_DEBUGGER=1',
       'ENABLE_JSC_MULTIPLE_THREADS=0',
       'ENABLE_METER_TAG=1',
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 0fc328d..2506617 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -548,7 +548,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableApplicationCache,
     switches::kEnableDeviceOrientation,
     switches::kEnableIndexedDatabase,
-    switches::kEnableSpeechInput,
     switches::kDisableGeolocation,
     switches::kShowPaintRects,
     switches::kEnableOpenMax,
diff --git a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc b/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
deleted file mode 100644
index c7381d3..0000000
--- a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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 "base/command_line.h"
-#include "base/file_path.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-
-class SpeechInputEnableSwitchTest : public InProcessBrowserTest {
- public:
-  GURL testUrl(const FilePath::CharType* filename) {
-    const FilePath kTestDir(FILE_PATH_LITERAL("speech"));
-    return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(SpeechInputEnableSwitchTest, UnavailabilityTest) {
-  // Test that speech input is not available to a web page if
-  // the runtime switch is disabled.
-
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  bool has_switch = command_line.HasSwitch(switches::kEnableSpeechInput);
-  ASSERT_FALSE(has_switch) << "This test does not make sense if "
-                           << "--enable-speech-input is set.";
-
-  GURL test_url = testUrl(
-      FILE_PATH_LITERAL("enable_speech_input_switch_test.html"));
-  ui_test_utils::NavigateToURL(browser(), test_url);
-  std::string status = browser()->GetSelectedTabContents()->GetURL().ref();
-  EXPECT_EQ("pass", status) << "Page detected speech input properties.";
-}
-
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cbf67c9..7ee4b16 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1599,7 +1599,6 @@
         'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
         'browser/safe_browsing/safe_browsing_browsertest.cc',
         'browser/sessions/session_restore_browsertest.cc',
-        'browser/speech/enable_speech_input_switch_browsertest.cc',
         'browser/ssl/ssl_browser_tests.cc',
         'browser/task_manager_browsertest.cc',
         'browser/views/browser_actions_container_browsertest.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index de031cb..3aadd0a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -376,9 +376,6 @@ const char kEnablePrintPreview[]            = "enable-print-preview";
 // parameter to indicate if the provider should be the default.
 const char kEnableSearchProviderApiV2[]     = "enable-search-provider-api-v2";
 
-// Enables speech input.
-const char kEnableSpeechInput[]             = "enable-speech-input";
-
 // Enables StatsTable, logging statistics to a global named shared memory table.
 const char kEnableStatsTable[]              = "enable-stats-table";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index a28cf6b..b0f3c28 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -122,7 +122,6 @@ extern const char kEnablePreparsedJsCaching[];
 extern const char kEnablePreconnect[];
 extern const char kEnablePrintPreview[];
 extern const char kEnableSearchProviderApiV2[];
-extern const char kEnableSpeechInput[];
 extern const char kEnableStatsTable[];
 extern const char kEnableSync[];
 extern const char kEnableSyncAutofill[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 060ff77..03e468a 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -912,9 +912,6 @@ void RenderThread::EnsureWebKitInitialized() {
 
   WebRuntimeFeatures::enableDeviceOrientation(
       command_line.HasSwitch(switches::kEnableDeviceOrientation));
-
-  WebRuntimeFeatures::enableSpeechInput(
-      command_line.HasSwitch(switches::kEnableSpeechInput));
 }
 
 void RenderThread::IdleHandler() {
diff --git a/chrome/test/data/speech/enable_speech_input_switch_test.html b/chrome/test/data/speech/enable_speech_input_switch_test.html
deleted file mode 100644
index 9524c7c..0000000
--- a/chrome/test/data/speech/enable_speech_input_switch_test.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-  <head>
-    <title>SpeechInputEnableSwitchTest</title>
-    <script type="text/javascript">
-      function run() {
-        var inputField = document.getElementById('inputField');
-        if (inputField.speech) {
-          document.getElementById('status').innerHTML = 'FAIL';
-          document.location = '#fail';
-        } else {
-          document.getElementById('status').innerHTML = 'PASS';
-          document.location = '#pass';
-        }
-      }
-    </script>
-  </head>
-  <body onload="run()">
-    <input id='inputField' speech><br>
-    <div id="status">Running...</div>
-  </body>
-</html>
-