Issue #21 - Remove remaining telemetry structs, callers and flags.

This commit is contained in:
Moonchild 2021-11-01 14:48:34 +00:00 committed by roytam1
commit eaf9e756a0
50 changed files with 31 additions and 500 deletions

View file

@ -410,54 +410,10 @@ int main(int argc, char** argv)
int rv = 0;
nsresult scrv;
// Register TestStartupCacheTelemetry
nsCOMPtr<nsIFile> manifest;
scrv = NS_GetSpecialDirectory(NS_GRE_DIR,
getter_AddRefs(manifest));
if (NS_FAILED(scrv)) {
fail("NS_XPCOM_CURRENT_PROCESS_DIR");
return 1;
}
#ifdef XP_MACOSX
nsCOMPtr<nsIFile> tempManifest;
manifest->Clone(getter_AddRefs(tempManifest));
manifest->AppendNative(
NS_LITERAL_CSTRING("TestStartupCacheTelemetry.manifest"));
bool exists;
manifest->Exists(&exists);
if (!exists) {
// Workaround for bug 1080338 in mozharness.
manifest = tempManifest.forget();
manifest->SetNativeLeafName(NS_LITERAL_CSTRING("MacOS"));
manifest->AppendNative(
NS_LITERAL_CSTRING("TestStartupCacheTelemetry.manifest"));
}
#else
manifest->AppendNative(
NS_LITERAL_CSTRING("TestStartupCacheTelemetry.manifest"));
#endif
XRE_AddManifestLocation(NS_APP_LOCATION, manifest);
nsCOMPtr<nsIObserver> telemetryThing =
do_GetService("@mozilla.org/testing/startup-cache-telemetry.js");
if (!telemetryThing) {
fail("telemetryThing");
return 1;
}
scrv = telemetryThing->Observe(nullptr, "save-initial", nullptr);
if (NS_FAILED(scrv)) {
fail("save-initial");
rv = 1;
}
nsCOMPtr<nsIStartupCache> sc
= do_GetService("@mozilla.org/startupcache/cache;1", &scrv);
if (NS_FAILED(scrv))
rv = 1;
else
sc->RecordAgesAlways();
if (NS_FAILED(TestStartupWriteRead()))
rv = 1;
if (NS_FAILED(TestWriteInvalidateRead()))
@ -470,11 +426,5 @@ int main(int argc, char** argv)
if (NS_FAILED(TestEarlyShutdown()))
rv = 1;
scrv = telemetryThing->Observe(nullptr, "save-initial", nullptr);
if (NS_FAILED(scrv)) {
fail("check-final");
rv = 1;
}
return rv;
}