Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell

accessible/generic/Accessible.cpp

@@ -65,7 +65,6 @@
 #include "nsIServiceManager.h"
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
-#include "nsNetUtil.h"
 
 #ifdef DEBUG
 #include "nsIDOMCharacterData.h"

browser/components/shell/nsGNOMEShellService.cpp

@@ -21,7 +21,6 @@
 #include "nsIStringBundle.h"
 #include "nsIOutputStream.h"
 #include "nsIProcess.h"
-#include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIDOMHTMLImageElement.h"

browser/components/shell/nsMacShellService.cpp

@@ -17,7 +17,6 @@
 #include "nsIURL.h"
 #include "nsIWebBrowserPersist.h"
 #include "nsMacShellService.h"
-#include "nsNetUtil.h"
 #include "nsIProperties.h"
 #include "nsServiceManagerUtils.h"
 #include "nsShellService.h"

caps/BasePrincipal.cpp

@@ -12,6 +12,7 @@
 
 #include "nsPrincipal.h"
 #include "nsNetUtil.h"
+#include "nsIURIWithPrincipal.h"
 #include "nsNullPrincipal.h"
 #include "nsScriptSecurityManager.h"
 

caps/nsNullPrincipal.cpp

@@ -15,7 +15,6 @@
 #include "nsNullPrincipal.h"
 #include "nsNullPrincipalURI.h"
 #include "nsMemory.h"
-#include "nsNetUtil.h"
 #include "nsIURIWithPrincipal.h"
 #include "nsIClassInfoImpl.h"
 #include "nsNetCID.h"

caps/nsNullPrincipalURI.cpp

@@ -11,7 +11,6 @@
 
 #include "mozilla/ipc/URIParams.h"
 
-#include "nsNetUtil.h"
 #include "nsEscape.h"
 #include "nsCRT.h"
 #include "nsIUUIDGenerator.h"

dom/archivereader/ArchiveReader.cpp

@@ -11,7 +11,6 @@
 
 #include "nsIURI.h"
 #include "nsNetCID.h"
-#include "nsNetUtil.h"
 
 #include "mozilla/dom/ArchiveReaderBinding.h"
 #include "mozilla/dom/BindingDeclarations.h"

dom/base/Element.cpp

@@ -29,7 +29,6 @@
 #include "nsILinkHandler.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsContainerFrame.h"
 #include "nsIAnonymousContentCreator.h"
 #include "nsIPresShell.h"

dom/base/ImageEncoder.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/SyncRunnable.h"
 #include "gfxUtils.h"
+#include "nsNetUtil.h"
 
 using namespace mozilla::gfx;
 

dom/base/ImageEncoder.h

@@ -12,7 +12,6 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/HTMLCanvasElementBinding.h"
 #include "nsLayoutUtils.h"
-#include "nsNetUtil.h"
 #include "nsSize.h"
 
 class nsICanvasRenderingContextInternal;

dom/base/ResponsiveImageSelector.cpp

@@ -9,7 +9,6 @@
 #include "nsIDocument.h"
 #include "nsContentUtils.h"
 #include "nsPresContext.h"
-#include "nsNetUtil.h"
 
 #include "nsCSSParser.h"
 #include "nsCSSProps.h"

dom/base/nsDOMDataChannel.cpp

@@ -27,7 +27,6 @@ extern PRLogModuleInfo* GetDataChannelLog();
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "nsNetUtil.h"
 
 #include "DataChannel.h"
 

dom/base/nsDOMFileReader.cpp

@@ -12,7 +12,6 @@
 #include "nsError.h"
 #include "nsIFile.h"
 #include "nsNetCID.h"
-#include "nsNetUtil.h"
 
 #include "nsXPCOM.h"
 #include "nsIDOMEventListener.h"

dom/base/nsDocument.cpp

@@ -84,7 +84,7 @@
 #include "nsIScriptError.h"
 #include "nsStyleSheetService.h"
 
-#include "nsNetUtil.h"     // for NS_MakeAbsoluteURI
+#include "nsNetUtil.h"     // for NS_NewURI
 #include "nsIInputStreamChannel.h"
 #include "nsIAuthPrompt.h"
 #include "nsIAuthPrompt2.h"

