From 40fc78c788672e64d7332bf2323a6e302e075a7e Mon Sep 17 00:00:00 2001
From: Simon Giesecke <sgiesecke@mozilla.com>
Date: Mon, 23 Nov 2020 16:04:17 +0000
Subject: [PATCH] Bug 1660470 - Avoid including ClientIPCUtils.h from header
 files. r=nika

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

Depends on D93240
---
 dom/clients/manager/ClientIPCTypes.ipdlh          | 11 +++++++----
 dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dom/clients/manager/ClientIPCTypes.ipdlh b/dom/clients/manager/ClientIPCTypes.ipdlh
index 45c168755309..3cc5888bffae 100644
--- a/dom/clients/manager/ClientIPCTypes.ipdlh
+++ b/dom/clients/manager/ClientIPCTypes.ipdlh
@@ -7,11 +7,14 @@ include DOMTypes;
 include PBackgroundSharedTypes;
 include IPCServiceWorkerDescriptor;
 include ProtocolTypes;
+
+include "mozilla/dom/ClientIPCUtils.h";
+
 using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using ClientType from "mozilla/dom/ClientIPCUtils.h";
-using FrameType from "mozilla/dom/ClientIPCUtils.h";
-using mozilla::StorageAccess from "mozilla/dom/ClientIPCUtils.h";
-using VisibilityState from "mozilla/dom/ClientIPCUtils.h";
+using ClientType from "mozilla/dom/ClientsBinding.h";
+using FrameType from "mozilla/dom/ClientBinding.h";
+using mozilla::StorageAccess from "mozilla/StorageAccess.h";
+using VisibilityState from "mozilla/dom/DocumentBinding.h";
 using CallerType from "mozilla/dom/BindingIPCUtils.h";
 using mozilla::CopyableErrorResult from "ipc/ErrorIPCUtils.h";
 
diff --git a/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh b/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh
index a282d6ee7f03..0c746d936a78 100644
--- a/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh
+++ b/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh
@@ -11,8 +11,10 @@ include DOMTypes;
 include NeckoChannelParams;
 include ProtocolTypes;
 
+include "mozilla/dom/ClientIPCUtils.h";
+
 using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using mozilla::StorageAccess from "mozilla/dom/ClientIPCUtils.h";
+using mozilla::StorageAccess from "mozilla/StorageAccess.h";
 
 namespace mozilla {
 namespace dom {