Bug 1756588. Fix a couple of innerWindowId variables to be uint64_t in network code. r=necko-reviewers,valentin

Depends on D139371

Differential Revision: https://phabricator.services.mozilla.com/D139372

dom/security/nsHTTPSOnlyUtils.cpp

@@ -693,7 +693,7 @@ void nsHTTPSOnlyUtils::LogMessage(const nsAString& aMessage, uint32_t aFlags,
   // Allow for easy distinction in devtools code.
   nsCString category(aUseHttpsFirst ? "HTTPSFirst" : "HTTPSOnly");
 
-  uint32_t innerWindowId = aLoadInfo->GetInnerWindowID();
+  uint64_t innerWindowId = aLoadInfo->GetInnerWindowID();
   if (innerWindowId > 0) {
     // Send to content console
     nsContentUtils::ReportToConsoleByWindowID(message, aFlags, category,

netwerk/base/nsNetUtil.cpp

@@ -2897,7 +2897,7 @@ static bool ShouldSecureUpgradeNoHSTS(nsIURI* aURI, nsILoadInfo* aLoadInfo) {
     NS_ConvertUTF8toUTF16 reportSpec(aURI->GetSpecOrDefault());
     NS_ConvertUTF8toUTF16 reportScheme(scheme);
     AutoTArray<nsString, 2> params = {reportSpec, reportScheme};
-    uint32_t innerWindowId = aLoadInfo->GetInnerWindowID();
+    uint64_t innerWindowId = aLoadInfo->GetInnerWindowID();
     CSP_LogLocalizedStr("upgradeInsecureRequest", params,
                         u""_ns,  // aSourceFile
                         u""_ns,  // aScriptSample
@@ -2931,7 +2931,7 @@ static bool ShouldSecureUpgradeNoHSTS(nsIURI* aURI, nsILoadInfo* aLoadInfo) {
     message.AppendLiteral(u"Mixed Content: ");
     message.Append(localizedMsg);
 
-    uint32_t innerWindowId = aLoadInfo->GetInnerWindowID();
+    uint64_t innerWindowId = aLoadInfo->GetInnerWindowID();
     nsContentUtils::ReportToConsoleByWindowID(
         message, nsIScriptError::warningFlag, "Mixed Content Message"_ns,
         innerWindowId, aURI);