Move speech input behind a flag for M8 beta and stable.

The speech input feature (http://code.google.com/p/chromium/issues/detail?id=53598) is work in progress and it should only be enabled in the dev channel but behind a flag for beta and stable.
After this change gets merged with the beta branch I'll roll it back on the trunk.

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

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

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

5 files changed, 10 insertions, 1 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 9a4b0b7..8d53f1e 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -589,6 +589,7 @@ 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 a371015..8c329925 100644
--- a/chrome/browser/speech/speech_input_browsertest.cc
+++ b/chrome/browser/speech/speech_input_browsertest.cc
@@ -92,6 +92,10 @@ SpeechInputManager* fakeManagerAccessor() {
 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 11383e1..81f70d2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -483,6 +483,9 @@ 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 22ed845..91bf0cf 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -148,6 +148,7 @@ 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 cde829c..de60e5d 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::kDisableSpeechInput);
+  return command_line.HasSwitch(switches::kEnableSpeechInput);
 }
 }  // namespace