Bug 693469 - Implement mozilla::ArrayLength and mozilla::ArrayEnd, and replace uses of NS_ARRAY_LENGTH whenever possible. (Exceptions: assigning to static initializers, use in static assertions, as template parameters, etc. These will go away when the relevant compilers have C++11 constexpr support.) r=cjones

parser/html/nsHtml5Atoms.cpp

@@ -42,9 +42,13 @@
  * unloaded.
  */
 
+#include "mozilla/Util.h"
+
 #include "nsHtml5Atoms.h"
 #include "nsStaticAtom.h"
 
+using namespace mozilla;
+
 // define storage for all atoms
 #define HTML5_ATOM(_name, _value) nsIAtom* nsHtml5Atoms::_name;
 #include "nsHtml5AtomList.h"
@@ -62,5 +66,5 @@ static const nsStaticAtom Html5Atoms_info[] = {
 
 void nsHtml5Atoms::AddRefAtoms()
 {
-  NS_RegisterStaticAtoms(Html5Atoms_info, NS_ARRAY_LENGTH(Html5Atoms_info));
+  NS_RegisterStaticAtoms(Html5Atoms_info, ArrayLength(Html5Atoms_info));
 }