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

chrome/nsChromeRegistryChrome.cpp

@@ -496,7 +496,7 @@ nsChromeRegistryChrome::SendRegisteredChrome(
     if (!parents.Length())
       return;
 
-    for (PRUint32 i = 0; i < parents.Length(); i++) {
+    for (uint32_t i = 0; i < parents.Length(); i++) {
       DebugOnly<bool> success =
         parents[i]->SendRegisterChrome(packages, resources, overrides,
                                        mSelectedLocale, true);

content/base/src/nsCrossSiteListenerProxy.cpp

@@ -47,7 +47,7 @@ LogBlockedRequest(nsIRequest* aRequest)
   nsresult rv = NS_OK;
 
   // Get the innerWindowID associated with the XMLHTTPRequest
-  PRUint64 innerWindowID = 0;
+  uint64_t innerWindowID = 0;
 
   nsCOMPtr<nsILoadGroup> loadGroup;
   aRequest->GetLoadGroup(getter_AddRefs(loadGroup));

content/media/webrtc/MediaEngineDefault.cpp

@@ -192,7 +192,7 @@ MediaEngineDefaultVideoSource::Snapshot(uint32_t aDuration, nsIDOMFile** aFile)
   filePicker->AppendFilters(nsIFilePicker::filterImages);
 
   // XXX - This API should be made async
-  PRInt16 dialogReturn;
+  int16_t dialogReturn;
   rv = filePicker->Show(&dialogReturn);
   NS_ENSURE_SUCCESS(rv, rv);
   if (dialogReturn == nsIFilePicker::returnCancel) {

dom/media/MediaManager.cpp

@@ -130,8 +130,8 @@ HostHasPermission(nsIURI &docURI)
     return false;
   }
 
-  PRUint32 begin = 0;
-  PRUint32 end = 0;
+  uint32_t begin = 0;
+  uint32_t end = 0;
   nsCString domainName;
   /* 
      Test each domain name in the comma separated list
@@ -140,7 +140,7 @@ HostHasPermission(nsIURI &docURI)
   */
   do {
     end = domainWhiteList.FindChar(',', begin);
-    if (end == (PRUint32)-1) {
+    if (end == (uint32_t)-1) {
       // Last or only domain name in the comma separated list
       end = domainWhiteList.Length();
     }

dom/workers/RuntimeService.cpp

@@ -1096,7 +1096,7 @@ public:
     if (gTestPBackground) {
       // Randomize value to validate workers are not cross-posting messages.
       uint32_t testValue;
-      PRSize randomSize = PR_GetRandomNoise(&testValue, sizeof(testValue));
+      size_t randomSize = PR_GetRandomNoise(&testValue, sizeof(testValue));
       MOZ_RELEASE_ASSERT(randomSize == sizeof(testValue));
       nsCString testStr;
       testStr.AppendInt(testValue);

security/apps/AppTrustDomain.cpp

@@ -172,14 +172,14 @@ AppTrustDomain::GetCertTrust(EndEntityOrCA endEntityOrCA,
 
   CERTCertTrust trust;
   if (CERT_GetCertTrust(candidateCert.get(), &trust) == SECSuccess) {
-    PRUint32 flags = SEC_GET_TRUST_FLAGS(&trust, trustObjectSigning);
+    uint32_t flags = SEC_GET_TRUST_FLAGS(&trust, trustObjectSigning);
 
     // For DISTRUST, we use the CERTDB_TRUSTED or CERTDB_TRUSTED_CA bit,
     // because we can have active distrust for either type of cert. Note that
     // CERTDB_TERMINAL_RECORD means "stop trying to inherit trust" so if the
     // relevant trust bit isn't set then that means the cert must be considered
     // distrusted.
-    PRUint32 relevantTrustBit = endEntityOrCA == EndEntityOrCA::MustBeCA
+    uint32_t relevantTrustBit = endEntityOrCA == EndEntityOrCA::MustBeCA
                               ? CERTDB_TRUSTED_CA
                               : CERTDB_TRUSTED;
     if (((flags & (relevantTrustBit | CERTDB_TERMINAL_RECORD)))

security/certverifier/NSSCertDBTrustDomain.cpp

@@ -182,14 +182,14 @@ NSSCertDBTrustDomain::GetCertTrust(EndEntityOrCA endEntityOrCA,
   // "We have a trust record."
   CERTCertTrust trust;
   if (CERT_GetCertTrust(candidateCert.get(), &trust) == SECSuccess) {
-    PRUint32 flags = SEC_GET_TRUST_FLAGS(&trust, mCertDBTrustType);
+    uint32_t flags = SEC_GET_TRUST_FLAGS(&trust, mCertDBTrustType);
 
     // For DISTRUST, we use the CERTDB_TRUSTED or CERTDB_TRUSTED_CA bit,
     // because we can have active distrust for either type of cert. Note that
     // CERTDB_TERMINAL_RECORD means "stop trying to inherit trust" so if the
     // relevant trust bit isn't set then that means the cert must be considered
     // distrusted.
-    PRUint32 relevantTrustBit =
+    uint32_t relevantTrustBit =
       endEntityOrCA == EndEntityOrCA::MustBeCA ? CERTDB_TRUSTED_CA
                                                : CERTDB_TRUSTED;
     if (((flags & (relevantTrustBit|CERTDB_TERMINAL_RECORD)))