Back out Bug 1127201 (part 2) for various problems.

2015-02-06 15:04:32 -08:00
parent 64644acbbe
commit e048a7df33
347 changed files with 3071 additions and 3032 deletions
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -1512,8 +1512,8 @@ PluginModuleParent::RecvBackUpXResources(const FileDescriptor& aXSocketFd)
 #ifndef MOZ_X11
    NS_RUNTIMEABORT("This message only makes sense on X11 platforms");
 #else
-    MOZ_ASSERT(0 > mPluginXSocketFdDup.get(),
-               "Already backed up X resources??");
+    NS_ABORT_IF_FALSE(0 > mPluginXSocketFdDup.get(),
+                      "Already backed up X resources??");
    mPluginXSocketFdDup.forget();
    if (aXSocketFd.IsValid()) {
      mPluginXSocketFdDup.reset(aXSocketFd.PlatformHandle());