From 6d9165491402a19d3237e41ff7bc7ee64c36f56d Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Tue, 16 Feb 2016 16:40:43 -0800
Subject: [PATCH] Backed out changeset 9d5fa6d7558a (bug 1247432) for being a
 possible cause of the spike in ASAN
 test_browserElement_oop_getWebManifest.html failures

--HG--
extra : commitid : 1NKaYZHHXip
extra : rebase_source : 4f280016d0e7c767eca959d428a6978397514840
---
 netwerk/cache2/CacheObserver.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 2b772bb3546b..282ae13f0e98 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -503,13 +503,18 @@ CacheObserver::Observe(nsISupports* aSubject,
     return NS_OK;
   }
 
-  if (!strcmp(aTopic, "profile-change-net-teardown") ||
-      !strcmp(aTopic, "profile-before-change") ||
-      !strcmp(aTopic, "xpcom-shutdown")) {
+  if (!strcmp(aTopic, "profile-before-change")) {
     RefPtr<CacheStorageService> service = CacheStorageService::Self();
-    if (service) {
+    if (service)
+      service->Shutdown();
+
+    return NS_OK;
+  }
+
+  if (!strcmp(aTopic, "xpcom-shutdown")) {
+    RefPtr<CacheStorageService> service = CacheStorageService::Self();
+    if (service)
       service->Shutdown();
-    }
 
     CacheFileIOManager::Shutdown();
     return NS_OK;
@@ -517,9 +522,8 @@ CacheObserver::Observe(nsISupports* aSubject,
 
   if (!strcmp(aTopic, "last-pb-context-exited")) {
     RefPtr<CacheStorageService> service = CacheStorageService::Self();
-    if (service) {
+    if (service)
       service->DropPrivateBrowsingEntries();
-    }
 
     return NS_OK;
   }