From 519d3987c1586aed7fc5d4cdef65d2df791670dc Mon Sep 17 00:00:00 2001 From: Tanvi Vyas Date: Thu, 28 Mar 2013 13:18:44 -0700 Subject: [PATCH] Bug 834836 - CSP - Fix tests that break when security.mixed_content.block_active_content is set to true and if/when security.mixed_content.block_display_content is set to true. r=sstamm --- content/base/test/chrome/test_csp_bug768029.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/base/test/chrome/test_csp_bug768029.html b/content/base/test/chrome/test_csp_bug768029.html index 59fbc7bad1c7..0eaa19bae725 100644 --- a/content/base/test/chrome/test_csp_bug768029.html +++ b/content/base/test/chrome/test_csp_bug768029.html @@ -214,7 +214,9 @@ var gTestRunner = runTest(); SpecialPowers.addPermission("browser", true, "https://example.com"); SpecialPowers.pushPrefEnv({'set': [["dom.mozBrowserFramesEnabled", true], ["security.apps.privileged.CSP.default", DEFAULT_CSP_PRIV], - ["security.apps.certified.CSP.default", DEFAULT_CSP_CERT]]}, + ["security.apps.certified.CSP.default", DEFAULT_CSP_CERT], + ["security.mixed_content.block_active_content", false], + ["security.mixed_content.block_display_content", false]]}, function() { gTestRunner.next(); });