Enable Web Audio API by default (no longer needs enable flag).

BUG=none
TEST=none
(verified patch works on Mac OS X)
Review URL: http://codereview.chromium.org/7272006

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

7 files changed, 12 insertions, 26 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4e6ecb9..abb6b18 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4210,12 +4210,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Disables synchronization with the display's vertical refresh rate when GPU rendering. This allows frame rates to exceed
         60 hertz. While useful for benchmarking purposes, this also results in visual tearing during rapid screen updates.
       </message>
-      <message name="IDS_FLAGS_WEBAUDIO_NAME" desc="Name of the 'Web Audio' lab.">
-        Web Audio
-      </message>
-      <message name="IDS_FLAGS_WEBAUDIO_DESCRIPTION" desc="Description of the 'Web Audio' lab.">
-        Enables the Web Audio API.
-      </message>
       <message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
         WebGL
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index eeeeca3..5ee3623 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -245,19 +245,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kDisableInteractiveFormValidation)
   },
   {
-    "webaudio",
-    IDS_FLAGS_WEBAUDIO_NAME,
-    IDS_FLAGS_WEBAUDIO_DESCRIPTION,
-// This switch is currently not available in CrOS.
-// TODO(crogers): FFmpeg Windows DLLs need to be rebuilt for chromium.
-#if defined(GOOGLE_CHROME_BUILD)
-    kOsMac | kOsWin | kOsLinux,
-#else
-    kOsMac | kOsLinux,
-#endif
-    SINGLE_VALUE_TYPE(switches::kEnableWebAudio)
-  },
-  {
     "p2papi",
     IDS_FLAGS_P2P_API_NAME,
     IDS_FLAGS_P2P_API_DESCRIPTION,
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 0484959..2ac15e5 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -294,7 +294,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.databases_enabled =
         !command_line.HasSwitch(switches::kDisableDatabases);
     web_prefs.webaudio_enabled =
-        command_line.HasSwitch(switches::kEnableWebAudio);
+        !command_line.HasSwitch(switches::kDisableWebAudio);
     web_prefs.experimental_webgl_enabled =
         gpu_enabled() &&
         !command_line.HasSwitch(switches::kDisable3DAPIs) &&
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 0ced958..e0d0ea8 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -536,6 +536,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSessionStorage,
     switches::kDisableSharedWorkers,
     switches::kDisableSpeechInput,
+    switches::kDisableWebAudio,
     switches::kDisableWebSockets,
     switches::kEnableAdaptive,
     switches::kEnableBenchmarking,
@@ -557,7 +558,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kEnableStatsTable,
     switches::kEnableVideoFullscreen,
     switches::kEnableVideoLogging,
-    switches::kEnableWebAudio,
     switches::kFullMemoryCrashReport,
 #if !defined (GOOGLE_CHROME_BUILD)
     // These are unsupported and not fully tested modes, so don't enable them
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 82c3a2e..7033c7f 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -138,6 +138,9 @@ const char kDisableSpeechInput[]            = "disable-speech-input";
 // Disable Spellcheck API.
 const char kDisableSpellcheckAPI[]          = "disable-spellcheck-api";
 
+// Disable web audio API.
+const char kDisableWebAudio[]               = "disable-webaudio";
+
 // Disable Web Sockets support.
 const char kDisableWebSockets[]             = "disable-web-sockets";
 
@@ -199,9 +202,6 @@ const char kEnableVideoFullscreen[]         = "enable-video-fullscreen";
 // the debug log.
 const char kEnableVideoLogging[]            = "enable-video-logging";
 
-// Enable web audio API.
-const char kEnableWebAudio[]                = "enable-webaudio";
-
 // Enables experimental features for the geolocation API.
 // Current features:
 // - CoreLocation support for Mac OS X 10.6
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index 31188ab..f48e69a 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -53,6 +53,7 @@ extern const char kDisableSessionStorage[];
 extern const char kDisableSharedWorkers[];
 extern const char kDisableSpeechInput[];
 extern const char kDisableSpellcheckAPI[];
+extern const char kDisableWebAudio[];
 extern const char kDisableWebSockets[];
 extern const char kEnableAccelerated2dCanvas[];
 extern const char kEnableAcceleratedDrawing[];
@@ -70,7 +71,6 @@ extern const char kEnableSeccompSandbox[];
 extern const char kEnableStatsTable[];
 extern const char kEnableVideoFullscreen[];
 extern const char kEnableVideoLogging[];
-extern const char kEnableWebAudio[];
 extern const char kExperimentalLocationFeatures[];
 // TODO(jam): this doesn't belong in content.
 extern const char kExtensionProcess[];
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index c6a7118..d9d9d1d 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -596,8 +596,13 @@ void RenderThread::EnsureWebKitInitialized() {
   WebKit::WebRuntimeFeatures::enableMediaStream(
     command_line.HasSwitch(switches::kEnableMediaStream));
 
+#if defined(OS_CHROMEOS)
+  // TODO(crogers): enable once Web Audio has been tested and optimized.
+  WebRuntimeFeatures::enableWebAudio(false);
+#else
   WebRuntimeFeatures::enableWebAudio(
-      command_line.HasSwitch(switches::kEnableWebAudio));
+      !command_line.HasSwitch(switches::kDisableWebAudio));
+#endif
 
   WebRuntimeFeatures::enablePushState(true);