mozilla-inbound: changeset 192161:2d1cf59ba9a752a2bea057a4606a2b32d95bd9ad

author	Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
	Thu, 03 Jul 2014 10:23:16 -0700
changeset 192161	2d1cf59ba9a752a2bea057a4606a2b32d95bd9ad
parent 192160	a6a8770eb49daae3e9f5bb6c3391f491e1cdf3cd
child 192162	90c7fc5b903427a9de972f274ca24c566e680489
push id	45767
push user	mozilla@christophkerschbaumer.com
push date	Thu, 03 Jul 2014 17:51:32 +0000
treeherder	mozilla-inbound@2d1cf59ba9a7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sstamm
bugs	1034156, 949549
milestone	33.0a1
first release with	nightly linux32 e8df6826a571 / 33.0a1 / 20140704030208 / files nightly linux64 e8df6826a571 / 33.0a1 / 20140704030208 / files nightly mac e8df6826a571 / 33.0a1 / 20140704030208 / files nightly win32 e8df6826a571 / 33.0a1 / 20140704030208 / files nightly win64 e8df6826a571 / 33.0a1 / 20140704030208 / files
last release without	nightly linux32 38ecfc3922b8 / 33.0a1 / 20140703030200 / files nightly linux64 38ecfc3922b8 / 33.0a1 / 20140703030200 / files nightly mac 38ecfc3922b8 / 33.0a1 / 20140703030200 / files nightly win32 38ecfc3922b8 / 33.0a1 / 20140703030200 / files nightly win64 38ecfc3922b8 / 33.0a1 / 20140703030200 / files

--- a/content/base/test/csp/test_bug949549.html
+++ b/content/base/test/csp/test_bug949549.html
@@ -9,17 +9,17 @@
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=949549">Mozilla Bug 949549</a>
 <div id="content" style="display: none"></div>
 <pre id="test">
 <script type="application/javascript;version=1.8">
   "use strict";
 
   // Ensure that `setRequestContext` doesn't throw with app:// URLs
 
-  const csp = SpecialPowers.Cc["@mozilla.org/contentsecuritypolicy;1"]
+  const csp = SpecialPowers.Cc["@mozilla.org/cspcontext;1"]
               .createInstance(SpecialPowers.Ci.nsIContentSecurityPolicy);
 
   const gManifestURL = "http://www.example.com/chrome/dom/tests/mochitest/webapps/apps/basic.webapp";
 
   SimpleTest.waitForExplicitFinish();
   var app;
 
   function setupTest() {