From 02f997b84270b51e4b6572c778982ad5fa7028c0 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Mon, 3 Dec 2012 18:47:04 +0000
Subject: [PATCH] Backout bc20093cfc9d (bug 816656) for build failures during
 prepare-package

---
 startupcache/StartupCache.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp
index 432886011aeb..13a6982a4078 100644
--- a/startupcache/StartupCache.cpp
+++ b/startupcache/StartupCache.cpp
@@ -139,9 +139,7 @@ StartupCache::~StartupCache()
   // but an early shutdown means either mTimer didn't run 
   // or the write thread is still running.
   WaitOnWriteThread();
-  // If we shutdown quickly timer wont have fired. Instead of writing
-  // it on the main thread and block the shutdown we simply wont update
-  // the startup cache.
+  WriteToDisk();
   gStartupCache = nullptr;
   (void)::NS_UnregisterMemoryReporter(mMappingMemoryReporter);
   (void)::NS_UnregisterMemoryReporter(mDataMemoryReporter);