Bug 1731645 - Fix non-unified build errors in caps/. r=ckerschb

Differential Revision: https://phabricator.services.mozilla.com/D126135
Eclipse-Community · Sep 21, 2021 · f7be2ba · f7be2ba
1 parent c992be9
commit f7be2ba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/caps/DomainPolicy.cpp b/caps/DomainPolicy.cpp
@@ -8,6 +8,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/Unused.h"
+#include "nsIURIMutator.h"
 #include "nsScriptSecurityManager.h"
 
 namespace mozilla {

diff --git a/caps/ExpandedPrincipal.cpp b/caps/ExpandedPrincipal.cpp
@@ -9,6 +9,7 @@
 #include "nsIObjectInputStream.h"
 #include "nsReadableUtils.h"
 #include "mozilla/Base64.h"
+#include "json/json.h"
 
 using namespace mozilla;
 

diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp
@@ -11,6 +11,8 @@
 #include "mozilla/dom/quota/QuotaManager.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsIURI.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
 #include "nsURLHelper.h"
 
 static const char kSourceChar = ':';

diff --git a/caps/moz.build b/caps/moz.build
@@ -77,5 +77,3 @@ FINAL_LIBRARY = "xul"
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "Security: CAPS")
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/caps/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp
@@ -12,14 +12,17 @@
 #include "nsMemory.h"
 #include "nsStringBuffer.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 // for mozilla::dom::workerinternals::kJSPrincipalsDebugToken
 #include "mozilla/dom/workerinternals/JSSettings.h"
 // for mozilla::dom::worklet::kJSPrincipalsDebugToken
 #include "mozilla/dom/WorkletPrincipals.h"
 #include "mozilla/ipc/BackgroundUtils.h"
+#include "mozilla/ipc/PBackgroundSharedTypes.h"
 
 using namespace mozilla;
+using namespace mozilla::dom;
 using namespace mozilla::ipc;
 
 NS_IMETHODIMP_(MozExternalRefCountType)

diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
@@ -48,6 +48,7 @@
 #include "nsAboutProtocolUtils.h"
 #include "nsIClassInfo.h"
 #include "nsIURIFixup.h"
+#include "nsIURIMutator.h"
 #include "nsIChromeRegistry.h"
 #include "nsIResProtocolHandler.h"
 #include "nsIContentSecurityPolicy.h"
@@ -62,6 +63,7 @@
 #include "mozilla/dom/nsCSPContext.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/ExtensionPolicyService.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/dom/WorkerCommon.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,5 +77,3 @@ FINAL_LIBRARY = "xul"

		with Files("**"):
		BUG_COMPONENT = ("Core", "Security: CAPS")

		REQUIRES_UNIFIED_BUILD = True