Backed out changeset 1294f3456b53 (bug 1320533) for build bustage a=backout
authorWes Kocher <wkocher@mozilla.com>
Wed, 04 Jan 2017 15:45:47 -0800
changeset 353340 934c375788011ec2d6ab60a019657acdce054e6f
parent 353339 279134247633b312459dddf748634374f148aade
child 353341 23eae10f94cb96e2d9abe166e073fb0584c8bc3c
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1320533
milestone52.0a2
backs out1294f3456b539e042b8d05c103e54afa92106580
Backed out changeset 1294f3456b53 (bug 1320533) for build bustage a=backout
dom/ipc/ContentParent.cpp
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2415,22 +2415,16 @@ ContentParent::RecvReadFontList(Infallib
 #endif
   return true;
 }
 
 bool
 ContentParent::RecvReadDataStorageArray(const nsString& aFilename,
                                         InfallibleTArray<DataStorageItem>* aValues)
 {
-  // If we're shutting down, the DataStorage object may have been cleared
-  // already, and setting it up is pointless anyways since we're about to die.
-  if (mShutdownPending) {
-    return IPC_OK();
-  }
-
   // Ensure the SSS is initialized before we try to use its storage.
   nsCOMPtr<nsISiteSecurityService> sss = do_GetService("@mozilla.org/ssservice;1");
 
   RefPtr<DataStorage> storage = DataStorage::Get(aFilename);
   storage->GetAll(aValues);
   return true;
 }