Backed out changeset 41b2612eba71 (bug 1156857) for regressing bug 1100501.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 30 Apr 2015 11:08:27 -0400
changeset 241844 8319693198eb345275ca933f0997b283a90369ef
parent 241843 83d73d15fcbc985d847ca0425142c7c2af43e8ef
child 241845 d94ef5bca70ea9e141d40c208ff15d4fe526bae7
push id28671
push userryanvm@gmail.com
push dateFri, 01 May 2015 14:27:58 +0000
treeherdermozilla-central@60b269fed8cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1156857, 1100501
milestone40.0a1
backs out41b2612eba715031ae775abd7c4223b5773512e9
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 41b2612eba71 (bug 1156857) for regressing bug 1100501.
toolkit/xre/nsEmbedFunctions.cpp
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -71,18 +71,16 @@
 #include "mozilla/ipc/XPCShellEnvironment.h"
 #include "mozilla/WindowsDllBlocklist.h"
 
 #include "GMPProcessChild.h"
 #include "GMPLoader.h"
 
 #include "GeckoProfiler.h"
 
- #include "base/histogram.h"
-
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxing/loggingCallbacks.h"
 #endif
 
 #ifdef MOZ_IPDL_TESTS
 #include "mozilla/_ipdltest/IPDLUnitTests.h"
 #include "mozilla/_ipdltest/IPDLUnitTestProcessChild.h"
@@ -134,36 +132,32 @@ XRE_LockProfileDirectory(nsIFile* aDirec
                                    getter_AddRefs(lock));
   if (NS_SUCCEEDED(rv))
     NS_ADDREF(*aLockObject = lock);
 
   return rv;
 }
 
 static int32_t sInitCounter;
-static UniquePtr<base::StatisticsRecorder> gStatisticsRecorder;
 
 nsresult
 XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
 		   nsIFile *aAppDirectory,
 		   nsIDirectoryServiceProvider *aAppDirProvider)
 {
   // Initialize some globals to make nsXREDirProvider happy
   static char* kNullCommandLine[] = { nullptr };
   gArgv = kNullCommandLine;
   gArgc = 0;
 
   NS_ENSURE_ARG(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;
 
   nsresult rv;
 
   new nsXREDirProvider; // This sets gDirServiceProvider
   if (!gDirServiceProvider)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -207,17 +201,16 @@ XRE_TermEmbedding()
     return;
 
   NS_ASSERTION(gDirServiceProvider,
                "XRE_TermEmbedding without XRE_InitEmbedding");
 
   gDirServiceProvider->DoShutdown();
   NS_ShutdownXPCOM(nullptr);
   delete gDirServiceProvider;
-  gStatisticsRecorder = nullptr;
 }
 
 const char*
 XRE_ChildProcessTypeToString(GeckoProcessType aProcessType)
 {
   return (aProcessType < GeckoProcessType_End) ?
     kGeckoProcessTypeString[aProcessType] : nullptr;
 }