dom/base/nsGlobalWindow.cpp

@@ -41,6 +41,7 @@
 #include "nsWindowMemoryReporter.h"
 #include "WindowNamedPropertiesHandler.h"
 #include "nsFrameSelection.h"
+#include "nsNetUtil.h"
 
 // Helper Classes
 #include "nsJSUtils.h"

dom/base/nsINode.cpp

@@ -76,7 +76,6 @@
 #include "nsIWidget.h"
 #include "nsLayoutUtils.h"
 #include "nsNameSpaceManager.h"
-#include "nsNetUtil.h"
 #include "nsNodeInfoManager.h"
 #include "nsNodeUtils.h"
 #include "nsPIBoxObject.h"

dom/base/nsInProcessTabChildGlobal.cpp

@@ -11,7 +11,6 @@
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsComponentManagerUtils.h"
-#include "nsNetUtil.h"
 #include "nsScriptLoader.h"
 #include "nsFrameLoader.h"
 #include "xpcpublic.h"

dom/base/nsJSEnvironment.cpp

@@ -34,7 +34,6 @@
 #include "mozilla/EventDispatcher.h"
 #include "nsIContent.h"
 #include "nsCycleCollector.h"
-#include "nsNetUtil.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsIXULRuntime.h"
 #include "nsTextFormatter.h"

dom/base/nsStyleLinkElement.cpp

@@ -23,7 +23,6 @@
 #include "nsIDOMComment.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMStyleSheet.h"
-#include "nsNetUtil.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsXPCOMCIDInternal.h"

dom/cache/Cache.cpp

@@ -22,7 +22,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/unused.h"
 #include "nsIGlobalObject.h"
-#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace dom {

dom/cache/DBAction.cpp

@@ -16,7 +16,6 @@
 #include "mozStorageCID.h"
 #include "nsIFile.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "nsIFileURL.h"
 #include "nsThreadUtils.h"
 

dom/cache/DBSchema.cpp

@@ -19,6 +19,7 @@
 #include "nsCRT.h"
 #include "nsHttp.h"
 #include "nsICryptoHash.h"
+#include "nsNetCID.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/HeadersBinding.h"
 #include "mozilla/dom/RequestBinding.h"

dom/cache/FileUtils.cpp

@@ -11,8 +11,8 @@
 #include "mozilla/unused.h"
 #include "nsIFile.h"
 #include "nsIUUIDGenerator.h"
-#include "nsNetUtil.h"
 #include "nsNetCID.h"
+#include "nsISimpleEnumerator.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"

dom/camera/TestGonkCameraHardware.cpp

@@ -22,8 +22,8 @@
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/CameraFacesDetectedEvent.h"
 #include "mozilla/dom/CameraStateChangeEvent.h"
-#include "DOMCameraDetectedFace.h"
 #include "nsNetUtil.h"
+#include "DOMCameraDetectedFace.h"
 #include "nsServiceManagerUtils.h"
 #include "nsICameraTestHardware.h"
 

dom/filesystem/FileSystemTaskBase.cpp

@@ -6,7 +6,6 @@
 
 #include "mozilla/dom/FileSystemTaskBase.h"
 
-#include "nsNetUtil.h" // Stream transport service.
 #include "nsNetCID.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/File.h"

dom/html/HTMLImageElement.cpp

@@ -17,7 +17,6 @@
 #include "nsIURL.h"
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
-#include "nsNetUtil.h"
 #include "nsContentUtils.h"
 #include "nsContainerFrame.h"
 #include "nsNodeInfoManager.h"

dom/html/HTMLLinkElement.cpp

@@ -24,7 +24,6 @@
 #include "nsIStyleSheet.h"
 #include "nsIStyleSheetLinkingElement.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 #include "nsReadableUtils.h"
 #include "nsStyleConsts.h"

dom/html/HTMLStyleElement.cpp

@@ -9,7 +9,6 @@
 #include "nsStyleConsts.h"
 #include "nsIDOMStyleSheet.h"
 #include "nsIStyleSheet.h"
-#include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsUnicharUtils.h"
 #include "nsThreadUtils.h"

