Remove the flag for the Speech API and turn it on by default.

BUG=116954


Review URL: https://chromiumcodereview.appspot.com/11348275

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

5 files changed, 2 insertions, 12 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c2b94c8..5c0f01f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -750,7 +750,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSessionStorage,
     switches::kDisableSharedWorkers,
     switches::kDisableSpeechInput,
-    switches::kEnableScriptedSpeech,
 #if defined(OS_ANDROID)
     switches::kEnableWebAudio,
 #else
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
index 01a6a56..2dc993a 100644
--- a/content/browser/speech/speech_recognition_dispatcher_host.cc
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -42,11 +42,7 @@ SpeechRecognitionManager* SpeechRecognitionDispatcherHost::manager() {
   if (manager_for_tests_)
     return manager_for_tests_;
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableScriptedSpeech))
-    return SpeechRecognitionManager::GetInstance();
-
-  return NULL;
+  return SpeechRecognitionManager::GetInstance();
 }
 
 bool SpeechRecognitionDispatcherHost::OnMessageReceived(
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index f71196e..b04b64a 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -203,9 +203,6 @@ const char kDisableSiteSpecificQuirks[]     = "disable-site-specific-quirks";
 // Disables speech input.
 const char kDisableSpeechInput[]            = "disable-speech-input";
 
-// Enables scripted speech api.
-const char kEnableScriptedSpeech[]          = "enable-scripted-speech";
-
 // Specifies the request key for the continuous speech recognition webservice.
 const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
 
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 782db83..dd23dbd 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -76,7 +76,6 @@ extern const char kDisableSessionStorage[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
 CONTENT_EXPORT extern const char kDisableSpeechInput[];
-CONTENT_EXPORT extern const char kEnableScriptedSpeech[];
 extern const char kSpeechRecognitionWebserviceKey[];
 #if defined(OS_ANDROID)
 CONTENT_EXPORT extern const char kEnableWebAudio[];
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 3553e50..755a524 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -662,8 +662,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableSpeechInput(
       !command_line.HasSwitch(switches::kDisableSpeechInput));
 
-  WebRuntimeFeatures::enableScriptedSpeech(
-      command_line.HasSwitch(switches::kEnableScriptedSpeech));
+  WebRuntimeFeatures::enableScriptedSpeech(true);
 
   WebRuntimeFeatures::enableFileSystem(
       !command_line.HasSwitch(switches::kDisableFileSystem));