Bug 1909467: replace some includes of "nsIContentSecurityPolicy" with forward declarations or other includes and move some function definitions to the corresponding .cpp files. r=tschuster,necko-reviewers,kershaw

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

dom/base/nsContentAreaDragDrop.h

@@ -10,8 +10,8 @@
 #include "nsCOMPtr.h"
 
 #include "nsITransferable.h"
-#include "nsIContentSecurityPolicy.h"
 
+class nsIContentSecurityPolicy;
 class nsICookieJarSettings;
 class nsPIDOMWindowOuter;
 class nsITransferable;

dom/base/nsOpenURIInFrameParams.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsOpenURIInFrameParams.h"
+#include "nsIContentSecurityPolicy.h"
 #include "nsIOpenWindowInfo.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Element.h"

dom/base/nsOpenURIInFrameParams.h

@@ -8,11 +8,12 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsFrameLoaderOwner.h"
-#include "nsIContentSecurityPolicy.h"
 #include "nsIPrincipal.h"
 #include "nsIReferrerInfo.h"
 #include "nsString.h"
 
+class nsIContentSecurityPolicy;
+
 namespace mozilla {
 class OriginAttributes;
 namespace dom {

dom/fetch/FetchChild.h

@@ -11,7 +11,6 @@
 #include "mozilla/dom/PFetchChild.h"
 #include "mozilla/dom/SerializedStackHolder.h"
 #include "nsIConsoleReportCollector.h"
-#include "nsIContentSecurityPolicy.h"
 #include "nsISupports.h"
 #include "nsIWorkerChannelInfo.h"
 

dom/ipc/CSPMessageUtils.h

@@ -9,7 +9,8 @@
 
 #include "ipc/IPCMessageUtils.h"
 #include "nsCOMPtr.h"
-#include "nsIContentSecurityPolicy.h"
+
+class nsIContentSecurityPolicy;
 
 namespace IPC {
 

dom/security/nsCSPUtils.cpp

@@ -12,6 +12,7 @@
 #include "nsCSPParser.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIConsoleService.h"
+#include "nsIContentSecurityPolicy.h"
 #include "nsIChannel.h"
 #include "nsICryptoHash.h"
 #include "nsIScriptError.h"
@@ -1539,6 +1540,10 @@ void nsCSPDirective::toDomCSPStruct(mozilla::dom::CSP& outCSP) const {
   }
 }
 
+bool nsCSPDirective::isDefaultDirective() const {
+  return mDirective == nsIContentSecurityPolicy::DEFAULT_SRC_DIRECTIVE;
+}
+
 void nsCSPDirective::getReportURIs(nsTArray<nsString>& outReportURIs) const {
   NS_ASSERTION((mDirective == nsIContentSecurityPolicy::REPORT_URI_DIRECTIVE),
                "not a report-uri directive");

dom/security/nsCSPUtils.h

@@ -8,7 +8,6 @@
 #define nsCSPUtils_h___
 
 #include "nsCOMPtr.h"
-#include "nsIContentSecurityPolicy.h"
 #include "nsILoadInfo.h"
 #include "nsIURI.h"
 #include "nsString.h"
@@ -483,9 +482,7 @@ class nsCSPDirective {
     mSrcs = aSrcs.Clone();
   }
 
-  inline bool isDefaultDirective() const {
+  bool isDefaultDirective() const;
-    return mDirective == nsIContentSecurityPolicy::DEFAULT_SRC_DIRECTIVE;
-  }
 
   virtual bool equals(CSPDirective aDirective) const;
 

dom/workers/WorkerPrivate.h

@@ -43,13 +43,14 @@
 #include "mozilla/StaticPrefs_extensions.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
-#include "nsIContentSecurityPolicy.h"
+#include "nsIContentPolicy.h"
 #include "nsIEventTarget.h"
 #include "nsILoadInfo.h"
 #include "nsRFPService.h"
 #include "nsTObserverArray.h"
 #include "stdint.h"
 
+class nsIContentSecurityPolicy;
 class nsIThreadInternal;
 
 namespace JS {

dom/xhr/XMLHttpRequestMainThread.cpp

@@ -57,6 +57,7 @@
 #include "nsReadableUtils.h"
 #include "nsSandboxFlags.h"
 
+#include "nsIContentPolicy.h"
 #include "nsIURI.h"
 #include "nsIURIMutator.h"
 #include "nsILoadGroup.h"

dom/xhr/XMLHttpRequestMainThread.h

@@ -25,7 +25,6 @@
 #include "nsIScriptObjectPrincipal.h"
 #include "nsISizeOfEventTarget.h"
 #include "nsIInputStream.h"
-#include "nsIContentSecurityPolicy.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"

netwerk/base/InterceptionInfo.h

@@ -7,7 +7,7 @@
 #ifndef mozilla_net_InterceptionInfo_h
 #define mozilla_net_InterceptionInfo_h
 
-#include "nsIContentSecurityPolicy.h"
+#include "nsIContentPolicy.h"
 #include "nsIInterceptionInfo.h"
 #include "nsIPrincipal.h"
 #include "nsIRedirectHistoryEntry.h"

netwerk/base/LoadInfo.h

@@ -8,7 +8,6 @@
 #define mozilla_LoadInfo_h
 
 #include "mozilla/dom/FeaturePolicy.h"
-#include "nsIContentSecurityPolicy.h"
 #include "nsIInterceptionInfo.h"
 #include "nsILoadInfo.h"
 #include "nsIPrincipal.h"