diff -r 000000000000 -r 6474c204b198 toolkit/devtools/server/tests/unit/test_sourcemaps-13.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,102 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we don't permanently cache source maps.
+ */
+
+var gDebuggee;
+var gClient;
+var gThreadClient;
+
+Components.utils.import("resource:///modules/devtools/SourceMap.jsm");
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-source-map");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function() {
+    attachTestTabAndResume(gClient, "test-source-map", function(aResponse, aTabClient, aThreadClient) {
+      gThreadClient = aThreadClient;
+      setup_code();
+    });
+  });
+  do_test_pending();
+}
+
+// The MAP_FILE_NAME is .txt so that the OS will definitely have an extension ->
+// content type mapping for the extension. If it doesn't (like .map or .json),
+// it logs console errors, which cause the test to fail. See bug 907839.
+const MAP_FILE_NAME = "temporary-generated.txt";
+
+const TEMP_FILE_1 = "temporary1.js";
+const TEMP_FILE_2 = "temporary2.js";
+const TEMP_GENERATED_SOURCE = "temporary-generated.js";
+
+function setup_code() {
+  let node = new SourceNode(1, 0,
+                            getFileUrl(TEMP_FILE_1, true),
+                            "function temporary1() {}\n");
+  let { code, map } = node.toStringWithSourceMap({
+    file: getFileUrl(TEMP_GENERATED_SOURCE, true)
+  });
+
+  code += "//# sourceMappingURL=" + getFileUrl(MAP_FILE_NAME, true);
+  writeFile(MAP_FILE_NAME, map.toString());
+
+  Cu.evalInSandbox(code,
+                   gDebuggee,
+                   "1.8",
+                   getFileUrl(TEMP_GENERATED_SOURCE, true),
+                   1);
+
+  test_initial_sources();
+}
+
+function test_initial_sources() {
+  gThreadClient.getSources(function ({ error, sources }) {
+    do_check_true(!error);
+    do_check_eq(sources.length, 1);
+    do_check_eq(sources[0].url, getFileUrl(TEMP_FILE_1, true));
+    setup_new_code();
+  });
+}
+
+function setup_new_code() {
+  let node = new SourceNode(1, 0,
+                            getFileUrl(TEMP_FILE_2, true),
+                            "function temporary2() {}\n");
+  let { code, map } = node.toStringWithSourceMap({
+    file: getFileUrl(TEMP_GENERATED_SOURCE, true)
+  });
+
+  code += "\n//# sourceMappingURL=" + getFileUrl(MAP_FILE_NAME, true);
+  writeFile(MAP_FILE_NAME, map.toString());
+
+  Cu.evalInSandbox(code,
+                   gDebuggee,
+                   "1.8",
+                   getFileUrl(TEMP_GENERATED_SOURCE, true),
+                   1);
+
+  gClient.addOneTimeListener("newSource", test_new_sources);
+}
+
+function test_new_sources() {
+  gThreadClient.getSources(function ({ error, sources }) {
+    do_check_true(!error);
+
+    // Should now have TEMP_FILE_2 as a source.
+    do_check_eq(sources.length, 2);
+    let s = sources.filter(s => s.url === getFileUrl(TEMP_FILE_2, true))[0];
+    do_check_true(!!s);
+
+    finish_test();
+  });
+}
+
+function finish_test() {
+  do_get_file(MAP_FILE_NAME).remove(false);
+  finishClient(gClient);
+}