Bug 1733356 - Fix non-unified build errors in netwerk/ipc/ r=necko-reviewers,kershaw

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

netwerk/ipc/DocumentChannelChild.cpp

@@ -7,7 +7,9 @@
 
 #include "DocumentChannelChild.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/extensions/StreamFilterParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/net/HttpBaseChannel.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/ScopeExit.h"
@@ -20,6 +22,7 @@
 #include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsQueryObject.h"
+#include "nsDocShellLoadState.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::ipc;

netwerk/ipc/DocumentLoadListener.cpp

@@ -54,6 +54,7 @@
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/nsHTTPSOnlyUtils.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "mozilla/dom/RemoteWebProgressRequest.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 #include "mozilla/ExtensionPolicyService.h"

netwerk/ipc/NeckoParent.cpp

@@ -39,6 +39,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/TabContext.h"
 #include "mozilla/dom/BrowserParent.h"
+#include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/dom/network/TCPSocketParent.h"
 #include "mozilla/dom/network/TCPServerSocketParent.h"
 #include "mozilla/dom/network/UDPSocketParent.h"
@@ -55,6 +56,7 @@
 #include "nsISpeculativeConnect.h"
 #include "nsHttpHandler.h"
 #include "nsNetUtil.h"
+#include "nsIOService.h"
 
 using IPC::SerializedLoadContext;
 using mozilla::OriginAttributes;
