Bug 1650163 - Part 3: Move REMOTE_TYPE defines to a separate header, r=farre

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

dom/ipc/ContentChild.h

@@ -17,6 +17,7 @@
 #include "mozilla/dom/MediaControllerBinding.h"
 #include "mozilla/dom/PContentChild.h"
 #include "mozilla/dom/RemoteBrowser.h"
+#include "mozilla/dom/RemoteType.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/Shmem.h"

dom/ipc/ContentParent.h

@@ -11,6 +11,7 @@
 #include "mozilla/dom/ipc/IdType.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/RemoteBrowser.h"
+#include "mozilla/dom/RemoteType.h"
 #include "mozilla/dom/JSProcessActorParent.h"
 #include "mozilla/dom/ProcessActor.h"
 #include "mozilla/gfx/gfxVarReceiver.h"
@@ -49,25 +50,6 @@
 
 #define CHILD_PROCESS_SHUTDOWN_MESSAGE u"child-process-shutdown"_ns
 
-// These must match the similar ones in E10SUtils.jsm and ProcInfo.h.
-// Process names as reported by about:memory are defined in
-// ContentChild:RecvRemoteType.  Add your value there too or it will be called
-// "Web Content".
-#define PREALLOC_REMOTE_TYPE "prealloc"_ns
-#define DEFAULT_REMOTE_TYPE "web"_ns
-#define FILE_REMOTE_TYPE "file"_ns
-#define EXTENSION_REMOTE_TYPE "extension"_ns
-#define PRIVILEGEDABOUT_REMOTE_TYPE "privilegedabout"_ns
-#define PRIVILEGEDMOZILLA_REMOTE_TYPE "privilegedmozilla"_ns
-
-// Remote type value used to represent being non-remote.
-#define NOT_REMOTE_TYPE VoidCString()
-
-// These must start with the DEFAULT_REMOTE_TYPE above.
-#define FISSION_WEB_REMOTE_TYPE "webIsolated"_ns
-#define WITH_COOP_COEP_REMOTE_TYPE_PREFIX "webCOOP+COEP="_ns
-#define LARGE_ALLOCATION_REMOTE_TYPE "webLargeAllocation"_ns
-
 class nsConsoleService;
 class nsIContentProcessInfo;
 class nsICycleCollectorLogSink;

dom/ipc/InProcessChild.h

@@ -10,6 +10,7 @@
 #include "mozilla/dom/PInProcessChild.h"
 #include "mozilla/dom/JSProcessActorChild.h"
 #include "mozilla/dom/ProcessActor.h"
+#include "mozilla/dom/RemoteType.h"
 #include "mozilla/StaticPtr.h"
 #include "nsIDOMProcessChild.h"
 

dom/ipc/InProcessParent.h

@@ -10,6 +10,7 @@
 #include "mozilla/dom/PInProcessParent.h"
 #include "mozilla/dom/JSProcessActorParent.h"
 #include "mozilla/dom/ProcessActor.h"
+#include "mozilla/dom/RemoteType.h"
 #include "mozilla/StaticPtr.h"
 #include "nsIDOMProcessParent.h"
 

dom/ipc/RemoteType.h

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_RemoteType_h
+#define mozilla_dom_RemoteType_h
+
+#include "nsString.h"
+#include "nsReadableUtils.h"
+
+// These must match the similar ones in E10SUtils.jsm and ProcInfo.h.
+// Process names as reported by about:memory are defined in
+// ContentChild:RecvRemoteType.  Add your value there too or it will be called
+// "Web Content".
+#define PREALLOC_REMOTE_TYPE "prealloc"_ns
+#define DEFAULT_REMOTE_TYPE "web"_ns
+#define FILE_REMOTE_TYPE "file"_ns
+#define EXTENSION_REMOTE_TYPE "extension"_ns
+#define PRIVILEGEDABOUT_REMOTE_TYPE "privilegedabout"_ns
+#define PRIVILEGEDMOZILLA_REMOTE_TYPE "privilegedmozilla"_ns
+
+// These must start with the DEFAULT_REMOTE_TYPE above.
+#define FISSION_WEB_REMOTE_TYPE "webIsolated"_ns
+#define WITH_COOP_COEP_REMOTE_TYPE_PREFIX "webCOOP+COEP="_ns
+#define LARGE_ALLOCATION_REMOTE_TYPE "webLargeAllocation"_ns
+
+// Remote type value used to represent being non-remote.
+#define NOT_REMOTE_TYPE VoidCString()
+
+#endif  // mozilla_dom_RemoteType_h

dom/ipc/moz.build

@@ -60,6 +60,7 @@ EXPORTS.mozilla.dom += [
     'ReferrerInfoUtils.h',
     'RefMessageBodyService.h',
     'RemoteBrowser.h',
+    'RemoteType.h',
     'RemoteWebProgress.h',
     'RemoteWebProgressRequest.h',
     'SharedMessageBody.h',

toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp

@@ -22,6 +22,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/Unused.h"
+#include "mozilla/dom/RemoteType.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"