dom/html/HTMLVideoElement.cpp

@@ -13,7 +13,6 @@
 #include "nsError.h"
 #include "nsNodeInfoManager.h"
 #include "plbase64.h"
-#include "nsNetUtil.h"
 #include "nsXPCOMStrings.h"
 #include "prlock.h"
 #include "nsThreadUtils.h"

dom/html/nsGenericHTMLElement.cpp

@@ -37,7 +37,6 @@
 #include "nsPIDOMWindow.h"
 #include "nsIStyleRule.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsEscape.h"
 #include "nsIFrameInlines.h"
 #include "nsIScrollableFrame.h"

dom/html/nsHTMLContentSink.cpp

@@ -21,7 +21,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsScriptLoader.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "nsIContentViewer.h"
 #include "mozilla/dom/NodeInfo.h"
 #include "nsToken.h"

dom/media/systemservices/LoadManager.cpp

@@ -14,7 +14,6 @@
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsReadableUtils.h"
-#include "nsNetUtil.h"
 #include "nsIObserverService.h"
 
 // NSPR_LOG_MODULES=LoadManager:5

dom/network/TCPSocketParent.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsNetUtil.h"
 
 namespace IPC {
 

dom/security/nsCSPUtils.cpp

@@ -12,7 +12,6 @@
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsReadableUtils.h"
 
 static PRLogModuleInfo*

dom/security/nsMixedContentBlocker.cpp

@@ -14,7 +14,6 @@
 #include "nsISecurityEventSink.h"
 #include "nsIWebProgressListener.h"
 #include "nsContentUtils.h"
-#include "nsNetUtil.h"
 #include "nsIRequest.h"
 #include "nsIDocument.h"
 #include "nsIContentViewer.h"

dom/svg/nsSVGFilters.cpp

@@ -25,7 +25,6 @@
 #include "nsStyleContext.h"
 #include "nsIFrame.h"
 #include "imgIContainer.h"
-#include "nsNetUtil.h"
 #include "mozilla/dom/SVGFilterElement.h"
 #include "nsSVGString.h"
 #include "SVGContentUtils.h"

dom/telephony/Telephony.cpp

@@ -16,7 +16,6 @@
 #include "nsContentUtils.h"
 #include "nsIPermissionManager.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"

dom/workers/RuntimeService.cpp

@@ -48,7 +48,6 @@
 #include "nsIIPCBackgroundChildCreateCallback.h"
 #include "nsISupportsImpl.h"
 #include "nsLayoutStatics.h"
-#include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOM.h"

dom/xbl/nsBindingManager.cpp

@@ -13,7 +13,6 @@
 #include "nsIURL.h"
 #include "nsIChannel.h"
 #include "nsXPIDLString.h"
-#include "nsNetUtil.h"
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDOMElement.h"

dom/xbl/nsXBLBinding.cpp

@@ -14,7 +14,6 @@
 #include "nsIChannel.h"
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
-#include "nsNetUtil.h"
 #include "plstr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"

dom/xml/nsXMLFragmentContentSink.cpp

@@ -19,7 +19,6 @@
 #include "nsError.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
-#include "nsNetUtil.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"

dom/xslt/xslt/txMozillaTextOutput.cpp

@@ -10,7 +10,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsIDocumentTransformer.h"
-#include "nsNetUtil.h"
 #include "nsCharsetSource.h"
 #include "nsIPrincipal.h"
 #include "txURIUtils.h"

dom/xslt/xslt/txMozillaXMLOutput.cpp

@@ -16,7 +16,6 @@
 #include "nsPIDOMWindow.h"
 #include "nsIContent.h"
 #include "nsContentCID.h"
-#include "nsNetUtil.h"
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"
 #include "txLog.h"

dom/xslt/xslt/txMozillaXSLTProcessor.cpp

@@ -18,7 +18,6 @@
 #include "nsILoadGroup.h"
 #include "nsIStringBundle.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "XPathResult.h"
 #include "txExecutionState.h"
 #include "txMozillaTextOutput.h"

dom/xul/nsXULPrototypeCache.cpp

@@ -18,7 +18,6 @@
 #include "nsIStringStream.h"
 #include "nsIStorageStream.h"
 
-#include "nsNetUtil.h"
 #include "nsAppDirectoryServiceDefs.h"
 
 #include "js/TracingAPI.h"

dom/xul/templates/nsXULContentUtils.cpp

@@ -40,7 +40,6 @@
 #include "nsXULContentUtils.h"
 #include "nsLayoutCID.h"
 #include "nsNameSpaceManager.h"
-#include "nsNetUtil.h"
 #include "nsRDFCID.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"

extensions/pref/autoconfig/src/nsAutoConfig.cpp

@@ -18,6 +18,7 @@
 #include "nsContentUtils.h"
 #include "nsCRT.h"
 #include "nsNetCID.h"
+#include "nsNetUtil.h"
 #include "nspr.h"
 #include <algorithm>
 

extensions/pref/autoconfig/src/nsAutoConfig.h

@@ -10,11 +10,11 @@
 #include "nsITimer.h"
 #include "nsIFile.h"
 #include "nsIObserver.h"
-#include "nsNetUtil.h"
 #include "nsIStreamListener.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsWeakReference.h"
+#include "nsString.h"
 
 class nsAutoConfig : public nsIAutoConfig,
                      public nsITimerCallback,

gfx/thebes/gfxFT2FontList.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/Omnijar.h"
 #include "nsAutoPtr.h"
 #include "nsIInputStream.h"
-#include "nsNetUtil.h"
 #define gfxToolkitPlatform gfxAndroidPlatform
 
 #include "nsXULAppAPI.h"

image/decoders/icon/mac/nsIconChannelCocoa.mm

@@ -15,7 +15,7 @@
 #include "nsMemory.h"
 #include "nsIStringStream.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
+#include "nsNetCID.h"
 #include "nsIPipe.h"
 #include "nsIOutputStream.h"
 #include "nsIMIMEService.h"

image/decoders/icon/nsIconURI.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/ipc/URIUtils.h"
 
 #include "nsIconURI.h"
-#include "nsNetUtil.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
 #include "prprf.h"

image/decoders/icon/win/nsIconChannel.cpp

@@ -17,7 +17,6 @@
 #include "nsMemory.h"
 #include "nsIStringStream.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsIOutputStream.h"
 #include "nsIPipe.h"
 #include "nsNetCID.h"

image/imgRequestProxy.cpp

@@ -13,7 +13,6 @@
 #include "nsError.h"
 #include "nsCRTGlue.h"
 #include "imgINotificationObserver.h"
-#include "nsNetUtil.h"
 
 using namespace mozilla::image;
 

ipc/glue/BackgroundUtils.cpp

@@ -12,6 +12,7 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
+#include "mozilla/LoadInfo.h"
 #include "nsNullPrincipal.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"

ipc/glue/URIUtils.cpp

@@ -17,7 +17,6 @@
 #include "nsNullPrincipalURI.h"
 #include "nsJSProtocolHandler.h"
 #include "nsNetCID.h"
-#include "nsNetUtil.h"
 #include "nsSimpleNestedURI.h"
 #include "nsThreadUtils.h"
 

js/xpconnect/src/XPCJSRuntime.cpp

@@ -15,6 +15,7 @@
 #include "XPCJSMemoryReporter.h"
 #include "WrapperFactory.h"
 #include "mozJSComponentLoader.h"
+#include "nsNetUtil.h"
 
 #include "nsIMemoryInfoDumper.h"
 #include "nsIMemoryReporter.h"

js/xpconnect/src/xpcprivate.h

@@ -148,7 +148,6 @@
 #include "nsDeque.h"
 
 #include "nsIScriptSecurityManager.h"
-#include "nsNetUtil.h"
 
 #include "nsIPrincipal.h"
 #include "nsJSPrincipals.h"

layout/generic/nsTextRunTransformations.cpp

@@ -16,7 +16,6 @@
 #include "mozilla/gfx/2D.h"
 #include "nsTextFrameUtils.h"
 #include "nsIPersistentProperties2.h"
-#include "nsNetUtil.h"
 #include "GreekCasing.h"
 #include "IrishCasing.h"
 

layout/mathml/nsMathMLOperators.cpp

@@ -11,7 +11,6 @@
 
 #include "nsIPersistentProperties2.h"
 #include "nsISimpleEnumerator.h"
-#include "nsNetUtil.h"
 #include "nsContentUtils.h"
 #include "nsCRT.h"
 

layout/tools/layout-debug/src/nsRegressionTester.cpp

@@ -20,7 +20,6 @@
 #include "nsStyleStruct.h"
 #include "nsIFrameUtil.h"
 #include "nsLayoutCID.h"
-#include "nsNetUtil.h"
 #include "nsIFile.h"
 #include "nsViewManager.h"
 #include "nsView.h"

layout/xul/nsImageBoxFrame.cpp

@@ -41,7 +41,6 @@
 
 #include "nsIServiceManager.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
 #include "nsThreadUtils.h"
 #include "nsDisplayList.h"
 #include "ImageLayers.h"

layout/xul/tree/nsTreeBodyFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsWidgetsCID.h"
 #include "nsBoxFrame.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsBoxLayoutState.h"
 #include "nsTreeContentView.h"
 #include "nsTreeUtils.h"

modules/libjar/nsJARInputStream.cpp

@@ -9,7 +9,6 @@
 #include "zipstruct.h"         // defines ZIP compression codes
 #include "nsZipArchive.h"
 
-#include "nsNetUtil.h"
 #include "nsEscape.h"
 #include "nsIFile.h"
 #include "nsDebug.h"

netwerk/base/EventTokenBucket.cpp

@@ -7,7 +7,6 @@
 #include "EventTokenBucket.h"
 
 #include "nsICancelable.h"
-#include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsSocketTransportService2.h"
 

netwerk/base/LoadContextInfo.cpp

@@ -4,7 +4,6 @@
 
 #include "LoadContextInfo.h"
 
-#include "nsNetUtil.h"
 #include "nsIChannel.h"
 #include "nsILoadContext.h"
 

netwerk/base/PrivateBrowsingChannel.h

@@ -13,6 +13,7 @@
 #include "nsILoadContext.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {

netwerk/base/nsBaseChannel.cpp

@@ -6,7 +6,6 @@
 
 #include "nsBaseChannel.h"
 #include "nsURLHelper.h"
-#include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsMimeTypes.h"
 #include "nsIContentSniffer.h"

netwerk/base/nsBaseChannel.h

@@ -25,7 +25,6 @@
 #include "nsIThreadRetargetableStreamListener.h"
 #include "PrivateBrowsingChannel.h"
 #include "nsThreadUtils.h"
-#include "nsNetUtil.h"
 
 class nsIInputStream;
 

netwerk/base/nsChannelClassifier.cpp

@@ -8,7 +8,6 @@
 
 #include "mozIThirdPartyUtil.h"
 #include "nsContentUtils.h"
-#include "nsNetUtil.h"
 #include "nsICacheEntry.h"
 #include "nsICachingChannel.h"
 #include "nsIChannel.h"

netwerk/base/nsIOService.cpp

@@ -24,7 +24,6 @@
 #include "nsCRT.h"
 #include "nsSecCheckWrapChannel.h"
 #include "nsSimpleNestedURI.h"
-#include "nsNetUtil.h"
 #include "nsTArray.h"
 #include "nsIConsoleService.h"
 #include "nsIUploadChannel2.h"

netwerk/base/nsSimpleNestedURI.cpp

@@ -8,7 +8,6 @@
 #include "nsSimpleNestedURI.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
-#include "nsNetUtil.h"
 
 #include "mozilla/ipc/URIUtils.h"
 

netwerk/build/nsNetModule.cpp

@@ -37,7 +37,6 @@
 #include "nsCategoryCache.h"
 #include "nsIContentSniffer.h"
 #include "Predictor.h"
-#include "nsNetUtil.h"
 #include "nsIThreadPool.h"
 #include "mozilla/net/NeckoChild.h"
 

netwerk/cookie/CookieServiceChild.cpp

@@ -9,7 +9,6 @@
 #include "nsIURI.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
-#include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "SerializedLoadContext.h"
 

netwerk/cookie/CookieServiceParent.cpp

@@ -9,7 +9,6 @@
 
 #include "mozilla/ipc/URIUtils.h"
 #include "nsCookieService.h"
-#include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsPrintfCString.h"
 #include "SerializedLoadContext.h"

netwerk/dns/ChildDNSService.cpp

@@ -4,7 +4,6 @@
 
 #include "mozilla/net/ChildDNSService.h"
 #include "nsIDNSListener.h"
-#include "nsNetUtil.h"
 #include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "nsIXPConnect.h"

netwerk/ipc/NeckoChild.cpp

@@ -30,6 +30,7 @@
 #include "nsINetworkPredictor.h"
 #include "nsINetworkPredictorVerifier.h"
 #include "mozilla/ipc/URIUtils.h"
+#include "nsNetUtil.h"
 
 using mozilla::dom::TCPSocketChild;
 using mozilla::dom::TCPServerSocketChild;

netwerk/ipc/RemoteOpenFileChild.cpp

@@ -16,6 +16,7 @@
 #include "nsIRemoteOpenFileListener.h"
 #include "nsProxyRelease.h"
 #include "SerializedLoadContext.h"
+#include "nsNetUtil.h"
 
 // needed to alloc/free NSPR file descriptors
 #include "private/pprio.h"

netwerk/protocol/app/AppProtocolHandler.cpp

@@ -8,6 +8,7 @@
 #include "nsBaseChannel.h"
 #include "nsJARChannel.h"
 #include "nsNetCID.h"
+#include "nsNetUtil.h"
 #include "nsIStandardURL.h"
 #include "nsIAppsService.h"
 #include "nsILoadInfo.h"

netwerk/protocol/data/DataChannelParent.cpp

@@ -6,6 +6,7 @@
 
 #include "DataChannelParent.h"
 #include "mozilla/Assertions.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {

netwerk/protocol/http/PHttpChannelParams.h

@@ -16,7 +16,6 @@
 #include "nsHttpResponseHead.h"
 
 #include "nsIClassInfo.h"
-#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {

netwerk/protocol/http/nsHttpHandler.cpp

@@ -29,7 +29,6 @@
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
 #include "prprf.h"
-#include "nsNetUtil.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsSocketTransportService2.h"
 #include "nsAlgorithm.h"

netwerk/protocol/rtsp/controller/RtspController.cpp

@@ -30,7 +30,6 @@
 #include "nsStringStream.h"
 #include "nsAlgorithm.h"
 #include "nsProxyRelease.h"
-#include "nsNetUtil.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"

netwerk/protocol/rtsp/controller/RtspControllerChild.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/net/NeckoChild.h"
 #include "nsITabChild.h"
 #include "nsILoadContext.h"
-#include "nsNetUtil.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "nsStringStream.h"

netwerk/protocol/rtsp/controller/RtspControllerParent.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/unused.h"
-#include "nsNetUtil.h"
 #include "mozilla/Logging.h"
 
 #include <sys/types.h>

netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp

@@ -10,7 +10,6 @@
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "plstr.h"
-#include "nsNetUtil.h"
 #include "nsIObserverService.h"
 #include "mozIApplicationClearPrivateDataParams.h"
 

netwerk/streamconv/converters/nsMultiMixedConv.cpp

@@ -7,7 +7,6 @@
 #include "plstr.h"
 #include "nsIHttpChannel.h"
 #include "nsNetCID.h"
-#include "nsNetUtil.h"
 #include "nsMimeTypes.h"
 #include "nsIStringStream.h"
 #include "nsCRT.h"

netwerk/streamconv/test/TestStreamConv.cpp

@@ -18,6 +18,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIRequest.h"
 #include "nsNetCID.h"
+#include "nsNetUtil.h"
 
 #define ASYNC_TEST // undefine this if you want to test sycnronous conversion.
 

netwerk/test/TestServ.cpp

@@ -8,7 +8,10 @@
 #include "nsIServiceManager.h"
 #include "nsIServerSocket.h"
 #include "nsISocketTransport.h"
-#include "nsNetUtil.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsNetCID.h"
+#include "nsComponentManagerUtils.h"
 #include "nsStringAPI.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Logging.h"

netwerk/test/TestSocketTransport.cpp

@@ -21,7 +21,6 @@
 #include "nsIFileStreams.h"
 #include "nsIStreamListener.h"
 #include "nsIFile.h"
-#include "nsNetUtil.h"
 #include "nsAutoLock.h"
 #include "mozilla/Logging.h"
 

netwerk/test/TestUDPSocket.cpp

@@ -12,7 +12,6 @@
 #include "nsINetAddr.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsITimer.h"
-#include "nsNetUtil.h"
 #include "mozilla/net/DNS.h"
 #include "prerror.h"
 

parser/htmlparser/nsParser.cpp

@@ -28,7 +28,6 @@
 #include "nsIFragmentContentSink.h"
 #include "nsStreamUtils.h"
 #include "nsHTMLTokenizer.h"
-#include "nsNetUtil.h"
 #include "nsScriptLoader.h"
 #include "nsDataHashtable.h"
 #include "nsXPCOMCIDInternal.h"

parser/htmlparser/nsScanner.cpp

@@ -13,7 +13,6 @@
 #include "nsReadableUtils.h"
 #include "nsIInputStream.h"
 #include "nsIFile.h"
-#include "nsNetUtil.h"
 #include "nsUTF8Utils.h" // for LossyConvertEncoding
 #include "nsCRT.h"
 #include "nsParser.h"

rdf/base/nsRDFXMLDataSource.cpp

@@ -76,7 +76,6 @@
 #include "nsIStreamListener.h"
 #include "nsIURL.h"
 #include "nsIFileURL.h"
-#include "nsNetUtil.h"
 #include "nsISafeOutputStream.h"
 #include "nsIChannel.h"
 #include "nsRDFCID.h"

rdf/base/rdfutil.cpp

@@ -27,7 +27,6 @@
 #include "nsIURL.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsRDFCID.h"
 #include "nsString.h"
 #include "nsXPIDLString.h"

security/manager/ssl/SSLServerCertVerification.cpp

@@ -116,7 +116,6 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"
 #include "nsIThreadPool.h"
-#include "nsNetUtil.h"
 #include "nsISocketProvider.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsComponentManagerUtils.h"

security/manager/ssl/nsClientAuthRemember.cpp

@@ -9,7 +9,6 @@
 #include "nsIX509Cert.h"
 #include "mozilla/RefPtr.h"
 #include "nsCRT.h"
-#include "nsNetUtil.h"
 #include "nsNSSCertHelper.h"
 #include "nsIObserverService.h"
 #include "nsNetUtil.h"

security/manager/ssl/nsNSSIOLayer.cpp

@@ -21,8 +21,8 @@
 #include "nsIClientAuthDialogs.h"
 #include "nsIWebProgressListener.h"
 #include "nsClientAuthRemember.h"
+#include "nsServiceManagerUtils.h"
 
-#include "nsNetUtil.h"
 #include "nsISocketProvider.h"
 #include "nsPrintfCString.h"
 #include "SSLServerCertVerification.h"

security/manager/ssl/nsSecureBrowserUIImpl.cpp

@@ -30,7 +30,6 @@
 #include "nsISecurityInfoProvider.h"
 #include "imgIRequest.h"
 #include "nsThreadUtils.h"
-#include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsCRT.h"
 #include "nsIInterfaceRequestorUtils.h"

toolkit/components/places/Database.cpp

@@ -11,6 +11,7 @@
 #include "nsINavBookmarksService.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIFile.h"
+#include "nsIWritablePropertyBag2.h"
 
 #include "nsNavHistory.h"
 #include "nsPlacesTables.h"

toolkit/components/places/tests/cpp/places_test_harness.h

@@ -7,12 +7,12 @@
 #include "TestHarness.h"
 #include "nsMemory.h"
 #include "nsThreadUtils.h"
-#include "nsNetUtil.h"
 #include "nsDocShellCID.h"
 
 #include "nsToolkitCompsCID.h"
 #include "nsINavHistoryService.h"
 #include "nsIObserverService.h"
+#include "nsIURI.h"
 #include "mozilla/IHistory.h"
 #include "mozIStorageConnection.h"
 #include "mozIStorageStatement.h"