@@ -268,7 +270,7 @@ bool NeckoParent::DeallocPAltDataOutputStreamParent(
 
 already_AddRefed<PDocumentChannelParent>
 NeckoParent::AllocPDocumentChannelParent(
-    const MaybeDiscarded<BrowsingContext>& aContext,
+    const dom::MaybeDiscarded<BrowsingContext>& aContext,
     const DocumentChannelCreationArgs& args) {
   RefPtr<DocumentChannelParent> p = new DocumentChannelParent();
   return p.forget();
@@ -276,7 +278,7 @@ NeckoParent::AllocPDocumentChannelParent(
 
 mozilla::ipc::IPCResult NeckoParent::RecvPDocumentChannelConstructor(
     PDocumentChannelParent* aActor,
-    const MaybeDiscarded<BrowsingContext>& aContext,
+    const dom::MaybeDiscarded<BrowsingContext>& aContext,
     const DocumentChannelCreationArgs& aArgs) {
   DocumentChannelParent* p = static_cast<DocumentChannelParent*>(aActor);
 
@@ -542,7 +544,7 @@ mozilla::ipc::IPCResult NeckoParent::RecvSpeculativeConnect(
 mozilla::ipc::IPCResult NeckoParent::RecvHTMLDNSPrefetch(
     const nsString& hostname, const bool& isHttps,
     const OriginAttributes& aOriginAttributes, const uint32_t& flags) {
-  HTMLDNSPrefetch::Prefetch(hostname, isHttps, aOriginAttributes, flags);
+  dom::HTMLDNSPrefetch::Prefetch(hostname, isHttps, aOriginAttributes, flags);
   return IPC_OK();
 }
 
@@ -550,8 +552,8 @@ mozilla::ipc::IPCResult NeckoParent::RecvCancelHTMLDNSPrefetch(
     const nsString& hostname, const bool& isHttps,
     const OriginAttributes& aOriginAttributes, const uint32_t& flags,
     const nsresult& reason) {
-  HTMLDNSPrefetch::CancelPrefetch(hostname, isHttps, aOriginAttributes, flags,
-                                  reason);
+  dom::HTMLDNSPrefetch::CancelPrefetch(hostname, isHttps, aOriginAttributes,
+                                       flags, reason);
   return IPC_OK();
 }
 

netwerk/ipc/ParentChannelWrapper.cpp

@@ -6,8 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ParentChannelWrapper.h"
+#include "mozilla/net/HttpBaseChannel.h"
 #include "mozilla/net/UrlClassifierCommon.h"
-#include "nsIRedirectChannelRegistrar.h"
+#include "mozilla/net/RedirectChannelRegistrar.h"
+#include "nsIViewSourceChannel.h"
+#include "nsNetUtil.h"
+#include "nsQueryObject.h"
+#include "mozilla/dom/RemoteType.h"
 
 namespace mozilla {
 namespace net {

netwerk/ipc/ParentProcessDocumentChannel.cpp

@@ -7,6 +7,7 @@
 
 #include "ParentProcessDocumentChannel.h"
 
+#include "mozilla/extensions/StreamFilterParent.h"
 #include "mozilla/net/ParentChannelWrapper.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/StaticPrefs_extensions.h"
@@ -15,6 +16,8 @@
 #include "nsIObserverService.h"
 #include "nsIClassifiedChannel.h"
 #include "nsIXULRuntime.h"
+#include "nsHttpHandler.h"
+#include "nsDocShellLoadState.h"
 
 extern mozilla::LazyLogModule gDocumentChannelLog;
 #define LOG(fmt) MOZ_LOG(gDocumentChannelLog, mozilla::LogLevel::Verbose, fmt)
@@ -179,7 +182,7 @@ NS_IMETHODIMP ParentProcessDocumentChannel::AsyncOpen(
         mLoadState, mCacheKey, Some(mChannelId), mAsyncOpenTime, mTiming,
         std::move(initialClientInfo), InnerWindowIDForExtantDoc(docShell),
         mLoadFlags, mLoadInfo->InternalContentPolicyType(),
-        UserActivation::IsHandlingUserInput(), nullptr /* ContentParent */,
+        dom::UserActivation::IsHandlingUserInput(), nullptr /* ContentParent */,
         nullptr /* ObjectUpgradeHandler */, &rv);
   }
 

netwerk/ipc/ParentProcessDocumentChannel.h

@@ -11,6 +11,7 @@
 #include "mozilla/net/DocumentChannel.h"
 #include "mozilla/net/DocumentLoadListener.h"
 #include "nsIObserver.h"
+#include "nsIAsyncVerifyRedirectCallback.h"
 
 namespace mozilla {
 namespace net {

netwerk/ipc/ProxyConfigLookup.cpp

@@ -13,6 +13,7 @@
 #include "nsIProtocolProxyService2.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/ipc/ProxyConfigLookup.h

@@ -9,6 +9,7 @@
 
 #include <functional>
 #include "nsIProtocolProxyCallback.h"
+#include "nsCOMPtr.h"
 
 class nsIURI;
 

netwerk/ipc/SocketProcessBridgeChild.cpp

@@ -8,6 +8,7 @@
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/ipc/BackgroundChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/net/NeckoChild.h"
 #include "nsIObserverService.h"
 #include "nsThreadUtils.h"

netwerk/ipc/SocketProcessHost.cpp

@@ -12,6 +12,8 @@
 #include "nsIOService.h"
 #include "nsIObserverService.h"
 #include "ProfilerParent.h"
+#include "nsNetUtil.h"
+#include "mozilla/ipc/Endpoint.h"
 
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxBroker.h"

netwerk/ipc/SocketProcessParent.cpp

@@ -26,6 +26,9 @@
 #include "nsIHttpActivityObserver.h"
 #include "nsIObserverService.h"
 #include "nsNSSIOLayer.h"
+#include "nsIOService.h"
+#include "nsHttpHandler.h"
+#include "nsHttpConnectionInfo.h"
 #include "PSMIPCCommon.h"
 #include "secerr.h"
 #ifdef MOZ_WEBRTC

netwerk/ipc/moz.build

@@ -109,5 +109,3 @@ LOCAL_INCLUDES += [
 
 # Add libFuzzer configuration directives
 include("/tools/fuzzing/libfuzzer-config.mozbuild")
-
-REQUIRES_UNIFIED_BUILD = True