mozilla-inbound: changeset 226023:e3d924b6797f92a37db62429065de7cd5347fda6

author	Nikhil Marathe <nsm.nikhil@gmail.com>
	Fri, 23 Jan 2015 11:23:55 -0800
changeset 226023	e3d924b6797f92a37db62429065de7cd5347fda6
parent 226022	c61a87a20888ebf068761c1d2ce3d461b589cb5f
child 226024	cb8cbda065c6a94bfab387a7e7bfa3a3a96d0bec
push id	54737
push user	nsm.nikhil@gmail.com
push date	Tue, 27 Jan 2015 17:42:04 +0000
treeherder	mozilla-inbound@e3d924b6797f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	baku
bugs	1081293
milestone	38.0a1
first release with	nightly linux32 b2b10231606b / 38.0a1 / 20150128030203 / files nightly linux64 b2b10231606b / 38.0a1 / 20150128030203 / files nightly mac b2b10231606b / 38.0a1 / 20150128030203 / files nightly win32 b2b10231606b / 38.0a1 / 20150128030203 / files nightly win64 b2b10231606b / 38.0a1 / 20150128030203 / files
last release without	nightly linux32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly linux64 38e4719e71af / 38.0a1 / 20150127030230 / files nightly mac 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win64 38e4719e71af / 38.0a1 / 20150127030230 / files

--- a/dom/workers/ServiceWorkerContainer.cpp
+++ b/dom/workers/ServiceWorkerContainer.cpp
@@ -51,17 +51,20 @@ ServiceWorkerContainer::DisconnectFromOw
 
 void
 ServiceWorkerContainer::RemoveReadyPromise()
 {
   nsCOMPtr<nsPIDOMWindow> window = GetOwner();
   if (window) {
     nsCOMPtr<nsIServiceWorkerManager> swm =
       mozilla::services::GetServiceWorkerManager();
-    MOZ_ASSERT(swm);
+    if (!swm) {
+      // If the browser is shutting down, we don't need to remove the promise.
+      return;
+    }
 
     swm->RemoveReadyPromise(window);
   }
 }
 
 JSObject*
 ServiceWorkerContainer::WrapObject(JSContext* aCx)
 {