diff -r 000000000000 -r 6474c204b198 toolkit/crashreporter/test/unit/test_event_files.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/crashreporter/test/unit/test_event_files.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const {utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/Promise.jsm", this);
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://testing-common/AppData.jsm", this);
+
+function run_test() {
+  run_next_test();
+}
+
+add_task(function* test_setup() {
+  do_get_profile();
+  yield makeFakeAppDir();
+});
+
+add_task(function* test_main_process_crash() {
+  let cm = Services.crashmanager;
+  Assert.ok(cm, "CrashManager available.");
+
+  let basename;
+  let deferred = Promise.defer();
+  do_crash("crashType = CrashTestUtils.CRASH_RUNTIMEABORT;",
+    (minidump, extra) => {
+      basename = minidump.leafName;
+      cm._eventsDirs = [getEventDir()];
+      cm.aggregateEventsFiles().then(deferred.resolve, deferred.reject);
+    },
+    true);
+
+  let count = yield deferred.promise;
+  Assert.equal(count, 1, "A single crash event file was seen.");
+  let crashes = yield cm.getCrashes();
+  Assert.equal(crashes.length, 1);
+  let crash = crashes[0];
+  Assert.ok(crash.isMainProcessCrash);
+  Assert.equal(crash.id + ".dmp", basename, "ID recorded properly");
+});