Bug 648485 - Second try to fix intermittent failure in content/base/test/test_bug482935.html. r=ehsan

content/base/test/test_bug482935.html

@@ -29,13 +29,19 @@ function testCancelInPhase4() {
   var xhr = new XMLHttpRequest();
   xhr.addEventListener("readystatechange", function(e) {
     if (xhr.readyState >= 4) {
-      xhr.abort();
-      SimpleTest.executeSoon(function() {
+      xhr.addEventListener("abort", function() {
+        setTimeout(function() {
           // This request was cancelled, so the responseText should be empty string
           is(xhr.responseText, "", "Expected empty response to cancelled request");
 
           // Second request - should be found in cache
           var xhr2 = new XMLHttpRequest();
+
+          xhr2.addEventListener("load", function() {
+            is(xhr2.responseText, "0", "Received fresh value for second request");
+            testCancelBeforePhase4();
+          }, false);
+
           xhr2.open("GET", url, false); // note : synch-request
           xhr2.setRequestHeader("X-Request", "1", false);
 
@@ -43,11 +49,10 @@ function testCancelInPhase4() {
           catch(e) {
             is(xhr2.status, "200", "Exception!");
           }
+        }, 0);
+      }, false);
 
-        is(xhr2.responseText, "0", "Received fresh value for second request");
- 
-        testCancelBeforePhase4();
-      });
+      xhr.abort();
     }
   }, false);
 
@@ -69,13 +74,19 @@ function testCancelBeforePhase4() {
   var xhr = new XMLHttpRequest();
   xhr.addEventListener("readystatechange", function(e) {
     if (xhr.readyState == 3) {
-      xhr.abort();
-      SimpleTest.executeSoon(function() {
+      xhr.addEventListener("abort", function() {
+        setTimeout(function() {
           // This request was cancelled, so the responseText should be empty string
           is(xhr.responseText, "", "Expected empty response to cancelled request");
 
           // Second request - should be found in cache
           var xhr2 = new XMLHttpRequest();
+
+          xhr2.addEventListener("load", function() {
+            is(xhr2.responseText, "1", "Received cached value for second request");
+            SimpleTest.finish();
+          }, false);
+
           xhr2.open("GET", url, false); // note : synch-request
           xhr2.setRequestHeader("X-Request", "1", false);
 
@@ -83,11 +94,10 @@ function testCancelBeforePhase4() {
           catch(e) {
             is(xhr2.status, "200", "Exception!");
           }
+        }, 0);
+      }, false);
 
-        is(xhr2.responseText, "1", "Received cached value for second request");
-
-        SimpleTest.finish();
-      });
+      xhr.abort();
     }
   }, false);