Bug 845374 - Part s: Stop including nsTArray.h in nsContentUtils.h; r=khuey

content/base/public/nsContentUtils.h

@@ -29,7 +29,6 @@
 #include "nsContentListDeclarations.h"
 #include "nsMathUtils.h"
 #include "nsReadableUtils.h"
-#include "nsTArray.h"
 #include "nsWrapperCache.h"
 
 class imgICache;
@@ -107,6 +106,7 @@ struct nsIntMargin;
 struct nsNativeKeyEvent; // Don't include nsINativeKeyBindings.h here: it will force strange compilation error!
 
 template<class E> class nsCOMArray;
+template<class E> class nsTArray;
 template<class K, class V> class nsDataHashtable;
 template<class K, class V> class nsRefPtrHashtable;
 

dom/encoding/EncodingUtils.cpp

@@ -3,6 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/EncodingUtils.h"
+
+#include "mozilla/Util.h" // ArrayLength
 #include "nsUConvPropertySearch.h"
 
 namespace mozilla {

dom/plugins/base/nsPluginsDirWin.cpp

@@ -12,6 +12,7 @@
  */
 
 #include "mozilla/DebugOnly.h"
+#include "mozilla/Util.h" // ArrayLength
 
 #include "nsPluginsDir.h"
 #include "prlink.h"

gfx/layers/ImageContainer.h

@@ -12,6 +12,7 @@
 #include "LayersTypes.h" // for LayersBackend
 #include "mozilla/TimeStamp.h"
 #include "ImageTypes.h"
+#include "nsTArray.h"
 
 #ifdef XP_WIN
 struct ID3D10Texture2D;

image/encoders/bmp/nsBMPEncoder.cpp

@@ -8,6 +8,7 @@
 #include "prprf.h"
 #include "nsString.h"
 #include "nsStreamUtils.h"
+#include "nsTArray.h"
 #include "nsAutoPtr.h"
 
 using namespace mozilla;

image/encoders/ico/nsICOEncoder.cpp

@@ -10,6 +10,7 @@
 #include "prprf.h"
 #include "nsString.h"
 #include "nsStreamUtils.h"
+#include "nsTArray.h"
 
 using namespace mozilla;
 using namespace mozilla::image;

netwerk/base/src/DashboardTypes.h

@@ -5,6 +5,10 @@
 #ifndef mozilla_net_DashboardTypes_h_
 #define mozilla_net_DashboardTypes_h_
 
+#include "mozilla/StandardInteger.h"
+#include "nsStringGlue.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 namespace net {
 

toolkit/components/startup/nsUserInfoWin.cpp

@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsUserInfo.h"
+
+#include "mozilla/Util.h" // ArrayLength
 #include "nsString.h"
 #include "windows.h"
 #include "nsCRT.h"

toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h

@@ -13,6 +13,7 @@
 #include "nsIMutableArray.h"
 #include "nsIUrlClassifierPrefixSet.h"
 #include "nsIMemoryReporter.h"
+#include "nsTArray.h"
 #include "nsToolkitCompsCID.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/CondVar.h"

toolkit/identity/IdentityCryptoService.cpp

@@ -13,6 +13,7 @@
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
 #include "mozilla/Base64.h"
+#include "mozilla/Util.h" // ArrayLength
 #include "ScopedNSSTypes.h"
 
 #include "nss.h"

widget/android/AndroidJavaWrappers.h

@@ -13,6 +13,7 @@
 #include "nsPoint.h"
 #include "nsRect.h"
 #include "nsString.h"
+#include "nsTArray.h"
 #include "mozilla/gfx/Rect.h"
 
 //#define FORCE_ALOG 1

widget/xpwidgets/GfxDriverInfo.h

@@ -3,11 +3,12 @@
  * 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 "nsString.h"
-
 #ifndef __mozilla_widget_GfxDriverInfo_h__
 #define __mozilla_widget_GfxDriverInfo_h__
 
+#include "mozilla/Util.h" // ArrayLength
+#include "nsString.h"
+
 // Macros for adding a blocklist item to the static list.
 #define APPEND_TO_DRIVER_BLOCKLIST(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, suggestedVersion) \
     mDriverInfo->AppendElement(GfxDriverInfo(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, suggestedVersion))