[bootstrap] Merge default.

--HG--
branch : bootstrapped

1 files changed, 2 insertions, 7 deletions

diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 8a5c6471..88f2de29 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -28,12 +28,7 @@ memoize(this, "Commands", function () {
     return obj.Commands;
 });
 
-const FailedAssertion = Class("FailedAssertion", Error, {
-    init: function (message) {
-        update(this, Error(message))
-        this.message = message;
-    }
-});
+const FailedAssertion = Class("FailedAssertion", ErrorBase);
 
 function wrapCallback(fn)
     fn.wrapper = function wrappedCallback () {
@@ -126,7 +121,7 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      */
     assert: function (condition, message) {
         if (!condition)
-            throw FailedAssertion(message);
+            throw FailedAssertion(message, 1);
     },
 
     get chromePackages() {