Merge inbound to m-c. a=merge

CLOSED TREE
2015-02-10 16:03:15 -05:00
parent fa6c694812 e1d2b57650
commit 3322287d49
628 changed files with 7368 additions and 6558 deletions
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -1508,8 +1508,9 @@ _evaluate(NPP npp, NPObject* npobj, NPString *script, NPVariant *result)
  }

  obj = JS_ObjectToInnerObject(cx, obj);
-  NS_ABORT_IF_FALSE(obj,
-    "JS_ObjectToInnerObject should never return null with non-null input.");
+  MOZ_ASSERT(obj,
+             "JS_ObjectToInnerObject should never return null with non-null "
+             "input.");

  if (result) {
    // Initialize the out param to void