backout 5f9951a2e6df (bug 785918) for breaking on osx

security/manager/boot/src/nsStrictTransportSecurityService.cpp

@@ -352,7 +352,7 @@ nsStrictTransportSecurityService::GetPreloadListEntry(const char *aHost)
 {
   return (const nsSTSPreload *) bsearch(aHost,
                                         kSTSPreloadList,
-                                        mozilla::ArrayLength(kSTSPreloadList),
+                                        PR_ARRAY_SIZE(kSTSPreloadList),
                                         sizeof(nsSTSPreload),
                                         STSPreloadCompare);
 }

toolkit/identity/IdentityCryptoService.cpp

@@ -457,9 +457,9 @@ GenerateDSAKeyPair(PK11SlotInfo * slot,
 
   PQGParams pqgParams  = {
     NULL /*arena*/,
-    { siBuffer, P, mozilla::ArrayLength(P) },
-    { siBuffer, Q, mozilla::ArrayLength(Q) },
-    { siBuffer, G, mozilla::ArrayLength(G) }
+    { siBuffer, P, PR_ARRAY_SIZE(P) },
+    { siBuffer, Q, PR_ARRAY_SIZE(Q) },
+    { siBuffer, G, PR_ARRAY_SIZE(G) }
   };
 
   return GenerateKeyPair(slot, privateKey, publicKey, CKM_DSA_KEY_PAIR_GEN,