Bug 1815307: Reconfigure the headers so types will be accessible in the right place without conflicts r=timhuang

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

dom/base/nsContentUtils.cpp

@@ -357,7 +357,6 @@
 #include "nsPresContext.h"
 #include "nsQueryFrame.h"
 #include "nsQueryObject.h"
-#include "nsRFPService.h"
 #include "nsRange.h"
 #include "nsRefPtrHashtable.h"
 #include "nsSandboxFlags.h"

dom/base/nsContentUtils.h

@@ -50,6 +50,7 @@
 #include "nsLiteralString.h"
 #include "nsMargin.h"
 #include "nsPIDOMWindow.h"
+#include "nsRFPService.h"
 #include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsTLiteralString.h"

dom/base/nsIGlobalObject.h

@@ -16,6 +16,7 @@
 #include "nsContentUtils.h"
 #include "nsHashKeys.h"
 #include "nsISupports.h"
+#include "nsRFPService.h"
 #include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsTHashtable.h"
@@ -61,21 +62,12 @@ namespace JS::loader {
 class ModuleLoaderBase;
 }  // namespace JS::loader
 
-// Reduce Timer Precision (RTP) Caller Type
-// This lives here because anything dealing with RTPCallerType determines it
-// through this object.
-enum class RTPCallerType : uint8_t {
-  Normal = 0,
-  SystemPrincipal = (1 << 0),
-  ResistFingerprinting = (1 << 1),
-  CrossOriginIsolated = (1 << 2)
-};
-
 /**
  * See <https://developer.mozilla.org/en-US/docs/Glossary/Global_object>.
  */
 class nsIGlobalObject : public nsISupports,
                         public mozilla::dom::DispatcherTrait {
+ private:
   nsTArray<nsCString> mHostObjectURIs;
 
   // Raw pointers to bound DETH objects.  These are added by
@@ -91,6 +83,7 @@ class nsIGlobalObject : public nsISupports,
   nsIGlobalObject();
 
  public:
+  using RTPCallerType = mozilla::RTPCallerType;
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IGLOBALOBJECT_IID)
 
   /**

toolkit/components/resistfingerprinting/nsRFPService.h

@@ -10,10 +10,7 @@
 #include "ErrorList.h"
 #include "PLDHashTable.h"
 #include "mozilla/BasicEvents.h"
-#include "nsContentUtils.h"
 #include "nsHashtablesFwd.h"
-#include "nsID.h"
-#include "nsIGlobalObject.h"
 #include "nsIObserver.h"
 #include "nsISupports.h"
 #include "nsStringFwd.h"
@@ -126,6 +123,14 @@ class KeyboardHashKey : public PLDHashEntryHdr {
 
 // ============================================================================
 
+// Reduce Timer Precision (RTP) Caller Type
+enum class RTPCallerType : uint8_t {
+  Normal = 0,
+  SystemPrincipal = (1 << 0),
+  ResistFingerprinting = (1 << 1),
+  CrossOriginIsolated = (1 << 2)
+};
+
 enum TimerPrecisionType {
   DangerouslyNone = 1,
   UnconditionalAKAHighRes = 2,