Bug 901323 - Don't include nsContentUtils.h unnecessarily; r=jlebar

accessible/src/generic/Accessible.cpp

@@ -26,7 +26,6 @@
 #include "TableCellAccessible.h"
 #include "TreeWalker.h"
 
-#include "nsContentUtils.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMNodeFilter.h"

caps/src/nsPrincipal.cpp

@@ -4,31 +4,24 @@
  * 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/. */
 
+#include "nsPrincipal.h"
+
 #include "mozIThirdPartyUtil.h"
 #include "nscore.h"
 #include "nsScriptSecurityManager.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "plstr.h"
 #include "pratom.h"
-#include "nsCRT.h"
 #include "nsIURI.h"
-#include "nsIFileURL.h"
-#include "nsIProtocolHandler.h"
-#include "nsNetUtil.h"
 #include "nsJSPrincipals.h"
-#include "nsVoidArray.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
 #include "nsIClassInfoImpl.h"
 #include "nsError.h"
 #include "nsIContentSecurityPolicy.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "jswrapper.h"
 
-#include "nsPrincipal.h"
-
 #include "mozilla/Preferences.h"
 #include "mozilla/HashFunctions.h"
 

caps/src/nsSecurityManagerFactory.cpp

@@ -26,7 +26,6 @@
 #include "nsIDocument.h"
 #include "jsfriendapi.h"
 #include "xpcprivate.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"

content/base/src/DirectionalityUtils.cpp

@@ -205,6 +205,7 @@
   */
 
 #include "mozilla/dom/DirectionalityUtils.h"
+
 #include "nsINode.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
@@ -214,7 +215,6 @@
 #include "nsUnicodeProperties.h"
 #include "nsTextFragment.h"
 #include "nsAttrValue.h"
-#include "nsContentUtils.h"
 #include "nsTextNode.h"
 #include "nsCheapSets.h"
 

content/base/src/DocumentFragment.cpp

