Make NS_CheckContent(Load|Process)Policy only take a principal, not a principal

and a uri.  Get the URI from the principal.  Bug 391438, r+sr+a=sicking


git-svn-id: svn://10.0.0.236/trunk@231781 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsDocShell.cpp

@@ -6379,11 +6379,21 @@ nsDocShell::InternalLoad(nsIURI * aURI,
     if (!context) {
         context =  mScriptGlobal;
     }
+
     // XXXbz would be nice to know the loading principal here... but we don't
+    nsCOMPtr<nsIPrincipal> loadingPrincipal;
+    if (aReferrer) {
+        nsCOMPtr<nsIScriptSecurityManager> secMan =
+            do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        rv = secMan->GetCodebasePrincipal(aReferrer,
+                                          getter_AddRefs(loadingPrincipal));
+    }
+    
     rv = NS_CheckContentLoadPolicy(contentType,
                                    aURI,
-                                   aReferrer,
-                                   nsnull,
+                                   loadingPrincipal,
                                    context,
                                    EmptyCString(), //mime guess
                                    nsnull,         //extra