Forgot to update calls to formerly-static SecurityCompareURI (r+sr=bz).

caps/include/nsScriptSecurityManager.h

@@ -285,6 +285,8 @@ public:
 
     JSContext* GetSafeJSContext();
 
+    static nsScriptSecurityManager *gScriptSecMan;
+
 private:
 
     // GetScriptSecurityManager is the only call that can make one

caps/src/nsCodebasePrincipal.cpp

@@ -234,9 +234,7 @@ nsCodebasePrincipal::Equals(nsIPrincipal *aOther, PRBool *result)
     otherCodebase->GetURI(getter_AddRefs(otherURI));
 
     NS_ENSURE_TRUE(otherURI, NS_ERROR_FAILURE);
-    return nsScriptSecurityManager::SecurityCompareURIs(mURI,
-                                                        otherURI,
-                                                        result);
+    return gScriptSecMan->SecurityCompareURIs(mURI, otherURI, result);
 }
 
 //////////////////////////////////////////

caps/src/nsPrincipal.cpp

@@ -215,9 +215,7 @@ nsPrincipal::Equals(nsIPrincipal *aOther, PRBool *aResult)
       aOther->GetURI(getter_AddRefs(otherOrigin));
     }
 
-    return nsScriptSecurityManager::SecurityCompareURIs(origin,
-                                                        otherOrigin,
-                                                        aResult);
+    return gScriptSecMan->SecurityCompareURIs(origin, otherOrigin, aResult);
   }
 
   *aResult = PR_TRUE;

caps/src/nsScriptSecurityManager.cpp

@@ -2703,7 +2703,7 @@ nsresult nsScriptSecurityManager::Init()
     return NS_OK;
 }
 
-static nsScriptSecurityManager *gScriptSecMan = nsnull;
+nsScriptSecurityManager *nsScriptSecurityManager::gScriptSecMan = nsnull;
 
 jsval nsScriptSecurityManager::sEnabledID   = JSVAL_VOID;