From ee661f78d334bcd63fe7b51d80fb085dc3d68f2f Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Thu, 5 May 2016 13:28:48 -0700 Subject: [PATCH] Bug 1270628 - Stop using content-child-shutdown observer in nsPerformanceStats (r=Yoric) --- toolkit/components/perfmonitoring/nsPerformanceStats.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp index 3f99f535705c..90d923d34b1a 100644 --- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp +++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp @@ -711,7 +711,6 @@ nsPerformanceStatsService::Dispose() obs->RemoveObserver(this, "profile-before-change"); obs->RemoveObserver(this, "quit-application"); obs->RemoveObserver(this, "quit-application-granted"); - obs->RemoveObserver(this, "content-child-shutdown"); obs->RemoveObserver(this, "xpcom-will-shutdown"); } @@ -784,7 +783,6 @@ nsPerformanceStatsService::InitInternal() obs->AddObserver(this, "profile-before-change", false); obs->AddObserver(this, "quit-application-granted", false); obs->AddObserver(this, "quit-application", false); - obs->AddObserver(this, "content-child-shutdown", false); obs->AddObserver(this, "xpcom-will-shutdown", false); } @@ -813,7 +811,6 @@ nsPerformanceStatsService::Observe(nsISupports *aSubject, const char *aTopic, MOZ_ASSERT(strcmp(aTopic, "profile-before-change") == 0 || strcmp(aTopic, "quit-application") == 0 || strcmp(aTopic, "quit-application-granted") == 0 - || strcmp(aTopic, "content-child-shutdown") == 0 || strcmp(aTopic, "xpcom-will-shutdown") == 0); Dispose();