Backed out changeset 8f489e406701 (bug 822135) for m(dt) failures CLO…

…SED TREE
mozilla · Oct 2, 2015 · c0ddea6 · c0ddea6
1 parent 661f8d9
commit c0ddea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/tools/profiler/gecko/nsProfiler.cpp b/tools/profiler/gecko/nsProfiler.cpp
@@ -24,7 +24,7 @@ using mozilla::ErrorResult;
 using mozilla::dom::Promise;
 using std::string;
 
-NS_IMPL_ISUPPORTS(nsProfiler, nsIProfiler, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS(nsProfiler, nsIProfiler)
 
 nsProfiler::nsProfiler()
   : mLockedForPrivateBrowsing(false)
@@ -44,8 +44,8 @@ nsresult
 nsProfiler::Init() {
   nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
   if (observerService) {
-    observerService->AddObserver(this, "chrome-document-global-created", true);
-    observerService->AddObserver(this, "last-pb-context-exited", true);
+    observerService->AddObserver(this, "chrome-document-global-created", false);
+    observerService->AddObserver(this, "last-pb-context-exited", false);
   }
   return NS_OK;
 }

diff --git a/tools/profiler/gecko/nsProfiler.h b/tools/profiler/gecko/nsProfiler.h
@@ -8,12 +8,9 @@
 
 #include "nsIProfiler.h"
 #include "nsIObserver.h"
-#include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 
-class nsProfiler final : public nsIProfiler
-                       , public nsIObserver
-                       , public nsSupportsWeakReference
+class nsProfiler final : public nsIProfiler, public nsIObserver
 {
 public:
     nsProfiler();