From b4b82098b4c28151eb15980048aae80c6f22c337 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Fri, 31 Mar 2023 13:29:47 +0000
Subject: [PATCH] Bug 1825333 - Make toolkit/components/sessionstore buildable
 outside of a unified build environment r=andi

Depends on D173976

Differential Revision: https://phabricator.services.mozilla.com/D173978
---
 toolkit/components/sessionstore/SessionStoreMessageUtils.h  | 1 +
 toolkit/components/sessionstore/SessionStoreRestoreData.cpp | 9 ++++++---
 toolkit/components/sessionstore/SessionStoreUtils.cpp       | 1 +
 toolkit/components/sessionstore/moz.build                   | 2 --
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/toolkit/components/sessionstore/SessionStoreMessageUtils.h b/toolkit/components/sessionstore/SessionStoreMessageUtils.h
index 6755607afe7a..8475955f870d 100644
--- a/toolkit/components/sessionstore/SessionStoreMessageUtils.h
+++ b/toolkit/components/sessionstore/SessionStoreMessageUtils.h
@@ -7,6 +7,7 @@
 
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/ipc/IPDLParamTraits.h"
+#include "mozilla/ipc/URIUtils.h"
 #include "SessionStoreData.h"
 #include "SessionStoreUtils.h"
 #include "SessionStoreRestoreData.h"
diff --git a/toolkit/components/sessionstore/SessionStoreRestoreData.cpp b/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
index 37fc151eefcb..c7a92cf8ada9 100644
--- a/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
+++ b/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
@@ -4,13 +4,16 @@
  * 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/. */
 
-namespace mozilla {
-namespace dom {
-
 #include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/SessionStoreUtils.h"
 #include "mozilla/dom/sessionstore/SessionStoreTypes.h"
+#include "mozilla/dom/WindowContext.h"
 #include "nsISessionStoreRestoreData.h"
+#include "nsNetUtil.h"
+
+namespace mozilla {
+namespace dom {
 
 bool SessionStoreRestoreData::IsEmpty() {
   return (!mURI && mScroll.IsEmpty() && mInnerHTML.IsEmpty() &&
diff --git a/toolkit/components/sessionstore/SessionStoreUtils.cpp b/toolkit/components/sessionstore/SessionStoreUtils.cpp
index 71585beb0581..fe589044de0d 100644
--- a/toolkit/components/sessionstore/SessionStoreUtils.cpp
+++ b/toolkit/components/sessionstore/SessionStoreUtils.cpp
@@ -9,6 +9,7 @@
 #include "js/PropertyAndElement.h"  // JS_GetElement
 #include "js/TypeDecls.h"
 #include "jsapi.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/dom/AutocompleteInfoBinding.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
diff --git a/toolkit/components/sessionstore/moz.build b/toolkit/components/sessionstore/moz.build
index ab7a3918ce51..9e8d2eb45e33 100644
--- a/toolkit/components/sessionstore/moz.build
+++ b/toolkit/components/sessionstore/moz.build
@@ -53,5 +53,3 @@ FINAL_LIBRARY = "xul"
 
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "Session Restore")
-
-REQUIRES_UNIFIED_BUILD = True
-- 
2.11.4.GIT