@@ -15,7 +15,7 @@
 #include "nsError.h"
 #include "nsGkAtoms.h"
 #include "nsDOMString.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_INTERFACE_MAP_ENTRY_TEAROFF
 #include "mozilla/dom/DocumentFragmentBinding.h"
 
 namespace mozilla {

content/base/src/nsDOMCaretPosition.cpp

@@ -3,8 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMCaretPosition.h"
+
 #include "mozilla/dom/CaretPositionBinding.h"
-#include "nsContentUtils.h"
+#include "nsClientRect.h"
+#include "nsRange.h"
 
 nsDOMCaretPosition::nsDOMCaretPosition(nsINode* aNode, uint32_t aOffset)
   : mOffset(aOffset), mOffsetNode(aNode), mAnonymousContentNode(nullptr)

content/base/src/nsDOMCaretPosition.h

@@ -8,10 +8,9 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsINode.h"
-#include "nsRange.h"
 #include "nsWrapperCache.h"
-#include "nsRect.h"
-#include "nsClientRect.h"
+
+class nsClientRect;
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within

content/base/src/nsFormData.cpp

@@ -8,7 +8,6 @@
 #include "nsIDOMFile.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/dom/FormDataBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/base/src/nsSyncLoadService.cpp

@@ -18,7 +18,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIPrincipal.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for kLoadAsData
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsAutoPtr.h"

content/canvas/src/ImageData.cpp

@@ -6,8 +6,7 @@
 
 #include "mozilla/dom/ImageData.h"
 
-#include "nsDOMClassInfoID.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_HOLD_JS_OBJECTS, NS_DROP_JS_OBJECTS
 #include "mozilla/dom/ImageDataBinding.h"
 
 #include "jsapi.h"

content/canvas/src/WebGLBuffer.cpp

@@ -6,7 +6,6 @@
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLExtensionBase.cpp

@@ -5,7 +5,6 @@
 
 #include "WebGLContext.h"
 #include "WebGLExtensions.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLFramebuffer.cpp

@@ -9,7 +9,6 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 #include "WebGLTexture.h"
 #include "WebGLRenderbuffer.h"
 

content/canvas/src/WebGLProgram.cpp

@@ -7,7 +7,6 @@
 #include "WebGLShader.h"
 #include "WebGLProgram.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLRenderbuffer.cpp

@@ -7,7 +7,6 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLShader.cpp

@@ -8,7 +8,6 @@
 #include "WebGLContext.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLTexture.cpp

@@ -7,7 +7,6 @@
 #include "WebGLTexture.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include <algorithm>
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/canvas/src/WebGLVertexArray.cpp

@@ -7,7 +7,6 @@
 #include "WebGLBuffer.h"
 #include "WebGLVertexArray.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 

content/events/src/DOMWheelEvent.cpp

@@ -7,7 +7,6 @@
 #include "DOMWheelEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
-#include "nsContentUtils.h"
 #include "prtime.h"
 
 namespace mozilla {

content/events/src/nsDOMClipboardEvent.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMClipboardEvent.h"
-#include "nsContentUtils.h"
 #include "nsClientRect.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIClipboard.h"

content/events/src/nsDOMMessageEvent.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMMessageEvent.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_HOLD_JS_OBJECTS, NS_DROP_JS_OBJECTS
 #include "jsapi.h"
 
 using namespace mozilla;

content/events/src/nsEventListenerService.cpp

@@ -8,7 +8,6 @@
 #include "nsIVariant.h"
 #include "nsIServiceManager.h"
 #include "nsMemory.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsIXPConnect.h"
 #include "nsIDOMWindow.h"

content/events/src/nsPaintRequest.cpp

@@ -6,7 +6,6 @@
 #include "nsPaintRequest.h"
 
 #include "nsIFrame.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/PaintRequestBinding.h"
 #include "mozilla/dom/PaintRequestListBinding.h"
 

content/html/content/src/HTMLTimeElement.cpp

@@ -5,7 +5,6 @@
 
 #include "HTMLTimeElement.h"
 #include "mozilla/dom/HTMLTimeElementBinding.h"
-#include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
 #include "nsVariant.h"
 #include "nsGkAtoms.h"

content/html/content/src/TimeRanges.cpp

@@ -7,8 +7,6 @@
 #include "mozilla/dom/TimeRanges.h"
 #include "mozilla/dom/TimeRangesBinding.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 #include "nsError.h"
 
 namespace mozilla {

content/html/content/src/ValidityState.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/ValidityStateBinding.h"
 
 #include "nsCycleCollectionParticipant.h"
-#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {

content/html/content/src/nsClientRect.cpp

@@ -4,8 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsClientRect.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 
 #include "nsPresContext.h"
 #include "mozilla/dom/ClientRectListBinding.h"

content/media/VideoPlaybackQuality.cpp

@@ -8,7 +8,6 @@
 
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/VideoPlaybackQualityBinding.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "MediaDecoder.h"

content/media/mediasource/MediaSource.cpp

@@ -10,7 +10,6 @@
 #include "MediaSourceInputAdapter.h"
 #include "SourceBuffer.h"
 #include "SourceBufferList.h"
-#include "nsContentUtils.h"
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* gMediaSourceLog;

content/media/mediasource/SourceBuffer.cpp

@@ -5,8 +5,6 @@
 
 #include "SourceBuffer.h"
 
-#include "nsContentUtils.h"
-
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaSourceLog;
 #define LOG(type, msg) PR_LOG(gMediaSourceLog, type, msg)

content/media/mediasource/SourceBufferList.cpp

@@ -7,7 +7,6 @@
 #include "SourceBufferList.h"
 
 #include "mozilla/dom/SourceBufferListBinding.h"
-#include "nsContentUtils.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gMediaSourceLog;

content/media/webaudio/AudioContext.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "nsPIDOMWindow.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AnalyserNode.h"

content/media/webaudio/AudioListener.cpp

@@ -6,7 +6,6 @@
 
 #include "AudioListener.h"
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioListenerBinding.h"
 

content/media/webaudio/AudioNode.cpp

@@ -6,7 +6,6 @@
 
 #include "AudioNode.h"
 #include "AudioContext.h"
-#include "nsContentUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "AudioNodeStream.h"
 

content/media/webaudio/AudioParam.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioParam.h"
-#include "nsContentUtils.h"
 #include "nsIDOMWindow.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AudioParamBinding.h"

content/media/webspeech/recognition/SpeechGrammar.cpp

@@ -6,8 +6,6 @@
 
 #include "SpeechGrammar.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/SpeechGrammarBinding.h"
 

content/media/webspeech/recognition/SpeechGrammarList.cpp

@@ -6,8 +6,6 @@
 
 #include "SpeechGrammarList.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechGrammarListBinding.h"
 
 namespace mozilla {

content/media/webspeech/recognition/SpeechRecognition.cpp

@@ -7,7 +7,6 @@
 #include "SpeechRecognition.h"
 
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 
 #include "mozilla/dom/SpeechRecognitionBinding.h"

content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp

@@ -6,8 +6,6 @@
 
 #include "SpeechRecognitionAlternative.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechRecognitionAlternativeBinding.h"
 
 #include "SpeechRecognition.h"

content/media/webspeech/recognition/SpeechRecognitionResult.cpp

@@ -4,8 +4,6 @@
  * 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/. */
 
-#include "nsContentUtils.h"
-
 #include "SpeechRecognitionResult.h"
 #include "mozilla/dom/SpeechRecognitionResultBinding.h"
 

content/media/webspeech/recognition/SpeechRecognitionResultList.cpp

@@ -6,8 +6,6 @@
 
 #include "SpeechRecognitionResultList.h"
 
-#include "nsContentUtils.h"
-
 #include "mozilla/dom/SpeechRecognitionResultListBinding.h"
 
 #include "SpeechRecognition.h"

content/media/webspeech/synth/SpeechSynthesisUtterance.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
 

content/svg/content/nsISVGPoint.cpp

@@ -9,7 +9,6 @@
 #include "SVGAnimatedPointList.h"
 #include "nsSVGElement.h"
 #include "nsError.h"
-#include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "mozilla/dom/SVGMatrix.h"
 #include "mozilla/dom/SVGPointBinding.h"
 

content/svg/content/src/DOMSVGAnimatedLengthList.cpp

@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedLengthListBinding.h"
-#include "nsContentUtils.h"
 
 // See the architecture comment in this file's header.
 

content/svg/content/src/DOMSVGAnimatedNumberList.cpp

@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedNumberListBinding.h"
-#include "nsContentUtils.h"
 
 // See the architecture comment in this file's header.
 

content/svg/content/src/DOMSVGLengthList.cpp

@@ -9,7 +9,6 @@
 #include "nsError.h"
 #include "SVGAnimatedLengthList.h"
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGLengthListBinding.h"
 #include <algorithm>
 

content/svg/content/src/DOMSVGNumber.cpp

@@ -10,7 +10,7 @@
 #include "nsSVGElement.h"
 #include "nsIDOMSVGNumber.h"
 #include "nsError.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_ENSURE_FINITE
 
 // See the architecture comment in DOMSVGAnimatedNumberList.h.
 

content/svg/content/src/DOMSVGNumberList.cpp

@@ -9,7 +9,6 @@
 #include "nsError.h"
 #include "SVGAnimatedNumberList.h"
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGNumberListBinding.h"
 #include <algorithm>
 

content/svg/content/src/DOMSVGPathSeg.cpp

@@ -10,7 +10,6 @@
 #include "SVGAnimatedPathSegList.h"
 #include "nsSVGElement.h"
 #include "nsError.h"
-#include "nsContentUtils.h"
 
 // See the architecture comment in DOMSVGPathSegList.h.
 

content/svg/content/src/DOMSVGPathSegList.cpp

@@ -12,7 +12,6 @@
 #include "nsSVGAttrTearoffTable.h"
 #include "SVGPathSegUtils.h"
 #include "mozilla/dom/SVGPathSegListBinding.h"
-#include "nsContentUtils.h"
 
 // See the comment in this file's header.
 

content/svg/content/src/DOMSVGPoint.cpp

@@ -8,7 +8,6 @@
 #include "SVGPoint.h"
 #include "nsSVGElement.h"
 #include "nsError.h"
-#include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "mozilla/dom/SVGMatrix.h"
 
 // See the architecture comment in DOMSVGPointList.h.

content/svg/content/src/DOMSVGTransformList.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/dom/SVGMatrix.h"
 #include "nsSVGAnimatedTransformList.h"
 #include "nsSVGElement.h"
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGTransformListBinding.h"
 #include "nsError.h"
 #include <algorithm>

content/svg/content/src/SVGAngle.cpp

@@ -6,7 +6,6 @@
 #include "SVGAngle.h"
 #include "nsSVGAngle.h"
 #include "mozilla/dom/SVGAngleBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/SVGAnimatedAngle.cpp

@@ -6,7 +6,6 @@
 #include "SVGAnimatedAngle.h"
 #include "nsSVGAngle.h"
 #include "mozilla/dom/SVGAnimatedAngleBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/SVGAnimatedBoolean.cpp

@@ -5,7 +5,6 @@
 
 #include "SVGAnimatedBoolean.h"
 #include "mozilla/dom/SVGAnimatedBooleanBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/SVGAnimatedLength.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/SVGAnimatedLength.h"
 #include "mozilla/dom/SVGAnimatedLengthBinding.h"
-#include "nsContentUtils.h"
 #include "nsSVGLength2.h"
 
 namespace mozilla {

content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp

@@ -12,7 +12,6 @@
 #include "SMILEnumType.h"
 #include "nsAttrValueInlines.h"
 #include "mozilla/dom/SVGAnimatedPreserveAspectRatioBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/SVGAnimatedTransformList.cpp

@@ -8,7 +8,6 @@
 #include "nsSVGAnimatedTransformList.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "mozilla/dom/SVGAnimatedTransformListBinding.h"
-#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {

content/svg/content/src/SVGFragmentIdentifier.cpp

@@ -4,8 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SVGFragmentIdentifier.h"
+
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGViewElement.h"
+#include "nsContentUtils.h" // for nsCharSeparatedTokenizerTemplate
 #include "nsSVGAnimatedTransformList.h"
 
 using namespace mozilla;

content/svg/content/src/SVGIRect.h

@@ -6,7 +6,6 @@
 #ifndef mozilla_dom_SVGIRect_h
 #define mozilla_dom_SVGIRect_h
 
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/dom/SVGRectBinding.h"
 #include "mozilla/Attributes.h"

content/svg/content/src/SVGMatrix.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/SVGMatrix.h"
 #include "nsError.h"
 #include <math.h>
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGMatrixBinding.h"
 
 const double radPerDegree = 2.0 * M_PI / 360.0;

content/svg/content/src/SVGMotionSMILPathUtils.cpp

@@ -5,7 +5,7 @@
 
 #include "SVGMotionSMILPathUtils.h"
 #include "nsCharSeparatedTokenizer.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_ENSURE_FINITE2
 #include "SVGContentUtils.h"
 #include "SVGLength.h"
 

content/svg/content/src/SVGPathElement.cpp

@@ -13,7 +13,6 @@
 #include "gfxPath.h"
 #include "mozilla/dom/SVGPathElementBinding.h"
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 
 class gfxContext;

content/svg/content/src/SVGPathSegUtils.cpp

@@ -5,7 +5,6 @@
 
 #include "SVGPathSegUtils.h"
 #include "nsSVGPathDataParser.h"
-#include "nsContentUtils.h"
 #include "nsTextFormatter.h"
 
 using namespace mozilla;

content/svg/content/src/SVGPreserveAspectRatio.cpp

@@ -6,7 +6,6 @@
 #include "SVGPreserveAspectRatio.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "mozilla/dom/SVGPreserveAspectRatioBinding.h"
-#include "nsContentUtils.h"
 
 using namespace mozilla;
 using namespace dom;

content/svg/content/src/SVGRect.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/SVGRect.h"
-#include "nsContentUtils.h"
 #include "nsSVGElement.h"
 
 namespace mozilla {

content/svg/content/src/SVGTransform.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/SVGTransform.h"
 #include "mozilla/dom/SVGMatrix.h"
 #include "nsError.h"
-#include "nsContentUtils.h"
 #include "nsAttrValueInlines.h"
 #include "nsSVGAnimatedTransformList.h"
 #include "nsSVGAttrTearoffTable.h"

content/svg/content/src/nsISVGPoint.cpp

@@ -8,7 +8,6 @@
 #include "SVGPoint.h"
 #include "nsSVGElement.h"
 #include "nsError.h"
-#include "nsContentUtils.h" // NS_ENSURE_FINITE
 #include "mozilla/dom/SVGPointBinding.h"
 
 // See the architecture comment in DOMSVGPointList.h.

content/svg/content/src/nsSVGFilters.cpp

@@ -32,7 +32,6 @@
 #include "gfxUtils.h"
 #include "SVGContentUtils.h"
 #include <algorithm>
-#include "nsContentUtils.h"
 #include "mozilla/dom/SVGAnimatedLength.h"
 #include "mozilla/dom/SVGComponentTransferFunctionElement.h"
 #include "mozilla/dom/SVGFEDistantLightElement.h"

content/svg/content/src/nsSVGTransform.cpp

@@ -6,7 +6,7 @@
 
 #include "nsError.h"
 #include "nsSVGTransform.h"
-#include "nsContentUtils.h"
+#include "nsContentUtils.h" // for NS_ENSURE_FINITE
 #include "nsTextFormatter.h"
 
 namespace {

content/xbl/src/nsXBLProtoImplProperty.cpp

@@ -9,7 +9,6 @@
 #include "nsIContent.h"
 #include "nsXBLProtoImplProperty.h"
 #include "nsUnicharUtils.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsReadableUtils.h"
 #include "nsJSUtils.h"

content/xul/document/src/nsXULControllers.cpp

@@ -15,7 +15,6 @@
 #include "nsIControllers.h"
 #include "nsIDOMElement.h"
 #include "nsXULControllers.h"
-#include "nsContentUtils.h"
 #include "nsDOMClassInfoID.h"
 
 //----------------------------------------------------------------------

docshell/base/LoadContext.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/LoadContext.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsServiceManagerUtils.h"
-#include "nsContentUtils.h"
 #include "mozIApplication.h"
 
 namespace mozilla {

dom/base/DOMError.cpp

@@ -6,7 +6,6 @@
 
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/DOMErrorBinding.h"
-#include "nsContentUtils.h"
 #include "nsDOMException.h"
 #include "nsPIDOMWindow.h"
 

dom/base/URL.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/dom/MediaSource.h"
 #include "nsIDocument.h"
 #include "nsIPrincipal.h"
-#include "nsContentUtils.h"
 #include "nsHostObjectProtocolHandler.h"
 
 namespace mozilla {

dom/base/nsJSUtils.cpp

@@ -14,7 +14,6 @@
 #include "nsJSUtils.h"
 #include "jsapi.h"
 #include "jsdbgapi.h"
-#include "prprf.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIServiceManager.h"
@@ -23,12 +22,8 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsPIDOMWindow.h"
 #include "GeckoProfiler.h"
-
 #include "nsDOMJSUtils.h" // for GetScriptContextFromJSContext
-
-#include "nsContentUtils.h"
 #include "nsJSPrincipals.h"
-
 #include "mozilla/dom/BindingUtils.h"
 
 bool

dom/base/nsMimeTypeArray.cpp

@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMimeTypeArray.h"
+
 #include "mozilla/dom/MimeTypeArrayBinding.h"
 #include "mozilla/dom/MimeTypeBinding.h"
 #include "nsIDOMNavigator.h"
-#include "nsContentUtils.h"
 #include "nsPluginArray.h"
 #include "nsIMIMEService.h"
 #include "nsIMIMEInfo.h"

dom/base/nsPluginArray.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsPluginArray.h"
-#include "nsContentUtils.h"
+
 #include "mozilla/dom/PluginArrayBinding.h"
 #include "mozilla/dom/PluginBinding.h"
 #include "nsMimeTypeArray.h"

dom/bindings/BindingUtils.cpp

@@ -4,21 +4,19 @@
  * 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/. */
 
+#include "BindingUtils.h"
+
 #include <algorithm>
 #include <stdarg.h>
 
 #include "JavaScriptParent.h"
 
-#include "prprf.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Assertions.h"
 
-#include "BindingUtils.h"
-
 #include "AccessCheck.h"
 #include "jsfriendapi.h"
-#include "nsContentUtils.h"
 #include "nsIDOMGlobalPropertyInitializer.h"
 #include "nsIXPConnect.h"
 #include "WrapperFactory.h"

dom/camera/DOMCameraManager.cpp

@@ -2,7 +2,6 @@
  * 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/. */
 
-#include "nsContentUtils.h"
 #include "nsDebug.h"
 #include "nsPIDOMWindow.h"
 #include "mozilla/Services.h"

dom/file/ArchiveEvent.cpp

@@ -6,7 +6,6 @@
 
 #include "ArchiveEvent.h"
 
-#include "nsContentUtils.h"
 #include "nsCExternalHandlerService.h"
 #include "nsProxyRelease.h"
 

dom/file/ArchiveReader.cpp

@@ -9,7 +9,6 @@
 #include "ArchiveEvent.h"
 #include "ArchiveZipEvent.h"
 
-#include "nsContentUtils.h"
 #include "nsLayoutStatics.h"
 
 #include "nsIURI.h"

dom/file/FileRequest.cpp

@@ -7,7 +7,6 @@
 #include "FileRequest.h"
 
 #include "DOMFileRequest.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsEventDispatcher.h"
 #include "nsError.h"

dom/gamepad/Gamepad.cpp

@@ -5,7 +5,6 @@
 #include "Gamepad.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
-#include "nsContentUtils.h"
 #include "nsVariant.h"
 #include "mozilla/dom/GamepadBinding.h"
 

dom/icc/src/StkCommandEvent.cpp

@@ -2,7 +2,6 @@
  * 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/. */
 
-#include "nsContentUtils.h"
 #include "SimToolKit.h"
 #include "StkCommandEvent.h"
 

dom/indexedDB/IDBCursor.cpp

@@ -10,8 +10,6 @@
 
 #include "mozilla/storage.h"
 #include "nsComponentManagerUtils.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 #include "nsEventDispatcher.h"
 #include "nsJSUtils.h"
 #include "nsThreadUtils.h"

dom/indexedDB/IDBDatabase.cpp

@@ -14,8 +14,6 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/quota/Client.h"
 #include "mozilla/dom/quota/QuotaManager.h"
-#include "nsContentUtils.h"
-#include "nsDOMClassInfo.h"
 #include "nsDOMLists.h"
 #include "nsJSUtils.h"
 #include "nsProxyRelease.h"

dom/indexedDB/IDBIndex.cpp

@@ -14,7 +14,6 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ipc/Blob.h"
 #include "mozilla/storage.h"
-#include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
 #include "nsThreadUtils.h"
 #include "xpcpublic.h"

dom/indexedDB/IDBTransaction.cpp

@@ -13,7 +13,6 @@
 
 #include "mozilla/dom/quota/QuotaManager.h"
 #include "mozilla/storage.h"
-#include "nsContentUtils.h"
 #include "nsDOMClassInfoID.h"
 #include "nsDOMLists.h"
 #include "nsEventDispatcher.h"

dom/indexedDB/ipc/IndexedDBParent.cpp

@@ -18,7 +18,6 @@
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/unused.h"
 #include "mozilla/Util.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 
 #include "AsyncConnectionHelper.h"

dom/mobilemessage/src/MobileMessageThread.cpp

@@ -8,7 +8,6 @@
 #include "jsapi.h"           // For OBJECT_TO_JSVAL and JS_NewDateObjectMsec
 #include "jsfriendapi.h"     // For js_DateGetMsecSinceEpoch
 #include "nsJSUtils.h"       // For nsDependentJSString
-#include "nsContentUtils.h"  // For nsTArrayHelpers.h
 #include "nsTArrayHelpers.h" // For nsTArrayToJSArray
 #include "Constants.h"       // For MessageType
 

dom/mobilemessage/src/ipc/SmsIPCService.cpp

@@ -13,7 +13,6 @@
 #include "SmsSegmentInfo.h"
 #include "DictionaryHelpers.h"
 #include "nsJSUtils.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "mozilla/dom/MobileMessageManagerBinding.h"
 #include "mozilla/dom/MozMmsMessageBinding.h"

dom/network/src/MobileConnection.cpp

@@ -13,7 +13,6 @@
 #include "mozilla/Preferences.h"
 #include "nsIPermissionManager.h"
 
-#include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "nsJSON.h"
 #include "jsapi.h"

dom/network/src/TCPServerSocketChild.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/dom/TabChild.h"
 #include "nsIDOMTCPSocket.h"
 #include "nsJSUtils.h"
-#include "nsContentUtils.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 

dom/network/src/TCPSocketParent.cpp

@@ -7,7 +7,6 @@
 #include "jsfriendapi.h"
 #include "nsJSUtils.h"
 #include "nsIDOMTCPSocket.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "mozilla/unused.h"
 #include "mozilla/AppProcessChecker.h"

dom/plugins/base/nsJSNPRuntime.cpp

@@ -16,7 +16,6 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"
 #include "nsDOMJSUtils.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsIDocument.h"
 #include "nsIJSRuntimeService.h"

dom/plugins/ipc/PluginIdentifierParent.cpp

@@ -6,7 +6,6 @@
 
 #include "PluginIdentifierParent.h"
 
-#include "nsContentUtils.h"
 #include "nsNPAPIPlugin.h"
 #include "nsServiceManagerUtils.h"
 #include "PluginScriptableObjectUtils.h"

dom/src/geolocation/nsGeoPosition.cpp

@@ -4,9 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsGeoPosition.h"
-#include "nsDOMClassInfoID.h"
-#include "nsIClassInfo.h"
-#include "nsContentUtils.h"
 
 #include "mozilla/dom/PositionBinding.h"
 #include "mozilla/dom/CoordinatesBinding.h"

dom/system/gonk/AutoMounterSetting.cpp

@@ -11,7 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsIObserverService.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsISettingsService.h"
 #include "nsJSUtils.h"

dom/system/gonk/SystemWorkerManager.cpp

@@ -32,7 +32,6 @@
 #endif
 #include "mozilla/ipc/Ril.h"
 #include "nsIObserverService.h"
-#include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"