From 76c7b95997f4789a69736c78e3abbb5f6c683f99 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Thu, 23 Aug 2012 12:00:51 -0700
Subject: [PATCH] Backout of c129811b87ef due to mochi bustage

---
 dom/base/DOMRequest.cpp                       |  4 +--
 dom/base/test/test_domrequest.html            | 33 +------------------
 .../tests/SimpleTest/specialpowersAPI.js      |  3 +-
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/dom/base/DOMRequest.cpp b/dom/base/DOMRequest.cpp
index 1cc07ccecd7a..2a15785d5ef4 100644
--- a/dom/base/DOMRequest.cpp
+++ b/dom/base/DOMRequest.cpp
@@ -236,7 +236,7 @@ public:
     JS_AddValueRoot(cx, &mResult);
   }
 
-  NS_IMETHODIMP
+  nsresult
   Run()
   {
     static_cast<DOMRequest*>(mReq)->FireSuccess(mResult);
@@ -263,7 +263,7 @@ public:
   {
   }
 
-  NS_IMETHODIMP  
+  nsresult
   Run()
   {
     static_cast<DOMRequest*>(mReq)->FireError(mError);
diff --git a/dom/base/test/test_domrequest.html b/dom/base/test/test_domrequest.html
index ab504d1b77ee..1f2019efdcd5 100644
--- a/dom/base/test/test_domrequest.html
+++ b/dom/base/test/test_domrequest.html
@@ -50,44 +50,13 @@ req.onerror = function(e) {
   ev = e;
 }
 reqserv.fireError(req, "OhMyError");
-ok(ev, "got error event");
+ok(ev, "got success event");
 is(ev.type, "error", "correct type during error");
 is(ev.target, req, "correct target during error");
 is(req.readyState, "done", "correct readyState after error");
 is(req.error.name, "OhMyError", "correct error after error");
 is(req.result, undefined, "correct result after error");
 
-// fire success
-req = reqserv.createRequest(window);
-ev = null;
-req.onsuccess = function(e) {
-  ev = e;
-  ok(ev, "got async success event");
-  is(ev.type, "success", "correct type during async success");
-  is(ev.target, this, "correct target during async success");
-  is(this.readyState, "done", "correct readyState after async success");
-  is(this.error, null, "correct error after async success");
-  is(this.result, "my async result", "correct result after async success");
-}
-reqserv.fireSuccessAsync(req, "my async result");
-
-// fire error
-req = reqserv.createRequest(window);
-ev = null;
-req.onerror = function(e) {
-  ev = e;
-  ok(ev, "got async error event");
-  is(ev.type, "error", "correct type during async error");
-  is(ev.target, this, "correct target during async error");
-  is(this.readyState, "done", "correct readyState after async error");
-  is(this.error.name, "OhMyAsyncError", "correct error after async error");
-  is(this.result, undefined, "correct result after async error");
-  SimpleTest.finish();
-}
-reqserv.fireErrorAsync(req, "OhMyAsyncError");
-
-SimpleTest.waitForExplicitFinish();
-
 </script>
 </pre>
 </body>
diff --git a/testing/mochitest/tests/SimpleTest/specialpowersAPI.js b/testing/mochitest/tests/SimpleTest/specialpowersAPI.js
index 3f9ff347340a..fa6804ca6b18 100644
--- a/testing/mochitest/tests/SimpleTest/specialpowersAPI.js
+++ b/testing/mochitest/tests/SimpleTest/specialpowersAPI.js
@@ -924,8 +924,7 @@ SpecialPowersAPI.prototype = {
     var serv = Cc["@mozilla.org/dom/dom-request-service;1"].
       getService(Ci.nsIDOMRequestService);
     var res = { __exposedProps__: {} };
-    var props = ["createRequest", "fireError", "fireSuccess", 
-								 "fireErrorAsync", "fireSuccessAsync"];
+    var props = ["createRequest", "fireError", "fireSuccess"];
     for (i in props) {
       let prop = props[i];
       res[prop] = function() { return serv[prop].apply(serv, arguments) };