From 2d3ee76bff5b457183496e3da9b48d01e8492aa5 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Wed, 15 Mar 2023 07:30:37 +0000
Subject: [PATCH] Bug 1820576 - Make uriloader/ buildable outside of a unified
 build environment r=andi

Differential Revision: https://phabricator.services.mozilla.com/D171734
---
 uriloader/base/moz.build       | 2 --
 uriloader/base/nsURILoader.cpp | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build
index 1e17cd1d81b8..36282f6f1448 100644
--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -41,5 +41,3 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = "xul"
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp
index 79c7c9794527..df286e5a7391 100644
--- a/uriloader/base/nsURILoader.cpp
+++ b/uriloader/base/nsURILoader.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsURILoader.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIURIContentListener.h"
 #include "nsIContentHandler.h"
 #include "nsILoadGroup.h"
@@ -70,7 +71,8 @@ nsDocumentOpenInfo::nsDocumentOpenInfo(nsIInterfaceRequestor* aWindowContext,
       mFlags(aFlags),
       mURILoader(aURILoader),
       mDataConversionDepthLimit(
-          StaticPrefs::general_document_open_conversion_depth_limit()) {}
+          mozilla::StaticPrefs::
+              general_document_open_conversion_depth_limit()) {}
 
 nsDocumentOpenInfo::nsDocumentOpenInfo(uint32_t aFlags,
                                        bool aAllowListenerConversions)
@@ -78,7 +80,7 @@ nsDocumentOpenInfo::nsDocumentOpenInfo(uint32_t aFlags,
       mFlags(aFlags),
       mURILoader(nullptr),
       mDataConversionDepthLimit(
-          StaticPrefs::general_document_open_conversion_depth_limit()),
+          mozilla::StaticPrefs::general_document_open_conversion_depth_limit()),
       mAllowListenerConversions(aAllowListenerConversions) {}
 
 nsDocumentOpenInfo::~nsDocumentOpenInfo() {}
@@ -269,7 +271,7 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) {
   LOG(("  forceExternalHandling: %s", forceExternalHandling ? "yes" : "no"));
 
   if (forceExternalHandling &&
-      StaticPrefs::browser_download_open_pdf_attachments_inline()) {
+      mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline()) {
     // Check if this is a PDF which should be opened internally. We also handle
     // octet-streams that look like they might be PDFs based on their extension.
     bool isPDF = mContentType.LowerCaseEqualsASCII(APPLICATION_PDF);