Bug 579517 follow-up: Remove NSPR types that crept in

content/base/src/nsFrameMessageManager.cpp

@@ -65,7 +65,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsFrameMessageManager)
   tmp->mListeners.Clear();
-  for (PRInt32 i = tmp->mChildManagers.Count(); i > 0; --i) {
+  for (int32_t i = tmp->mChildManagers.Count(); i > 0; --i) {
     static_cast<nsFrameMessageManager*>(tmp->mChildManagers[i - 1])->
       Disconnect(false);
   }
@@ -173,7 +173,7 @@ nsFrameMessageManager::LoadFrameScript(const nsAString& aURL,
     NS_ENSURE_TRUE(mLoadScriptCallback(mCallbackData, aURL), NS_ERROR_FAILURE);
   }
 
-  for (PRInt32 i = 0; i < mChildManagers.Count(); ++i) {
+  for (int32_t i = 0; i < mChildManagers.Count(); ++i) {
     nsRefPtr<nsFrameMessageManager> mm =
       static_cast<nsFrameMessageManager*>(mChildManagers[i]);
     if (mm) {
@@ -290,8 +290,8 @@ nsFrameMessageManager::DispatchAsyncMessageInternal(const nsAString& aMessage,
     mAsyncCallback(mCallbackData, aMessage, aData);
   }
   if (aBroadcast == BROADCAST) {
-    PRInt32 len = mChildManagers.Count();
-    for (PRInt32 i = 0; i < len; ++i) {
+    int32_t len = mChildManagers.Count();
+    for (int32_t i = 0; i < len; ++i) {
       static_cast<nsFrameMessageManager*>(mChildManagers[i])->
          DispatchAsyncMessageInternal(aMessage, aData, aBroadcast);
     }

content/base/src/nsFrameMessageManager.h

@@ -143,7 +143,7 @@ public:
   nsresult DispatchAsyncMessage(const nsAString& aMessageName,
                                 const jsval& aObject,
                                 JSContext* aCx,
-                                PRUint8 aArgc,
+                                uint8_t aArgc,
                                 ShouldBroadcast aBroadcast);
   nsresult DispatchAsyncMessageInternal(const nsAString& aMessage,
                                         const StructuredCloneData& aData,

layout/base/FrameLayerBuilder.cpp

@@ -1964,7 +1964,7 @@ FrameLayerBuilder::AddThebesDisplayItem(ThebesLayer* aLayer,
 void
 FrameLayerBuilder::AddLayerDisplayItemForFrame(Layer* aLayer,
                                                nsIFrame* aFrame,
-                                               PRUint32 aDisplayItemKey,
+                                               uint32_t aDisplayItemKey,
                                                LayerState aLayerState)
 {
   DisplayItemDataEntry* entry = mNewDisplayItemData.PutEntry(aFrame);
@@ -1983,12 +1983,12 @@ FrameLayerBuilder::AddLayerDisplayItem(Layer* aLayer,
     return;
 
   nsIFrame* f = aItem->GetUnderlyingFrame();
-  PRUint32 key = aItem->GetPerFrameKey();
+  uint32_t key = aItem->GetPerFrameKey();
   AddLayerDisplayItemForFrame(aLayer, f, key, aLayerState);
 
   nsAutoTArray<nsIFrame*,4> mergedFrames;
   aItem->GetMergedFrames(&mergedFrames);
-  for (PRUint32 i = 0; i < mergedFrames.Length(); ++i) {
+  for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
     AddLayerDisplayItemForFrame(aLayer, mergedFrames[i], key, aLayerState);
   }
 }

layout/base/FrameLayerBuilder.h

@@ -281,7 +281,7 @@ public:
    */
   void AddLayerDisplayItemForFrame(Layer* aLayer,
                                    nsIFrame* aFrame,
-                                   PRUint32 aDisplayItemKey,
+                                   uint32_t aDisplayItemKey,
                                    LayerState aLayerState);
 
   /**

security/manager/boot/src/nsStrictTransportSecurityService.cpp

@@ -382,7 +382,7 @@ nsStrictTransportSecurityService::IsStsURI(nsIURI* aURI, bool* aResult)
   rv = GetPrincipalForURI(aURI, getter_AddRefs(principal));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRUint32 permMgrPermission;
+  uint32_t permMgrPermission;
   rv = mPermMgr->TestExactPermissionFromPrincipal(principal, STS_PERMISSION,
                                                   &permMgrPermission);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -424,7 +424,7 @@ nsStrictTransportSecurityService::IsStsURI(nsIURI* aURI, bool* aResult)
   const char *subdomain;
 
   STSLOG(("no HSTS data for %s found, walking up domain", host.get()));
-  PRUint32 offset = 0;
+  uint32_t offset = 0;
   for (offset = host.FindChar('.', offset) + 1;
        offset > 0;
        offset = host.FindChar('.', offset) + 1) {
@@ -469,7 +469,7 @@ nsStrictTransportSecurityService::IsStsURI(nsIURI* aURI, bool* aResult)
     else if (permMgrPermission != STS_UNSET) {
       STSLOG(("Found permission manager entry for %s", subdomain));
       if (permMgrPermission == STS_SET) {
-        PRUint32 subdomainPermission;
+        uint32_t subdomainPermission;
         rv = mPermMgr->TestExactPermissionFromPrincipal(domainWalkPrincipal,
                                                         STS_SUBDOMAIN_PERMISSION,
                                                         &subdomainPermission);

security/manager/ssl/src/SSLServerCertVerification.cpp

@@ -186,7 +186,7 @@ void
 LogInvalidCertError(TransportSecurityInfo *socketInfo, 
                     const nsACString &host, 
                     const nsACString &hostWithPort,
-                    PRInt32 port,
+                    int32_t port,
                     PRErrorCode errorCode,
                     ::mozilla::psm::SSLErrorMessageType errorMessageType,
                     nsIX509Cert* ix509)