From 077f02e01bba36d221844437f0b52c247fecf4b1 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 31 Aug 2011 18:17:18 -0400 Subject: [PATCH] Backout Bug 679945 until we sort out some non-Firefox linking issues. --- toolkit/components/telemetry/TelemetryHistograms.h | 1 - toolkit/xre/nsWindowsDllBlocklist.cpp | 5 ----- 2 files changed, 6 deletions(-) diff --git a/toolkit/components/telemetry/TelemetryHistograms.h b/toolkit/components/telemetry/TelemetryHistograms.h index 6b839ab72461..d7187c05f62f 100644 --- a/toolkit/components/telemetry/TelemetryHistograms.h +++ b/toolkit/components/telemetry/TelemetryHistograms.h @@ -51,7 +51,6 @@ * a11y telemetry */ HISTOGRAM(A11Y_INSTANTIATED, 0, 1, 2, BOOLEAN, "has accessibility support been instantiated") -HISTOGRAM(DLLBLOCKLIST_HOOK_INSTALLED, 0, 1, 2, BOOLEAN, "was the DLL blocklist hook installed successfully") HISTOGRAM(CYCLE_COLLECTOR, 1, 10000, 50, EXPONENTIAL, "Time spent on one cycle collection (ms)") HISTOGRAM(CYCLE_COLLECTOR_VISITED_REF_COUNTED, 1, 300000, 50, EXPONENTIAL, "Number of ref counted objects visited by the cycle collector") diff --git a/toolkit/xre/nsWindowsDllBlocklist.cpp b/toolkit/xre/nsWindowsDllBlocklist.cpp index 1ddec305f376..7ee6b2cab5cc 100644 --- a/toolkit/xre/nsWindowsDllBlocklist.cpp +++ b/toolkit/xre/nsWindowsDllBlocklist.cpp @@ -55,10 +55,6 @@ #define IN_WINDOWS_DLL_BLOCKLIST #include "nsWindowsDllBlocklist.h" -#include "mozilla/Telemetry.h" - -using namespace mozilla; - #ifndef STATUS_DLL_NOT_FOUND #define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135L) #endif @@ -226,7 +222,6 @@ XRE_SetupDllBlocklist() bool ok = NtDllIntercept.AddHook("LdrLoadDll", reinterpret_cast(patched_LdrLoadDll), (void**) &stub_LdrLoadDll); - Telemetry::Accumulate(Telemetry::DLLBLOCKLIST_HOOK_INSTALLED, ok ? 1 : 0); #ifdef DEBUG if (!ok) printf_stderr ("LdrLoadDll hook failed, no dll blocklisting active\n");