Bug 1608308 - re-enable corroborator tests r=heycam

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

--HG--
extra : moz-landing-system : lando

toolkit/components/corroborator/test/xpcshell/test_verify_jar.js

@@ -33,19 +33,3 @@ add_task(async function test_various_jars() {
   );
   equal(result, true, "Components signed files do verify");
 });
-
-add_task(async function test_telemetry() {
-  Corroborate.reportTelemetry(true, false);
-
-  const scalars = Services.telemetry.getSnapshotForScalars("main", false)
-    .parent;
-
-  ok(
-    "corroborate.omnijar_corrupted" in scalars,
-    "omni jar should be corrupted"
-  );
-  ok(
-    "corroborate.system_addons_corrupted" in scalars,
-    "system addons should not be corrupted"
-  );
-});

toolkit/components/corroborator/test/xpcshell/xpcshell.ini

@@ -4,4 +4,3 @@ support-files =
   data/**
 
 [test_verify_jar.js]
-skip-if = true # Bug 1549147 - Disable temporily until non-expired cert is available to sign test XPI.

toolkit/components/telemetry/Scalars.yaml

@@ -5586,7 +5586,7 @@ telemetry.test:
       - 'main'
       - 'sync'
 
-# The following section contains counters for corruption of internal JAR and XPI files.
+# The following section contains counters for corruption of internal omni jar files.
 corroborate:
   omnijar_corrupted:
     bug_numbers:
@@ -5622,23 +5622,6 @@ corroborate:
     record_in_processes:
       - main
 
-  system_addons_corrupted:
-    bug_numbers:
-      - 1515712
-    description: >-
-      Whether any system add-on (XPI files) were found to be missing or corrupt when checked during startup.
-    expires: "80"
-    kind: boolean
-    notification_emails:
-      - rhelmer@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-      - 'fennec'
-      - 'geckoview'
-    record_in_processes:
-      - main
-
 # NOTE: Please don't add new definitions below this point. Consider adding
 # them earlier in the file and leave the telemetry.test category as the last
 # one for readability.