From 19c480342cc4aeef2bc381e6172b81f5f9ae4b29 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 16 Mar 2013 01:35:22 -0400
Subject: [PATCH] Bug 851603 - Enable Web Audio in Nightly; r=roc

--HG--
extra : rebase_source : b79d7f2cb0e6257eae2f65bd8637f718324b43f4
---
 browser/app/profile/firefox.js                     | 6 ++++++
 content/media/webaudio/test/test_AudioContext.html | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 8f6a1781b2e..9f41f33d27a 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1221,3 +1221,9 @@ pref("dom.identity.enabled", false);
 
 // Override the Gecko-default value of false for Firefox.
 pref("plain_text.wrap_long_lines", true);
+
+#ifndef RELEASE_BUILD
+// Enable Web Audio for Firefox Desktop in Nightly and Aurora
+pref("media.webaudio.enabled", true);
+#endif
+
diff --git a/content/media/webaudio/test/test_AudioContext.html b/content/media/webaudio/test/test_AudioContext.html
index c5c1eb65a4b..34d1e940f1c 100644
--- a/content/media/webaudio/test/test_AudioContext.html
+++ b/content/media/webaudio/test/test_AudioContext.html
@@ -11,14 +11,6 @@
 
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
-  ok(!window.AudioContext, "AudioContext should be hidden behind a pref");
-  var accessThrows = false;
-  try {
-    new AudioContext();
-  } catch (e) {
-    accessThrows = true;
-  }
-  ok(accessThrows, "AudioContext should be hidden behind a pref");
   SpecialPowers.setBoolPref("media.webaudio.enabled", true);
   var ac = new AudioContext();
   ok(ac, "Create a AudioContext object");