Enable speech input API back on trunk for all platforms.

Revert http://src.chromium.org/viewvc/chrome?view=rev&revision=64091 since it has been merged with the beta branch now.

BUG=60918
TEST=browser_tests --gtest_filter=SpeechInputBrowserTest.*

Review URL: http://codereview.chromium.org/4139006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64398 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 10 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 8d53f1e..9a4b0b7 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -589,7 +589,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableDeviceOrientation,
     switches::kDisableIndexedDatabase,
     switches::kDisableSpeechInput,
-    switches::kEnableSpeechInput,
     switches::kDisableGeolocation,
     switches::kShowPaintRects,
     switches::kEnableOpenMax,
diff --git a/chrome/browser/speech/speech_input_browsertest.cc b/chrome/browser/speech/speech_input_browsertest.cc
index 700773b1..9f12758 100644
--- a/chrome/browser/speech/speech_input_browsertest.cc
+++ b/chrome/browser/speech/speech_input_browsertest.cc
@@ -93,10 +93,6 @@ class FakeSpeechInputManager : public SpeechInputManager {
 class SpeechInputBrowserTest : public InProcessBrowserTest {
  public:
   // InProcessBrowserTest methods
-  virtual void SetUpCommandLine(CommandLine* command_line) {

-    command_line->AppendSwitch(switches::kEnableSpeechInput);

-  }

-
   GURL testUrl(const FilePath::CharType* filename) {
     const FilePath kTestDir(FILE_PATH_LITERAL("speech"));
     return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 907f8f3..fd35555 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -483,9 +483,6 @@ const char kEnableSecureInfoBars[]          = "enable-secure-infobars";
 // Enables 0-RTT HTTPS handshakes.
 const char kEnableSnapStart[]               = "enable-snap-start";
 
-// 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 6235e50..6d8bb63 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -148,7 +148,6 @@ extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
 extern const char kEnableSecureInfoBars[];
 extern const char kEnableSnapStart[];
-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 de60e5d..cde829c 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -215,7 +215,7 @@ class RenderViewZoomer : public RenderViewVisitor {
 };
 
 bool IsSpeechInputEnabled(const CommandLine& command_line) {
-  return command_line.HasSwitch(switches::kEnableSpeechInput);
+  return !command_line.HasSwitch(switches::kDisableSpeechInput);
 }
 }  // namespace