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

Depends on D129498

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

netwerk/url-classifier/ChannelClassifierService.cpp

@@ -18,6 +18,9 @@
 #include "UrlClassifierFeatureSocialTrackingProtection.h"
 #include "UrlClassifierFeatureTrackingProtection.h"
 
+#include "mozilla/StaticPtr.h"
+#include "nsIChannel.h"
+
 namespace mozilla {
 namespace net {
 

netwerk/url-classifier/ChannelClassifierService.h

@@ -9,6 +9,8 @@
 
 #include "nsIChannelClassifierService.h"
 #include "mozilla/net/UrlClassifierCommon.h"
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureCryptominingAnnotation.cpp

@@ -10,6 +10,9 @@
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureCryptominingProtection.cpp

@@ -11,6 +11,10 @@
 #include "ChannelClassifierService.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIHttpChannelInternal.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureFactory.cpp

@@ -20,6 +20,7 @@
 #include "UrlClassifierFeatureTrackingAnnotation.h"
 #include "UrlClassifierFeatureCustomTables.h"
 
+#include "nsIWebProgressListener.h"
 #include "nsAppRunner.h"
 
 namespace mozilla {

netwerk/url-classifier/UrlClassifierFeatureFingerprintingAnnotation.cpp

@@ -10,6 +10,9 @@
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureFingerprintingProtection.cpp

@@ -11,6 +11,10 @@
 #include "ChannelClassifierService.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIHttpChannelInternal.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureFlash.cpp

@@ -10,6 +10,8 @@
 #include "nsIXULRuntime.h"
 #include "nsScriptSecurityManager.h"
 #include "nsQueryObject.h"
+#include "UrlClassifierCommon.h"
+#include "nsIParentChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureFlash.h

@@ -8,6 +8,8 @@
 #define mozilla_UrlClassifierFeatureFlash_h
 
 #include "UrlClassifierFeatureBase.h"
+#include "nsIHttpChannel.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureLoginReputation.cpp

@@ -7,6 +7,10 @@
 #include "UrlClassifierFeatureLoginReputation.h"
 
 #include "mozilla/StaticPrefs_browser.h"
+#include "mozilla/StaticPtr.h"
+#include "UrlClassifierCommon.h"
+#include "nsCOMPtr.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeaturePhishingProtection.cpp

@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "UrlClassifierFeaturePhishingProtection.h"
+#include "mozilla/StaticPrefs_browser.h"
+#include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureResult.h

@@ -9,8 +9,8 @@
 
 #include "nsIUrlClassifierFeature.h"
 #include "nsString.h"
-
-class nsIURI;
+#include "nsCOMPtr.h"
+#include "nsIURI.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureSocialTrackingAnnotation.cpp

@@ -10,6 +10,9 @@
 #include "nsIClassifiedChannel.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureSocialTrackingProtection.cpp

@@ -11,6 +11,10 @@
 #include "ChannelClassifierService.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIWebProgressListener.h"
+#include "nsIHttpChannelInternal.h"
+#include "nsIChannel.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp

@@ -13,6 +13,9 @@
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadContext.h"
 #include "nsNetUtil.h"
+#include "mozilla/StaticPtr.h"
+#include "nsXULAppAPI.h"
+#include "nsIWebProgressListener.h"
 
 namespace mozilla {
 namespace net {

netwerk/url-classifier/moz.build

@@ -66,5 +66,3 @@ LOCAL_INCLUDES += [
 FINAL_LIBRARY = "xul"
 
 include("/ipc/chromium/chromium-config.mozbuild")
-
-REQUIRES_UNIFIED_BUILD = True