Bug 1883954: Update, improve and unify HTTPS Telemetry, r=freddyb,kershaw,necko-reviewers

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

docshell/base/nsDocShellLoadState.h

@@ -337,6 +337,15 @@ class nsDocShellLoadState final {
 
   bool GetWasSchemelessInput() { return mWasSchemelessInput; }
 
+  void SetHttpsUpgradeTelemetry(
+      nsILoadInfo::HTTPSUpgradeTelemetryType aHttpsUpgradeTelemetry) {
+    mHttpsUpgradeTelemetry = aHttpsUpgradeTelemetry;
+  }
+
+  nsILoadInfo::HTTPSUpgradeTelemetryType GetHttpsUpgradeTelemetry() {
+    return mHttpsUpgradeTelemetry;
+  }
+
   // Determine the remote type of the process which should be considered
   // responsible for this load for the purposes of security checks.
   //
@@ -612,6 +621,10 @@ class nsDocShellLoadState final {
 
   // if the to-be-loaded address had it protocol added through a fixup
   bool mWasSchemelessInput = false;
+
+  // Solely for the use of collecting Telemetry for HTTPS upgrades.
+  nsILoadInfo::HTTPSUpgradeTelemetryType mHttpsUpgradeTelemetry =
+      nsILoadInfo::NO_UPGRADE;
 };
 
 #endif /* nsDocShellLoadState_h__ */