From d6a6610b754483140473c19d9b0ec23c36f21f0c Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Wed, 1 Jun 2016 15:05:54 -0700
Subject: [PATCH] Bug 1270308 - Remove content-child-shutdown observer for
 OS.file. r=Yoric

---
 toolkit/components/osfile/modules/osfile_async_front.jsm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/toolkit/components/osfile/modules/osfile_async_front.jsm
index c564c831bd68..181471cd8171 100644
--- a/toolkit/components/osfile/modules/osfile_async_front.jsm
+++ b/toolkit/components/osfile/modules/osfile_async_front.jsm
@@ -1525,10 +1525,9 @@ function setupShutdown(phaseName) {
   );
 }
 
-
-if (isContent) {
-  setupShutdown("contentChildShutdown");
-} else {
+// profile-before-change only exists in the parent, and OS.File should
+// not be used in the child process anyways.
+if (!isContent) {
   setupShutdown("profileBeforeChange")
 }
 File.shutdown = Barriers.shutdown.client;