From 0d76ee39f30c51c47a323be831e2d86b0584a77c Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 Apr 2015 11:08:27 -0400
Subject: [PATCH] Backed out changeset 41b2612eba71 (bug 1156857) for
 regressing bug 1100501.

---
 toolkit/xre/nsEmbedFunctions.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d7034424ba6..506553312f5 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -76,8 +76,6 @@
 
 #include "GeckoProfiler.h"
 
- #include "base/histogram.h"
-
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxing/loggingCallbacks.h"
@@ -139,7 +137,6 @@ XRE_LockProfileDirectory(nsIFile* aDirectory,
 }
 
 static int32_t sInitCounter;
-static UniquePtr<base::StatisticsRecorder> gStatisticsRecorder;
 
 nsresult
 XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
@@ -156,9 +153,6 @@ XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
   if (++sInitCounter > 1) // XXXbsmedberg is this really the right solution?
     return NS_OK;
 
-  // This is needed by Telemetry to initialize histogram collection.
-  gStatisticsRecorder = MakeUnique<base::StatisticsRecorder>();
-
   if (!aAppDirectory)
     aAppDirectory = aLibXULDirectory;
 
@@ -212,7 +206,6 @@ XRE_TermEmbedding()
   gDirServiceProvider->DoShutdown();
   NS_ShutdownXPCOM(nullptr);
   delete gDirServiceProvider;
-  gStatisticsRecorder = nullptr;
 }
 
 const char*