Bug 1683464 - Remove aMimeTypeGuess from nsIContentSecurityPolicy::ShouldLoad. r=ckerschb

This parameter is unused.

Depends on D100178

Differential Revision: https://phabricator.services.mozilla.com/D100179

dom/interfaces/security/nsIContentSecurityPolicy.idl

@@ -329,7 +329,6 @@ interface nsIContentSecurityPolicy : nsISerializable
   short shouldLoad(in nsContentPolicyType aContentType,
                    in nsICSPEventListener aCSPEventListener,
                    in nsIURI          aContentLocation,
-                   in ACString        aMimeTypeGuess,
                    in nsIURI          aOriginalURIIfRedirect,
                    in bool            aSendViolationReports,
                    in AString         aNonce,

dom/security/nsCSPContext.cpp

@@ -118,7 +118,6 @@ NS_IMETHODIMP
 nsCSPContext::ShouldLoad(nsContentPolicyType aContentType,
                          nsICSPEventListener* aCSPEventListener,
                          nsIURI* aContentLocation,
-                         const nsACString& aMimeTypeGuess,
                          nsIURI* aOriginalURIIfRedirect,
                          bool aSendViolationReports, const nsAString& aNonce,
                          bool aParserCreated, int16_t* outDecision) {

dom/security/nsCSPService.cpp

@@ -151,7 +151,7 @@ bool subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) {
     if (preloadCsp) {
       // obtain the enforcement decision
       rv = preloadCsp->ShouldLoad(
-          contentType, cspEventListener, aContentLocation, aMimeTypeGuess,
+          contentType, cspEventListener, aContentLocation,
           nullptr,  // no redirect, aOriginal URL is null.
           aLoadInfo->GetSendCSPViolationEvents(), cspNonce, parserCreatedScript,
           aDecision);
@@ -177,7 +177,6 @@ bool subjectToCSP(nsIURI* aURI, nsContentPolicyType aContentType) {
   if (csp) {
     // obtain the enforcement decision
     rv = csp->ShouldLoad(contentType, cspEventListener, aContentLocation,
-                         aMimeTypeGuess,
                          nullptr,  // no redirect, aOriginal URL is null.
                          aLoadInfo->GetSendCSPViolationEvents(), cspNonce,
                          parserCreatedScript, aDecision);
@@ -361,7 +360,6 @@ nsresult CSPService::ConsultCSPForRedirect(nsIURI* aOriginalURI,
           policyType,  // load type per nsIContentPolicy (uint32_t)
           cspEventListener,
           aNewURI,       // nsIURI
-          ""_ns,         // ACString - MIME guess
           aOriginalURI,  // Original nsIURI
           true,          // aSendViolationReports
           cspNonce,      // nonce
@@ -383,7 +381,6 @@ nsresult CSPService::ConsultCSPForRedirect(nsIURI* aOriginalURI,
     csp->ShouldLoad(policyType,  // load type per nsIContentPolicy (uint32_t)
                     cspEventListener,
                     aNewURI,       // nsIURI
-                    ""_ns,         // ACString - MIME guess
                     aOriginalURI,  // Original nsIURI
                     true,          // aSendViolationReports
                     cspNonce,      // nonce

dom/security/test/unit/test_csp_reports.js

@@ -182,7 +182,6 @@ function run_test() {
       null, // nsICSPEventListener
       NetUtil.newURI("http://blocked.test/foo.js"),
       null,
-      null,
       true,
       null,
       false
@@ -243,7 +242,6 @@ function run_test() {
       null, // nsICSPEventListener
       NetUtil.newURI("data:image/png;base64," + base64data),
       null,
-      null,
       true,
       null,
       false
@@ -258,7 +256,6 @@ function run_test() {
       null, // nsICSPEventListener
       NetUtil.newURI("intent://mymaps.com/maps?um=1&ie=UTF-8&fb=1&sll"),
       null,
-      null,
       true,
       null,
       false
@@ -275,7 +272,6 @@ function run_test() {
       null, // nsICSPEventListener
       NetUtil.newURI(selfSpec + "#bar"),
       null,
-      null,
       true,
       null,
       false
@@ -294,7 +290,6 @@ function run_test() {
         null, // nsICSPEventListener
         NetUtil.newURI("ftp://blocked.test/profile.png"),
         null,
-        null,
         true,
         null,
         false