From 0ee09e767165a4268d501665419ddcb69a65bf18 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 9 May 2014 09:14:37 +0200
Subject: [PATCH] Backed out changeset 9899ea7e3a32 (bug 995943) for m-other
 test failures

---
 caps/src/nsScriptSecurityManager.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index 57b070ce7ab819..343ac06e970a98 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -1150,8 +1150,18 @@ NS_IMETHODIMP
 nsScriptSecurityManager::Observe(nsISupports* aObject, const char* aTopic,
                                  const char16_t* aMessage)
 {
-    ScriptSecurityPrefChanged();
-    return NS_OK;
+    nsresult rv = NS_OK;
+    NS_ConvertUTF16toUTF8 messageStr(aMessage);
+    const char *message = messageStr.get();
+
+    static const char jsPrefix[] = "javascript.";
+    static const char securityPrefix[] = "security.";
+    if ((PL_strncmp(message, jsPrefix, sizeof(jsPrefix)-1) == 0) ||
+        (PL_strncmp(message, securityPrefix, sizeof(securityPrefix)-1) == 0) )
+    {
+        ScriptSecurityPrefChanged();
+    }
+    return rv;
 }
 
 /////////////////////////////////////////////
@@ -1263,9 +1273,21 @@ nsScriptSecurityManager::SystemPrincipalSingletonConstructor()
 inline void
 nsScriptSecurityManager::ScriptSecurityPrefChanged()
 {
-    MOZ_ASSERT(mPrefInitialized);
+    // JavaScript defaults to enabled in failure cases.
+    mIsJavaScriptEnabled = true;
+
+    sStrictFileOriginPolicy = true;
+
+    nsresult rv;
+    if (!mPrefInitialized) {
+        rv = InitPrefs();
+        if (NS_FAILED(rv))
+            return;
+    }
+
     mIsJavaScriptEnabled =
         Preferences::GetBool(sJSEnabledPrefName, mIsJavaScriptEnabled);
+
     sStrictFileOriginPolicy =
         Preferences::GetBool(sFileOriginPolicyPrefName, false);
 }