Bug 1522579 - Part 3: Remove consumers of nsIContentChild, r=mccr8

Like Part 2, however for `nsIContentChild`. Depends on D20550 Differential Revision: https://phabricator.services.mozilla.com/D20551 --HG-- extra : moz-landing-system : lando
2019-02-25 15:51:19 +00:00 · 2019-02-25 15:51:19 +00:00 · da5b73b6a0
--- a/dom/base/TabGroup.cpp
+++ b/dom/base/TabGroup.cpp
@ -6,7 +6,7 @@

 #include "mozilla/dom/TabGroup.h"

-#include "mozilla/dom/nsIContentChild.h"
+#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/TimeoutManager.h"
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@ -7313,7 +7313,7 @@ nsresult nsContentUtils::IPCTransferableToTransferable(

 void nsContentUtils::TransferablesToIPCTransferables(
    nsIArray* aTransferables, nsTArray<IPCDataTransfer>& aIPC,
-    bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,
+    bool aInSyncMessage, mozilla::dom::ContentChild* aChild,
    mozilla::dom::ContentParent* aParent) {
  aIPC.Clear();
  if (aTransferables) {
@ -7446,7 +7446,7 @@ bool nsContentUtils::IsFlavorImage(const nsACString& aFlavor) {
         aFlavor.EqualsLiteral(kGIFImageMime);
 }

-static Shmem ConvertToShmem(mozilla::dom::nsIContentChild* aChild,
+static Shmem ConvertToShmem(mozilla::dom::ContentChild* aChild,
                            mozilla::dom::ContentParent* aParent,
                            const nsACString& aInput) {
  MOZ_ASSERT((aChild && !aParent) || (!aChild && aParent));
@ -7467,7 +7467,7 @@ static Shmem ConvertToShmem(mozilla::dom::nsIContentChild* aChild,

 void nsContentUtils::TransferableToIPCTransferable(
    nsITransferable* aTransferable, IPCDataTransfer* aIPCDataTransfer,
-    bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,
+    bool aInSyncMessage, mozilla::dom::ContentChild* aChild,
    mozilla::dom::ContentParent* aParent) {
  MOZ_ASSERT((aChild && !aParent) || (!aChild && aParent));

--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@ -144,7 +144,7 @@ struct LifecycleCallbackArgs;
 struct LifecycleAdoptedCallbackArgs;
 class MessageBroadcaster;
 class NodeInfo;
-class nsIContentChild;
+class ContentChild;
 class ContentParent;
 class TabChild;
 class Selection;
@ -2838,13 +2838,13 @@ class nsContentUtils {

  static void TransferablesToIPCTransferables(
      nsIArray* aTransferables, nsTArray<mozilla::dom::IPCDataTransfer>& aIPC,
-      bool aInSyncMessage, mozilla::dom::nsIContentChild* aChild,
+      bool aInSyncMessage, mozilla::dom::ContentChild* aChild,
      mozilla::dom::ContentParent* aParent);

  static void TransferableToIPCTransferable(
      nsITransferable* aTransferable,
      mozilla::dom::IPCDataTransfer* aIPCDataTransfer, bool aInSyncMessage,
-      mozilla::dom::nsIContentChild* aChild,
+      mozilla::dom::ContentChild* aChild,
      mozilla::dom::ContentParent* aParent);

  /*
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@ -174,7 +174,7 @@ bool MessageManagerCallback::BuildClonedMessageDataForParent(
 }

 bool MessageManagerCallback::BuildClonedMessageDataForChild(
-    nsIContentChild* aChild, StructuredCloneData& aData,
+    ContentChild* aChild, StructuredCloneData& aData,
    ClonedMessageData& aClonedData) {
  return aData.BuildClonedMessageDataForChild(aChild, aClonedData);
 }
--- a/dom/base/nsFrameMessageManager.h
+++ b/dom/base/nsFrameMessageManager.h
@ -45,7 +45,7 @@ class FileDescriptor;
 namespace dom {

 class ContentParent;
-class nsIContentChild;
+class ContentChild;
 class ChildProcessMessageManager;
 class ChromeMessageBroadcaster;
 class ClonedMessageData;
@ -113,7 +113,7 @@ class MessageManagerCallback {
  bool BuildClonedMessageDataForParent(ContentParent* aParent,
                                       StructuredCloneData& aData,
                                       ClonedMessageData& aClonedData);
-  bool BuildClonedMessageDataForChild(nsIContentChild* aChild,
+  bool BuildClonedMessageDataForChild(ContentChild* aChild,
                                      StructuredCloneData& aData,
                                      ClonedMessageData& aClonedData);
 };
--- a/dom/file/TemporaryFileBlobImpl.cpp
+++ b/dom/file/TemporaryFileBlobImpl.cpp
@ -53,7 +53,7 @@ class TemporaryFileInputStream final : public nsFileInputStream {
  void Serialize(InputStreamParams& aParams,
                 FileDescriptorArray& aFileDescriptors, bool aDelayedStart,
                 uint32_t aMaxSize, uint32_t* aSizeUsed,
-                 nsIContentChild* aManager) override {
+                 ContentChild* aManager) override {
    MOZ_CRASH("This inputStream cannot be serialized.");
  }

--- a/dom/file/ipc/IPCBlobInputStream.cpp
+++ b/dom/file/ipc/IPCBlobInputStream.cpp
@ -567,7 +567,7 @@ void IPCBlobInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams,
                                   FileDescriptorArray& aFileDescriptors,
                                   bool aDelayedStart, uint32_t aMaxSize,
                                   uint32_t* aSizeUsed,
-                                   nsIContentChild* aManager) {
+                                   ContentChild* aManager) {
  MOZ_ASSERT(aSizeUsed);
  *aSizeUsed = 0;

--- a/dom/file/ipc/IPCBlobUtils.cpp
+++ b/dom/file/ipc/IPCBlobUtils.cpp
@ -148,7 +148,7 @@ nsresult SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,

 nsresult SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,
                              uint64_t aChildID, IPCBlob& aIPCBlob,
-                              nsIContentChild* aManager) {
+                              ContentChild* aManager) {
  return SerializeInputStreamChild(aInputStream, aIPCBlob, aManager);
 }

@ -166,7 +166,7 @@ uint64_t ChildIDFromManager(PBackgroundParent* aManager) {
  return BackgroundParent::GetChildID(aManager);
 }

-uint64_t ChildIDFromManager(nsIContentChild* aManager) { return 0; }
+uint64_t ChildIDFromManager(ContentChild* aManager) { return 0; }

 uint64_t ChildIDFromManager(PBackgroundChild* aManager) { return 0; }

@ -232,7 +232,7 @@ nsresult SerializeInternal(BlobImpl* aBlobImpl, M* aManager,
  return NS_OK;
 }

-nsresult Serialize(BlobImpl* aBlobImpl, nsIContentChild* aManager,
+nsresult Serialize(BlobImpl* aBlobImpl, ContentChild* aManager,
                   IPCBlob& aIPCBlob) {
  return SerializeInternal(aBlobImpl, aManager, aIPCBlob);
 }
--- a/dom/file/ipc/IPCBlobUtils.h
+++ b/dom/file/ipc/IPCBlobUtils.h
@ -222,7 +222,7 @@ class PBackgroundParent;
 namespace dom {

 class IPCBlob;
-class nsIContentChild;
+class ContentChild;
 class ContentParent;

 namespace IPCBlobUtils {
@ -231,7 +231,7 @@ already_AddRefed<BlobImpl> Deserialize(const IPCBlob& aIPCBlob);

 // These 4 methods serialize aBlobImpl into aIPCBlob using the right manager.

-nsresult Serialize(BlobImpl* aBlobImpl, nsIContentChild* aManager,
+nsresult Serialize(BlobImpl* aBlobImpl, ContentChild* aManager,
                   IPCBlob& aIPCBlob);

 nsresult Serialize(BlobImpl* aBlobImpl,
--- a/dom/indexedDB/FileSnapshot.cpp
+++ b/dom/indexedDB/FileSnapshot.cpp
@ -273,7 +273,7 @@ StreamWrapper::IsNonBlocking(bool* _retval) {
 void StreamWrapper::Serialize(InputStreamParams& aParams,
                              FileDescriptorArray& aFileDescriptors,
                              bool aDelayedStart, uint32_t aMaxSize,
-                              uint32_t* aSizeUsed, nsIContentChild* aManager) {
+                              uint32_t* aSizeUsed, ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@ -1755,12 +1755,13 @@ PFileDescriptorSetChild* ContentChild::SendPFileDescriptorSetConstructor(

 PFileDescriptorSetChild* ContentChild::AllocPFileDescriptorSetChild(
    const FileDescriptor& aFD) {
-  return nsIContentChild::AllocPFileDescriptorSetChild(aFD);
+  return new FileDescriptorSetChild(aFD);
 }

 bool ContentChild::DeallocPFileDescriptorSetChild(
    PFileDescriptorSetChild* aActor) {
-  return nsIContentChild::DeallocPFileDescriptorSetChild(aActor);
+  delete static_cast<FileDescriptorSetChild*>(aActor);
+  return true;
 }

 bool ContentChild::DeallocPBrowserChild(PBrowserChild* aIframe) {
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@ -507,11 +507,9 @@ class ContentChild final : public PContentChild,
  virtual PFileDescriptorSetChild* SendPFileDescriptorSetConstructor(
      const FileDescriptor&) override;

-  virtual PFileDescriptorSetChild* AllocPFileDescriptorSetChild(
-      const FileDescriptor&) override;
+  PFileDescriptorSetChild* AllocPFileDescriptorSetChild(const FileDescriptor&);

-  virtual bool DeallocPFileDescriptorSetChild(
-      PFileDescriptorSetChild*) override;
+  bool DeallocPFileDescriptorSetChild(PFileDescriptorSetChild*);

  virtual bool SendPBrowserConstructor(
      PBrowserChild* actor, const TabId& aTabId, const TabId& aSameTabGroupAs,
--- a/dom/ipc/JSWindowActorChild.cpp
+++ b/dom/ipc/JSWindowActorChild.cpp
@ -95,7 +95,7 @@ void JSWindowActorChild::SendAsyncMessage(JSContext* aCx,
  // If we're a cross-process, send the async message over the corresponding
  // actor.
  ClonedMessageData msgData;
-  nsIContentChild* cc = ContentChild::GetSingleton();
+  ContentChild* cc = ContentChild::GetSingleton();
  if (!data.BuildClonedMessageDataForChild(cc, msgData)) {
    aRv.Throw(NS_ERROR_DOM_DATA_CLONE_ERR);
    return;
--- a/dom/ipc/StructuredCloneData.cpp
+++ b/dom/ipc/StructuredCloneData.cpp
@ -200,7 +200,7 @@ bool StructuredCloneData::BuildClonedMessageDataForParent(
 }

 bool StructuredCloneData::BuildClonedMessageDataForChild(
-    nsIContentChild* aChild, ClonedMessageData& aClonedData) {
+    ContentChild* aChild, ClonedMessageData& aClonedData) {
  return BuildClonedMessageData(aChild, *this, aClonedData);
 }

--- a/dom/ipc/StructuredCloneData.h
+++ b/dom/ipc/StructuredCloneData.h
@ -29,7 +29,7 @@ class PBackgroundParent;

 namespace dom {

-class nsIContentChild;
+class ContentChild;
 class ContentParent;

 namespace ipc {
@ -183,7 +183,7 @@ class StructuredCloneData : public StructuredCloneHolder {
  // be able to create them.)
  bool BuildClonedMessageDataForParent(ContentParent* aParent,
                                       ClonedMessageData& aClonedData);
-  bool BuildClonedMessageDataForChild(nsIContentChild* aChild,
+  bool BuildClonedMessageDataForChild(ContentChild* aChild,
                                      ClonedMessageData& aClonedData);
  bool BuildClonedMessageDataForBackgroundParent(
      mozilla::ipc::PBackgroundParent* aParent, ClonedMessageData& aClonedData);
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@ -350,7 +350,7 @@ already_AddRefed<TabChild> TabChild::FindTabChild(const TabId& aTabId) {
 }

 /*static*/ already_AddRefed<TabChild> TabChild::Create(
-    nsIContentChild* aManager, const TabId& aTabId,
+    ContentChild* aManager, const TabId& aTabId,
    const TabId& aSameTabGroupAs, const TabContext& aContext,
    uint32_t aChromeFlags) {
  RefPtr<TabChild> groupChild = FindTabChild(aSameTabGroupAs);
@ -360,7 +360,7 @@ already_AddRefed<TabChild> TabChild::FindTabChild(const TabId& aTabId) {
  return iframe.forget();
 }

-TabChild::TabChild(nsIContentChild* aManager, const TabId& aTabId,
+TabChild::TabChild(ContentChild* aManager, const TabId& aTabId,
                   dom::TabGroup* aTabGroup, const TabContext& aContext,
                   uint32_t aChromeFlags)
    : TabContext(aContext),
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@ -231,13 +231,13 @@ class TabChild final : public TabChildBase,
  /**
   * Create a new TabChild object.
   */
-  TabChild(nsIContentChild* aManager, const TabId& aTabId, TabGroup* aTabGroup,
+  TabChild(ContentChild* aManager, const TabId& aTabId, TabGroup* aTabGroup,
           const TabContext& aContext, uint32_t aChromeFlags);

  nsresult Init(mozIDOMWindowProxy* aParent);

  /** Return a TabChild with the given attributes. */
-  static already_AddRefed<TabChild> Create(nsIContentChild* aManager,
+  static already_AddRefed<TabChild> Create(ContentChild* aManager,
                                           const TabId& aTabId,
                                           const TabId& aSameTabGroupAs,
                                           const TabContext& aContext,
@ -468,7 +468,7 @@ class TabChild final : public TabChildBase,
  void MakeHidden();
  bool IsVisible();

-  nsIContentChild* Manager() const { return mManager; }
+  ContentChild* Manager() const { return mManager; }

  static inline TabChild* GetFrom(nsIDocShell* aDocShell) {
    if (!aDocShell) {
@ -803,7 +803,7 @@ class TabChild final : public TabChildBase,
  RefPtr<mozilla::dom::TabGroup> mTabGroup;
  RefPtr<PuppetWidget> mPuppetWidget;
  nsCOMPtr<nsIURI> mLastURI;
-  RefPtr<nsIContentChild> mManager;
+  RefPtr<ContentChild> mManager;
  uint32_t mChromeFlags;
  uint32_t mMaxTouchPoints;
  layers::LayersId mLayersId;
--- a/dom/ipc/nsIContentChild.cpp
+++ b/dom/ipc/nsIContentChild.cpp
@ -59,8 +59,9 @@ PBrowserChild* nsIContentChild::AllocPBrowserChild(
    MOZ_CRASH("Invalid TabContext received from the parent process.");
  }

-  RefPtr<TabChild> child = TabChild::Create(this, aTabId, aSameTabGroupAs,
-                                            tc.GetTabContext(), aChromeFlags);
+  RefPtr<TabChild> child =
+      TabChild::Create(static_cast<ContentChild*>(this), aTabId,
+                       aSameTabGroupAs, tc.GetTabContext(), aChromeFlags);

  // The ref here is released in DeallocPBrowserChild.
  return child.forget().take();
@ -132,17 +133,6 @@ bool nsIContentChild::DeallocPParentToChildStreamChild(
  return true;
 }

-PFileDescriptorSetChild* nsIContentChild::AllocPFileDescriptorSetChild(
-    const FileDescriptor& aFD) {
-  return new FileDescriptorSetChild(aFD);
-}
-
-bool nsIContentChild::DeallocPFileDescriptorSetChild(
-    PFileDescriptorSetChild* aActor) {
-  delete static_cast<FileDescriptorSetChild*>(aActor);
-  return true;
-}
-
 mozilla::ipc::IPCResult nsIContentChild::RecvAsyncMessage(
    const nsString& aMsg, InfallibleTArray<CpowEntry>&& aCpows,
    const IPC::Principal& aPrincipal, const ClonedMessageData& aData) {
--- a/dom/ipc/nsIContentChild.h
+++ b/dom/ipc/nsIContentChild.h
@ -30,7 +30,6 @@ class Principal;
 namespace mozilla {
 namespace ipc {
 class FileDescriptor;
-class PFileDescriptorSetChild;
 class PChildToParentStreamChild;
 class PParentToChildStreamChild;
 class Shmem;
@ -106,12 +105,6 @@ class nsIContentChild : public nsISupports,
  virtual bool DeallocPParentToChildStreamChild(
      mozilla::ipc::PParentToChildStreamChild* aActor);

-  virtual mozilla::ipc::PFileDescriptorSetChild* AllocPFileDescriptorSetChild(
-      const mozilla::ipc::FileDescriptor& aFD);
-
-  virtual bool DeallocPFileDescriptorSetChild(
-      mozilla::ipc::PFileDescriptorSetChild* aActor);
-
  virtual mozilla::ipc::IPCResult RecvAsyncMessage(
      const nsString& aMsg, InfallibleTArray<jsipc::CpowEntry>&& aCpows,
      const IPC::Principal& aPrincipal, const ClonedMessageData& aData);
--- a/ipc/glue/FileDescriptorSetChild.h
+++ b/ipc/glue/FileDescriptorSetChild.h
@ -16,7 +16,7 @@ namespace mozilla {

 namespace dom {

-class nsIContentChild;
+class ContentChild;

 }  // namespace dom

@ -27,7 +27,7 @@ class FileDescriptor;

 class FileDescriptorSetChild final : public PFileDescriptorSetChild {
  friend class BackgroundChildImpl;
-  friend class mozilla::dom::nsIContentChild;
+  friend class mozilla::dom::ContentChild;
  friend class PFileDescriptorSetChild;

  nsTArray<FileDescriptor> mFileDescriptors;
--- a/ipc/glue/IPCStreamChild.cpp
+++ b/ipc/glue/IPCStreamChild.cpp
@ -8,7 +8,7 @@
 #include "IPCStreamSource.h"

 #include "mozilla/Unused.h"
-#include "mozilla/dom/nsIContentChild.h"
+#include "mozilla/dom/ContentChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/PChildToParentStreamChild.h"
 #include "mozilla/ipc/PParentToChildStreamChild.h"
@ -67,7 +67,7 @@ class IPCStreamSourceChild final : public PChildToParentStreamChild,
 }  // anonymous namespace

 /* static */ PChildToParentStreamChild* IPCStreamSource::Create(
-    nsIAsyncInputStream* aInputStream, dom::nsIContentChild* aManager) {
+    nsIAsyncInputStream* aInputStream, dom::ContentChild* aManager) {
  MOZ_ASSERT(aInputStream);
  MOZ_ASSERT(aManager);

--- a/ipc/glue/IPCStreamSource.h
+++ b/ipc/glue/IPCStreamSource.h
@ -15,7 +15,7 @@ class nsIAsyncInputStream;
 namespace mozilla {

 namespace dom {
-class nsIContentChild;
+class ContentChild;
 class ContentParent;
 }  // namespace dom

@ -61,7 +61,7 @@ class IPCStreamSource {
  // main thread.  This can return nullptr if the provided stream is
  // blocking.
  static PChildToParentStreamChild* Create(nsIAsyncInputStream* aInputStream,
-                                           dom::nsIContentChild* aManager);
+                                           dom::ContentChild* aManager);

  // Create a IPCStreamSource using a PBackground IPC manager on the
  // main thread or a Worker thread.  This can return nullptr if the provided
--- a/ipc/glue/IPCStreamUtils.cpp
+++ b/ipc/glue/IPCStreamUtils.cpp
@ -331,7 +331,7 @@ AutoIPCStream::~AutoIPCStream() {
 }

 bool AutoIPCStream::Serialize(nsIInputStream* aStream,
-                              dom::nsIContentChild* aManager) {
+                              dom::ContentChild* aManager) {
  MOZ_ASSERT(aStream || !mValue);
  MOZ_ASSERT(aManager);
  MOZ_ASSERT(mValue || mOptionalValue);
--- a/ipc/glue/IPCStreamUtils.h
+++ b/ipc/glue/IPCStreamUtils.h
@ -14,7 +14,7 @@
 namespace mozilla {

 namespace dom {
-class nsIContentChild;
+class ContentChild;
 class ContentParent;
 }  // namespace dom

@ -148,7 +148,7 @@ class AutoIPCStream final {
  // Serialize the input stream or create a SendStream actor using the PContent
  // manager.  If neither of these succeed, then crash.  This should only be
  // used on the main thread.
-  bool Serialize(nsIInputStream* aStream, dom::nsIContentChild* aManager);
+  bool Serialize(nsIInputStream* aStream, dom::ContentChild* aManager);

  // Serialize the input stream or create a SendStream actor using the
  // PBackground manager.  If neither of these succeed, then crash.  This can
--- a/ipc/glue/InputStreamUtils.cpp
+++ b/ipc/glue/InputStreamUtils.cpp
@ -120,7 +120,7 @@ void SerializeInputStreamAsPipeInternal(nsIInputStream* aInputStream,
 void InputStreamHelper::SerializeInputStream(
    nsIInputStream* aInputStream, InputStreamParams& aParams,
    nsTArray<FileDescriptor>& aFileDescriptors, bool aDelayedStart,
-    uint32_t aMaxSize, uint32_t* aSizeUsed, nsIContentChild* aManager) {
+    uint32_t aMaxSize, uint32_t* aSizeUsed, ContentChild* aManager) {
  SerializeInputStreamInternal(aInputStream, aParams, aFileDescriptors,
                               aDelayedStart, aMaxSize, aSizeUsed, aManager);
 }
@ -152,7 +152,7 @@ void InputStreamHelper::SerializeInputStream(
 void InputStreamHelper::SerializeInputStreamAsPipe(nsIInputStream* aInputStream,
                                                   InputStreamParams& aParams,
                                                   bool aDelayedStart,
-                                                   nsIContentChild* aManager) {
+                                                   ContentChild* aManager) {
  SerializeInputStreamAsPipeInternal(aInputStream, aParams, aDelayedStart,
                                     aManager);
 }
--- a/ipc/glue/InputStreamUtils.h
+++ b/ipc/glue/InputStreamUtils.h
@ -34,7 +34,7 @@ class InputStreamHelper {
                                   nsTArray<FileDescriptor>& aFileDescriptors,
                                   bool aDelayedStart, uint32_t aMaxSize,
                                   uint32_t* aSizeUsed,
-                                   mozilla::dom::nsIContentChild* aManager);
+                                   mozilla::dom::ContentChild* aManager);

  static void SerializeInputStream(nsIInputStream* aInputStream,
                                   InputStreamParams& aParams,
@ -61,7 +61,7 @@ class InputStreamHelper {
  // these methods.
  static void SerializeInputStreamAsPipe(
      nsIInputStream* aInputStream, InputStreamParams& aParams,
-      bool aDelayedStart, mozilla::dom::nsIContentChild* aManager);
+      bool aDelayedStart, mozilla::dom::ContentChild* aManager);

  static void SerializeInputStreamAsPipe(nsIInputStream* aInputStream,
                                         InputStreamParams& aParams,
--- a/ipc/glue/nsIIPCSerializableInputStream.h
+++ b/ipc/glue/nsIIPCSerializableInputStream.h
@ -16,7 +16,7 @@ namespace mozilla {

 namespace dom {

-class nsIContentChild;
+class ContentChild;
 class ContentParent;

 }  // namespace dom
@ -49,7 +49,7 @@ class NS_NO_VTABLE nsIIPCSerializableInputStream : public nsISupports {
                         FileDescriptorArray& aFileDescriptors,
                         bool aDelayedStart, uint32_t aMaxSize,
                         uint32_t* aSizeUsed,
-                         mozilla::dom::nsIContentChild* aManager) = 0;
+                         mozilla::dom::ContentChild* aManager) = 0;

  virtual void Serialize(mozilla::ipc::InputStreamParams& aParams,
                         FileDescriptorArray& aFileDescriptors,
@ -79,7 +79,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIIPCSerializableInputStream,
 #define NS_DECL_NSIIPCSERIALIZABLEINPUTSTREAM                             \
  virtual void Serialize(mozilla::ipc::InputStreamParams&,                \
                         FileDescriptorArray&, bool, uint32_t, uint32_t*, \
-                         mozilla::dom::nsIContentChild*) override;        \
+                         mozilla::dom::ContentChild*) override;        \
                                                                          \
  virtual void Serialize(mozilla::ipc::InputStreamParams&,                \
                         FileDescriptorArray&, bool, uint32_t, uint32_t*, \
@ -101,7 +101,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIIPCSerializableInputStream,
                         FileDescriptorArray& aFileDescriptors,                \
                         bool aDelayedStart, uint32_t aMaxSize,                \
                         uint32_t* aSizeUsed,                                  \
-                         mozilla::dom::nsIContentChild* aManager) override {   \
+                         mozilla::dom::ContentChild* aManager) override {   \
    _to Serialize(aParams, aFileDescriptors, aDelayedStart, aMaxSize,          \
                  aSizeUsed, aManager);                                        \
  }                                                                            \
@ -144,7 +144,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIIPCSerializableInputStream,
                         FileDescriptorArray& aFileDescriptors,                \
                         bool aDelayedStart, uint32_t aMaxSize,                \
                         uint32_t* aSizeUsed,                                  \
-                         mozilla::dom::nsIContentChild* aManager) override {   \
+                         mozilla::dom::ContentChild* aManager) override {   \
    if (_to) {                                                                 \
      _to->Serialize(aParams, aFileDescriptors, aDelayedStart, aMaxSize,       \
                     aSizeUsed, aManager);                                     \
--- a/netwerk/base/PartiallySeekableInputStream.cpp
+++ b/netwerk/base/PartiallySeekableInputStream.cpp
@ -282,7 +282,7 @@ void PartiallySeekableInputStream::Serialize(
    mozilla::ipc::InputStreamParams& aParams,
    FileDescriptorArray& aFileDescriptors, bool aDelayedStart,
    uint32_t aMaxSize, uint32_t* aSizeUsed,
-    mozilla::dom::nsIContentChild* aManager) {
+    mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/netwerk/base/nsBufferedStreams.cpp
+++ b/netwerk/base/nsBufferedStreams.cpp
@ -593,7 +593,7 @@ void nsBufferedInputStream::Serialize(InputStreamParams& aParams,
                                      FileDescriptorArray& aFileDescriptors,
                                      bool aDelayedStart, uint32_t aMaxSize,
                                      uint32_t* aSizeUsed,
-                                      mozilla::dom::nsIContentChild* aManager) {
+                                      mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/netwerk/base/nsFileStreams.cpp
+++ b/netwerk/base/nsFileStreams.cpp
@ -539,7 +539,7 @@ void nsFileInputStream::Serialize(InputStreamParams& aParams,
                                  FileDescriptorArray& aFileDescriptors,
                                  bool aDelayedStart, uint32_t aMaxSize,
                                  uint32_t* aSizeUsed,
-                                  mozilla::dom::nsIContentChild* aManager) {
+                                  mozilla::dom::ContentChild* aManager) {
  MOZ_ASSERT(aSizeUsed);
  *aSizeUsed = 0;

--- a/netwerk/base/nsMIMEInputStream.cpp
+++ b/netwerk/base/nsMIMEInputStream.cpp
@ -340,7 +340,7 @@ void nsMIMEInputStream::Serialize(InputStreamParams& aParams,
                                  FileDescriptorArray& aFileDescriptors,
                                  bool aDelayedStart, uint32_t aMaxSize,
                                  uint32_t* aSizeUsed,
-                                  mozilla::dom::nsIContentChild* aManager) {
+                                  mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/testing/web-platform/meta/encrypted-media/dir.ini
+++ b/testing/web-platform/meta/encrypted-media/dir.ini
@ -1,5 +1,5 @@
 disabled:
  if asan: https://bugzilla.mozilla.org/show_bug.cgi?id=1522213
 prefs: [dom.security.featurePolicy.enabled:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true]
-lsan-allowed: [Alloc, CreateCDMProxy, MakeUnique, Malloc, NewPage, Realloc, mozilla::EMEDecryptor::EMEDecryptor, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::dom::MediaKeys::CreateCDMProxy, mozilla::dom::nsIContentChild::GetConstructedEventTarget]
+lsan-allowed: [Alloc, CreateCDMProxy, MakeUnique, Malloc, NewPage, Realloc, mozilla::EMEDecryptor::EMEDecryptor, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::dom::MediaKeys::CreateCDMProxy, mozilla::dom::ContentChild::GetConstructedEventTarget]
 leak-threshold: [default:51200]
--- a/testing/web-platform/meta/websockets/binary/dir.ini
+++ b/testing/web-platform/meta/websockets/binary/dir.ini
@ -1,3 +1,3 @@
-lsan-allowed: [MakeUnique, mozilla::dom::WebSocket::ConstructorCommon, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketEventService::GetOrCreate, Alloc, Create, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::nsIContentChild::GetConstructedEventTarget, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create]
+lsan-allowed: [MakeUnique, mozilla::dom::WebSocket::ConstructorCommon, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketEventService::GetOrCreate, Alloc, Create, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::ContentChild::GetConstructedEventTarget, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create]
 lsan-max-stack-depth: 7
 leak-threshold: [tab:51200]
--- a/testing/web-platform/meta/websockets/constructor/dir.ini
+++ b/testing/web-platform/meta/websockets/constructor/dir.ini
@ -1,3 +1,3 @@
-lsan-allowed: [Alloc, Create, MakeUnique, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, SetPropertyAsInterface, SetSucceededCertChain, allocate, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::nsIContentChild::GetConstructedEventTarget, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create, nsNSSCertificate::Create, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSSLIOLayerAddToSocket]
+lsan-allowed: [Alloc, Create, MakeUnique, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, SetPropertyAsInterface, SetSucceededCertChain, allocate, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::ContentChild::GetConstructedEventTarget, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create, nsNSSCertificate::Create, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSSLIOLayerAddToSocket]
 lsan-max-stack-depth: 7
 leak-threshold: [tab:51200]
--- a/xpcom/io/InputStreamLengthWrapper.cpp
+++ b/xpcom/io/InputStreamLengthWrapper.cpp
@ -260,7 +260,7 @@ void InputStreamLengthWrapper::Serialize(
    mozilla::ipc::InputStreamParams& aParams,
    FileDescriptorArray& aFileDescriptors, bool aDelayedStart,
    uint32_t aMaxSize, uint32_t* aSizeUsed,
-    mozilla::dom::nsIContentChild* aManager) {
+    mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/xpcom/io/NonBlockingAsyncInputStream.cpp
+++ b/xpcom/io/NonBlockingAsyncInputStream.cpp
@ -320,7 +320,7 @@ void NonBlockingAsyncInputStream::Serialize(
    mozilla::ipc::InputStreamParams& aParams,
    FileDescriptorArray& aFileDescriptors, bool aDelayedStart,
    uint32_t aMaxSize, uint32_t* aSizeUsed,
-    mozilla::dom::nsIContentChild* aManager) {
+    mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/xpcom/io/SlicedInputStream.cpp
+++ b/xpcom/io/SlicedInputStream.cpp
@ -424,7 +424,7 @@ void SlicedInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams,
                                  FileDescriptorArray& aFileDescriptors,
                                  bool aDelayedStart, uint32_t aMaxSize,
                                  uint32_t* aSizeUsed,
-                                  mozilla::dom::nsIContentChild* aManager) {
+                                  mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/xpcom/io/nsMultiplexInputStream.cpp
+++ b/xpcom/io/nsMultiplexInputStream.cpp
@ -993,7 +993,7 @@ nsresult nsMultiplexInputStreamConstructor(nsISupports* aOuter, REFNSIID aIID,
 void nsMultiplexInputStream::Serialize(
    InputStreamParams& aParams, FileDescriptorArray& aFileDescriptors,
    bool aDelayedStart, uint32_t aMaxSize, uint32_t* aSizeUsed,
-    mozilla::dom::nsIContentChild* aManager) {
+    mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aFileDescriptors, aDelayedStart, aMaxSize,
                    aSizeUsed, aManager);
 }
--- a/xpcom/io/nsStorageStream.cpp
+++ b/xpcom/io/nsStorageStream.cpp
@ -553,7 +553,7 @@ nsresult nsStorageInputStream::Seek(uint32_t aPosition) {
 void nsStorageInputStream::Serialize(InputStreamParams& aParams,
                                     FileDescriptorArray&, bool aDelayedStart,
                                     uint32_t aMaxSize, uint32_t* aSizeUsed,
-                                     mozilla::dom::nsIContentChild* aManager) {
+                                     mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aDelayedStart, aMaxSize, aSizeUsed, aManager);
 }

--- a/xpcom/io/nsStringStream.cpp
+++ b/xpcom/io/nsStringStream.cpp
@ -348,7 +348,7 @@ void nsStringInputStream::Serialize(InputStreamParams& aParams,
                                    FileDescriptorArray& /* aFDs */,
                                    bool aDelayedStart, uint32_t aMaxSize,
                                    uint32_t* aSizeUsed,
-                                    mozilla::dom::nsIContentChild* aManager) {
+                                    mozilla::dom::ContentChild* aManager) {
  SerializeInternal(aParams, aDelayedStart, aMaxSize, aSizeUsed, aManager);
 }

--- a/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp
+++ b/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp
@ -269,7 +269,7 @@ class QIInputStream final : public nsIInputStream,

  // nsIIPCSerializableInputStream
  void Serialize(mozilla::ipc::InputStreamParams&, FileDescriptorArray&, bool,
-                 uint32_t, uint32_t*, mozilla::dom::nsIContentChild*) override {
+                 uint32_t, uint32_t*, mozilla::dom::ContentChild*) override {
  }
  void Serialize(mozilla::ipc::InputStreamParams&, FileDescriptorArray&, bool,
                 uint32_t, uint32_t*,