diff -r 000000000000 -r 6474c204b198 toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,95 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that AsyncShutdown report errors correctly
+
+function setup_crash() {
+  Components.utils.import("resource://gre/modules/AsyncShutdown.jsm", this);
+  Components.utils.import("resource://gre/modules/Services.jsm", this);
+  Components.utils.import("resource://gre/modules/Promise.jsm", this);
+
+  Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true);
+  Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 10);
+
+  let TOPIC = "testing-async-shutdown-crash";
+  let phase = AsyncShutdown._getPhase(TOPIC);
+  phase.addBlocker("A blocker that is never satisfied", function() {
+    dump("Installing blocker\n");
+    let deferred = Promise.defer();
+    return deferred.promise;
+  });
+
+  Services.obs.notifyObservers(null, TOPIC, null);
+  dump("Waiting for crash\n");
+}
+
+function after_crash(mdump, extra) {
+  do_print("after crash: " + extra.AsyncShutdownTimeout);
+  let info = JSON.parse(extra.AsyncShutdownTimeout);
+  do_check_eq(info.phase, "testing-async-shutdown-crash");
+  do_print("Condition: " + JSON.stringify(info.conditions));
+  do_check_true(JSON.stringify(info.conditions).indexOf("A blocker that is never satisfied") != -1);
+}
+
+// Test that AsyncShutdown + OS.File reports errors correctly, in a case in which
+// the latest operation succeeded
+
+function setup_osfile_crash_noerror() {
+  Components.utils.import("resource://gre/modules/Services.jsm", this);
+  Components.utils.import("resource://gre/modules/osfile.jsm", this);
+
+  Services.prefs.setBoolPref("toolkit.osfile.debug.failshutdown", true);
+  Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1);
+  Services.prefs.setBoolPref("toolkit.osfile.native", false);
+
+  OS.File.getCurrentDirectory();
+  Services.obs.notifyObservers(null, "profile-before-change", null);
+  dump("Waiting for crash\n");
+};
+
+function after_osfile_crash_noerror(mdump, extra) {
+  do_print("after OS.File crash: " + JSON.stringify(extra.AsyncShutdownTimeout));
+  let info = JSON.parse(extra.AsyncShutdownTimeout);
+  let state = info.conditions[0].state;
+  do_print("Keys: " + Object.keys(state).join(", "));
+  do_check_eq(info.phase, "profile-before-change");
+  do_check_true(state.launched);
+  do_check_false(state.shutdown);
+  do_check_true(state.worker);
+  do_check_true(!!state.latestSent);
+  do_check_eq(state.latestSent[1], "getCurrentDirectory");
+}
+
+// Test that AsyncShutdown + OS.File reports errors correctly, in a case in which
+// the latest operation failed
+
+function setup_osfile_crash_exn() {
+  Components.utils.import("resource://gre/modules/Services.jsm", this);
+  Components.utils.import("resource://gre/modules/osfile.jsm", this);
+
+  Services.prefs.setBoolPref("toolkit.osfile.debug.failshutdown", true);
+  Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1);
+  Services.prefs.setBoolPref("toolkit.osfile.native", false);
+
+  OS.File.read("I do not exist");
+  Services.obs.notifyObservers(null, "profile-before-change", null);
+  dump("Waiting for crash\n");
+};
+
+function after_osfile_crash_exn(mdump, extra) {
+  do_print("after OS.File crash: " + JSON.stringify(extra.AsyncShutdownTimeout));
+  let info = JSON.parse(extra.AsyncShutdownTimeout);
+  let state = info.conditions[0].state;
+  do_print("Keys: " + Object.keys(state).join(", "));
+  do_check_eq(info.phase, "profile-before-change");
+  do_check_false(state.shutdown);
+  do_check_true(state.worker);
+  do_check_true(!!state.latestSent);
+  do_check_eq(state.latestSent[1], "read");
+}
+
+function run_test() {
+  do_crash(setup_crash, after_crash);
+  do_crash(setup_osfile_crash_noerror, after_osfile_crash_noerror);
+  do_crash(setup_osfile_crash_exn, after_osfile_crash_exn);
+}