Bug 1910696: Fix intermittent and use object properties for variable passing, r=simonf

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

dom/security/test/https-first/browser_https_telemetry.js

@@ -51,77 +51,79 @@ async function setPrefsAndResetFog(
   });
 }
 
-function verifyGleanValues(
-  aDescription,
-  aNotInitialized,
-  aNoUpgrade,
-  aAlreadyHTTPS,
-  aHSTS,
-  aHttpsOnlyUpgrade,
-  aHttpsOnlyUpgradeDowngrade,
-  aHttpsFirstUpgrade,
-  aHttpsFirstUpgradeDowngrade,
-  aHttpsFirstSchemelessUpgrade,
-  aHttpsFirstSchemelessUpgradeDowngrade,
-  aCSPUpgradeInsecureRequests,
-  aHttpsRR,
-  aWebExtensionUpgrade,
-  aUpgradeException
-) {
+function verifyGleanValues(aDescription, aExpected) {
   info(aDescription);
+
+  let notInitialized = aExpected.notInitialized || null;
+  let noUpgrade = aExpected.noUpgrade || null;
+  let alreadyHTTPS = aExpected.alreadyHTTPS || null;
+  let hsts = aExpected.hsts || null;
+  let httpsOnlyUpgrade = aExpected.httpsOnlyUpgrade || null;
+  let httpsOnlyUpgradeDowngrade = aExpected.httpsOnlyUpgradeDowngrade || null;
+  let httpsFirstUpgrade = aExpected.httpsFirstUpgrade || null;
+  let httpsFirstUpgradeDowngrade = aExpected.httpsFirstUpgradeDowngrade || null;
+  let httpsFirstSchemelessUpgrade =
+    aExpected.httpsFirstSchemelessUpgrade || null;
+  let httpsFirstSchemelessUpgradeDowngrade =
+    aExpected.httpsFirstSchemelessUpgradeDowngrade || null;
+  let cspUpgradeInsecureRequests = aExpected.cspUpgradeInsecureRequests || null;
+  let httpsRR = aExpected.httpsRR || null;
+  let webExtensionUpgrade = aExpected.webExtensionUpgrade || null;
+  let upgradeException = aExpected.upgradeException || null;
+
   let glean = Glean.networking.httpToHttpsUpgradeReason;
   is(
     glean.not_initialized.testGetValue(),
-    aNotInitialized,
+    notInitialized,
     "verify not_initialized"
   );
-  is(glean.no_upgrade.testGetValue(), aNoUpgrade, "verify no_upgrade");
-  is(glean.already_https.testGetValue(), aAlreadyHTTPS, "verify already_https");
-  is(glean.hsts.testGetValue(), aHSTS, "verify hsts");
+  is(glean.no_upgrade.testGetValue(), noUpgrade, "verify no_upgrade");
+  is(glean.already_https.testGetValue(), alreadyHTTPS, "verify already_https");
+  is(glean.hsts.testGetValue(), hsts, "verify hsts");
   is(
     glean.https_only_upgrade.testGetValue(),
-    aHttpsOnlyUpgrade,
+    httpsOnlyUpgrade,
     "verify https_only_upgrade"
   );
   is(
     glean.https_only_upgrade_downgrade.testGetValue(),
-    aHttpsOnlyUpgradeDowngrade,
+    httpsOnlyUpgradeDowngrade,
     "verify https_only_upgrade_downgrade"
   );
   is(
     glean.https_first_upgrade.testGetValue(),
-    aHttpsFirstUpgrade,
+    httpsFirstUpgrade,
     "verify https_first_upgrade"
   );
   is(
     glean.https_first_upgrade_downgrade.testGetValue(),
-    aHttpsFirstUpgradeDowngrade,
+    httpsFirstUpgradeDowngrade,
     "verify https_first_upgrade_downgrade"
   );
   is(
     glean.https_first_schemeless_upgrade.testGetValue(),
-    aHttpsFirstSchemelessUpgrade,
+    httpsFirstSchemelessUpgrade,
     "verify https_first_schemeless_upgrade"
   );
   is(
     glean.https_first_schemeless_upgrade_downgrade.testGetValue(),
-    aHttpsFirstSchemelessUpgradeDowngrade,
+    httpsFirstSchemelessUpgradeDowngrade,
     "verify https_first_schemeless_upgrade_downgrade"
   );
   is(
     glean.csp_uir.testGetValue(),
-    aCSPUpgradeInsecureRequests,
+    cspUpgradeInsecureRequests,
     "verify csp_uir"
   );
-  is(glean.https_rr.testGetValue(), aHttpsRR, "verify https_rr");
+  is(glean.https_rr.testGetValue(), httpsRR, "verify https_rr");
   is(
     glean.web_extension_upgrade.testGetValue(),
-    aWebExtensionUpgrade,
+    webExtensionUpgrade,
     "verify web_extension_upgrade"
   );
   is(
     glean.upgrade_exception.testGetValue(),
-    aUpgradeException,
+    upgradeException,
     "verify upgrade_exception"
   );
 }
@@ -187,23 +189,7 @@ add_task(async function () {
     "(0) exempt loopback addresses",
     "https://"
   );
-  verifyGleanValues(
-    "(0) exempt loopback addresses",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(0) exempt loopback addresses", {});
 });
 
 add_task(async function () {
@@ -220,23 +206,7 @@ add_task(async function () {
     "(1) no upgrade test",
     "http://"
   );
-  verifyGleanValues(
-    "(1) no upgrade test",
-    null /* aNotInitialized */,
-    1 /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(1) no upgrade test", { noUpgrade: 1 });
 });
 
 add_task(async function () {
@@ -254,23 +224,7 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(2) already https test",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    1 /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(2) already https test", { alreadyHTTPS: 1 });
 });
 
 add_task(async function () {
@@ -288,23 +242,9 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(2b) already https test all prefs true",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    1 /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(2b) already https test all prefs true", {
+    alreadyHTTPS: 1,
+  });
 });
 
 add_task(async function () {
@@ -328,23 +268,7 @@ add_task(async function () {
 
   await runUpgradeTest("http://example.com?test3", "(3) hsts", "https://");
 
-  verifyGleanValues(
-    "(3) hsts",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    1 /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aHttpsRR */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(3) hsts", { hsts: 1 });
 
   // finally we need to reset hsts
   await BrowserTestUtils.withNewTab("about:blank", async function (browser) {
@@ -377,23 +301,7 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(3b) hsts with all prefs true",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    1 /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(3b) hsts with all prefs true", { hsts: 1 });
 
   // finally we need to reset the hsts host
   await BrowserTestUtils.withNewTab("about:blank", async function (browser) {
@@ -418,23 +326,7 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(4) https-only upgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    1 /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(4) https-only upgrade", { httpsOnlyUpgrade: 1 });
 
   info("(4b) https-only upgrade downgrade");
 
@@ -514,23 +406,10 @@ add_task(async function () {
     await SpecialPowers.removePermission("https-only-load-insecure", uri);
   });
 
-  verifyGleanValues(
-    "(4b) https-only upgrade downgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    1 /* aHttpsOnlyUpgrade */,
-    1 /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(4b) https-only upgrade downgrade", {
+    httpsOnlyUpgrade: 1,
+    httpsOnlyUpgradeDowngrade: 1,
+  });
 });
 
 add_task(async function () {
@@ -548,23 +427,7 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(5) https-first upgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    1 /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(5) https-first upgrade", { httpsFirstUpgrade: 1 });
 
   info("(5b) https-first upgrade downgrade");
 
@@ -580,23 +443,10 @@ add_task(async function () {
     "http://"
   );
 
-  verifyGleanValues(
-    "(5) https-first upgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    1 /* aHttpsFirstUpgrade */,
-    1 /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(5) https-first upgrade", {
+    httpsFirstUpgrade: 1,
+    httpsFirstUpgradeDowngrade: 1,
+  });
 });
 
 add_task(async function () {
@@ -614,23 +464,9 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(6) schemeless https-first upgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    1 /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(6) schemeless https-first upgrade", {
+    httpsFirstSchemelessUpgrade: 1,
+  });
 
   info("(6b) schemeless https-first upgrade downgrade");
 
@@ -646,23 +482,10 @@ add_task(async function () {
     "http://"
   );
 
-  verifyGleanValues(
-    "(6b) schemeless https-first upgrade downgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    1 /* aHttpsFirstSchemelessUpgrade */,
-    1 /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(6b) schemeless https-first upgrade downgrade", {
+    httpsFirstSchemelessUpgrade: 1,
+    httpsFirstSchemelessUpgradeDowngrade: 1,
+  });
 });
 
 add_task(async function () {
@@ -686,23 +509,7 @@ add_task(async function () {
     "https://"
   );
 
-  verifyGleanValues(
-    "(7) https-rr upgrade",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    1 /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(7) https-rr upgrade", { httpsRR: 1 });
 });
 
 add_task(async function () {
@@ -761,21 +568,5 @@ add_task(async function () {
     });
   });
 
-  verifyGleanValues(
-    "(8) upgrade/downgrade/reload",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    1 /* aUpgradeException */
-  );
+  verifyGleanValues("(8) upgrade/downgrade/reload", { upgradeException: 1 });
 });

dom/security/test/https-first/browser_https_telemetry2.js

@@ -29,77 +29,79 @@ async function setPrefsAndResetFog(
   });
 }
 
-function verifyGleanValues(
-  aDescription,
-  aNotInitialized,
-  aNoUpgrade,
-  aAlreadyHTTPS,
-  aHSTS,
-  aHttpsOnlyUpgrade,
-  aHttpsOnlyUpgradeDowngrade,
-  aHttpsFirstUpgrade,
-  aHttpsFirstUpgradeDowngrade,
-  aHttpsFirstSchemelessUpgrade,
-  aHttpsFirstSchemelessUpgradeDowngrade,
-  aCSPUpgradeInsecureRequests,
-  aHttpsRR,
-  aWebExtensionUpgrade,
-  aUpgradeException
-) {
+function verifyGleanValues(aDescription, aExpected) {
   info(aDescription);
+
+  let notInitialized = aExpected.notInitialized || null;
+  let noUpgrade = aExpected.noUpgrade || null;
+  let alreadyHTTPS = aExpected.alreadyHTTPS || null;
+  let hsts = aExpected.hsts || null;
+  let httpsOnlyUpgrade = aExpected.httpsOnlyUpgrade || null;
+  let httpsOnlyUpgradeDowngrade = aExpected.httpsOnlyUpgradeDowngrade || null;
+  let httpsFirstUpgrade = aExpected.httpsFirstUpgrade || null;
+  let httpsFirstUpgradeDowngrade = aExpected.httpsFirstUpgradeDowngrade || null;
+  let httpsFirstSchemelessUpgrade =
+    aExpected.httpsFirstSchemelessUpgrade || null;
+  let httpsFirstSchemelessUpgradeDowngrade =
+    aExpected.httpsFirstSchemelessUpgradeDowngrade || null;
+  let cspUpgradeInsecureRequests = aExpected.cspUpgradeInsecureRequests || null;
+  let httpsRR = aExpected.httpsRR || null;
+  let webExtensionUpgrade = aExpected.webExtensionUpgrade || null;
+  let upgradeException = aExpected.upgradeException || null;
+
   let glean = Glean.networking.httpToHttpsUpgradeReason;
   is(
     glean.not_initialized.testGetValue(),
-    aNotInitialized,
+    notInitialized,
     "verify not_initialized"
   );
-  is(glean.no_upgrade.testGetValue(), aNoUpgrade, "verify no_upgrade");
-  is(glean.already_https.testGetValue(), aAlreadyHTTPS, "verify already_https");
-  is(glean.hsts.testGetValue(), aHSTS, "verify hsts");
+  is(glean.no_upgrade.testGetValue(), noUpgrade, "verify no_upgrade");
+  is(glean.already_https.testGetValue(), alreadyHTTPS, "verify already_https");
+  is(glean.hsts.testGetValue(), hsts, "verify hsts");
   is(
     glean.https_only_upgrade.testGetValue(),
-    aHttpsOnlyUpgrade,
+    httpsOnlyUpgrade,
     "verify https_only_upgrade"
   );
   is(
     glean.https_only_upgrade_downgrade.testGetValue(),
-    aHttpsOnlyUpgradeDowngrade,
+    httpsOnlyUpgradeDowngrade,
     "verify https_only_upgrade_downgrade"
   );
   is(
     glean.https_first_upgrade.testGetValue(),
-    aHttpsFirstUpgrade,
+    httpsFirstUpgrade,
     "verify https_first_upgrade"
   );
   is(
     glean.https_first_upgrade_downgrade.testGetValue(),
-    aHttpsFirstUpgradeDowngrade,
+    httpsFirstUpgradeDowngrade,
     "verify https_first_upgrade_downgrade"
   );
   is(
     glean.https_first_schemeless_upgrade.testGetValue(),
-    aHttpsFirstSchemelessUpgrade,
+    httpsFirstSchemelessUpgrade,
     "verify https_first_schemeless_upgrade"
   );
   is(
     glean.https_first_schemeless_upgrade_downgrade.testGetValue(),
-    aHttpsFirstSchemelessUpgradeDowngrade,
+    httpsFirstSchemelessUpgradeDowngrade,
     "verify https_first_schemeless_upgrade_downgrade"
   );
   is(
     glean.csp_uir.testGetValue(),
-    aCSPUpgradeInsecureRequests,
+    cspUpgradeInsecureRequests,
     "verify csp_uir"
   );
-  is(glean.https_rr.testGetValue(), aHttpsRR, "verify https_rr");
+  is(glean.https_rr.testGetValue(), httpsRR, "verify https_rr");
   is(
     glean.web_extension_upgrade.testGetValue(),
-    aWebExtensionUpgrade,
+    webExtensionUpgrade,
     "verify web_extension_upgrade"
   );
   is(
     glean.upgrade_exception.testGetValue(),
-    aUpgradeException,
+    upgradeException,
     "verify upgrade_exception"
   );
 }
@@ -133,28 +135,14 @@ add_task(async function () {
     false /* aSchemeLessPref */
   );
 
+  let random = Math.random();
+
   await runUpgradeTest(
-    "view-source:https://example.com",
+    "view-source:https://example.com?" + random,
     "(1) verify view-source",
     "view-source"
   );
-  verifyGleanValues(
-    "(1) verify view-source",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    1 /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(1) verify view-source", { alreadyHTTPS: 1 });
 });
 
 add_task(async function () {
@@ -168,23 +156,7 @@ add_task(async function () {
 
   // about:credits resolves to https://www.mozilla.org/credits/
   await runUpgradeTest("about:credits", "(2) verify about: pages", "https:");
-  verifyGleanValues(
-    "(2) verify about: pages",
-    null /* aNotInitialized */,
-    null /* aNoUpgrade */,
-    1 /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    null /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(2) verify about: pages", { alreadyHTTPS: 1 });
 });
 
 add_task(async function () {
@@ -196,8 +168,10 @@ add_task(async function () {
     false /* aSchemeLessPref */
   );
 
+  let random = Math.random();
+
   await BrowserTestUtils.withNewTab(
-    TEST_PATH_HTTP + "file_https_telemetry_csp_uir.html",
+    TEST_PATH_HTTP + "file_https_telemetry_csp_uir.html?" + random,
     async function (browser) {
       let newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, null, true);
       BrowserTestUtils.synthesizeMouse(
@@ -220,21 +194,8 @@ add_task(async function () {
   // we record 2 loads:
   // * the load for TEST_PATH_HTTP which results in "no_upgrade"
   // * the link click where CSP UIR upgrades the load to https
-  verifyGleanValues(
-    "(3) verify top-level csp upgrade-insecure-requests",
-    null /* aNotInitialized */,
-    1 /* aNoUpgrade */,
-    null /* aAlreadyHTTPS */,
-    null /* aHSTS */,
-    null /* aHttpsOnlyUpgrade */,
-    null /* aHttpsOnlyUpgradeDowngrade */,
-    null /* aHttpsFirstUpgrade */,
-    null /* aHttpsFirstUpgradeDowngrade */,
-    null /* aHttpsFirstSchemelessUpgrade */,
-    null /* aHttpsFirstSchemelessUpgradeDowngrade */,
-    1 /* aCSPUpgradeInsecureRequests */,
-    null /* aHttpsRR */,
-    null /* aWebExtensionUpgrade */,
-    null /* aUpgradeException */
-  );
+  verifyGleanValues("(3) verify top-level csp upgrade-insecure-requests", {
+    noUpgrade: 1,
+    cspUpgradeInsecureRequests: 1,
+  });
 });