Merge pull request #7101 from w3c/sync_50da72aad66a06cde2367170ea1caf3885a34d0b

Backed out changeset 936c6efde4e4 (bug 1345457) for breaking xhr test case r=backout
diff --git a/XMLHttpRequest/abort-after-send.htm b/XMLHttpRequest/abort-after-send.htm
index aa4632f..523a0d6 100644
--- a/XMLHttpRequest/abort-after-send.htm
+++ b/XMLHttpRequest/abort-after-send.htm
@@ -38,7 +38,7 @@
         client.abort()
         assert_true(control_flag)
         assert_equals(client.readyState, 0)
-        assert_xhr_event_order_matches([1, "loadstart(0,0,false)", 4, "upload.abort(0,0,false)", "upload.loadend(0,0,false)", "abort(0,0,false)", "loadend(0,0,false)"])
+        assert_xhr_event_order_matches([1, "loadstart(0,0,false)", 4, "abort(0,0,false)", "loadend(0,0,false)"])
         test.done()
       })
     </script>