Backed out changeset 41b2612eba71 (bug 1156857) for regressing bug 1100501.

This commit is contained in:
Ryan VanderMeulen 2015-04-30 11:08:27 -04:00
parent 33719fa4cb
commit 0d76ee39f3

View File

@ -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*