Enable speech input by default on windows.

Makes --enable-speech-input with available only on non-windows builds
and adds --disable-speech-input for windows.

BUG=none
TEST=browser_tests --gtest_filter="SpeechInputBrowserTest.*"

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

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

5 files changed, 19 insertions, 2 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 8a355f6..b4727c7 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -543,6 +543,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableApplicationCache,
     switches::kDisableDeviceOrientation,
     switches::kEnableIndexedDatabase,
+    switches::kDisableSpeechInput,
     switches::kEnableSpeechInput,
     switches::kDisableGeolocation,
     switches::kShowPaintRects,
diff --git a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc b/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
index 018cc013..72a6a72 100644
--- a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
+++ b/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
@@ -18,6 +18,10 @@ class SpeechInputEnableSwitchTest : public InProcessBrowserTest {
   }
 };
 
+// Speech input is enabled by default in windows & mac builds, so this test
+// is not relevant for them.
+#if !defined(OS_WIN) && !defined(OS_MACOSX)
+
 IN_PROC_BROWSER_TEST_F(SpeechInputEnableSwitchTest, UnavailabilityTest) {
   // Test that speech input is not available to a web page if
   // the runtime switch is disabled.
@@ -34,3 +38,4 @@ IN_PROC_BROWSER_TEST_F(SpeechInputEnableSwitchTest, UnavailabilityTest) {
   EXPECT_EQ("pass", status) << "Page detected speech input properties.";
 }
 
+#endif
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index b2c3073..d6cace2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -252,6 +252,9 @@ const char kDisableSharedWorkers[]          = "disable-shared-workers";
 // Disable site-specific tailoring to compatibility issues in WebKit.
 const char kDisableSiteSpecificQuirks[]     = "disable-site-specific-quirks";
 
+// Disables speech input.
+const char kDisableSpeechInput[]            = "disable-speech-input";
+
 // Disable False Start in SSL and TLS connections.
 const char kDisableSSLFalseStart[]          = "disable-ssl-false-start";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1cb299f..f6f4025 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -84,6 +84,7 @@ extern const char kDisableRestoreBackgroundContents[];
 extern const char kDisableSessionStorage[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
+extern const char kDisableSpeechInput[];
 extern const char kDisableSSLFalseStart[];
 extern const char kDisableSync[];
 extern const char kDisableSyncApps[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index d45a925..4ad6a3f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -205,6 +205,14 @@ class RenderViewZoomer : public RenderViewVisitor {
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewZoomer);
 };
+
+bool IsSpeechInputEnabled(const CommandLine& command_line) {
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  return !command_line.HasSwitch(switches::kDisableSpeechInput);
+#else
+  return command_line.HasSwitch(switches::kEnableSpeechInput);
+#endif
+}
 }  // namespace
 
 // When we run plugins in process, we actually run them on the render thread,
@@ -933,8 +941,7 @@ void RenderThread::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableDeviceOrientation(
       !command_line.HasSwitch(switches::kDisableDeviceOrientation));
 
-  WebRuntimeFeatures::enableSpeechInput(
-      command_line.HasSwitch(switches::kEnableSpeechInput));
+  WebRuntimeFeatures::enableSpeechInput(IsSpeechInputEnabled(command_line));
 }
 
 void RenderThread::IdleHandler() {