142 files changed, 19 insertions, 15 deletions
diff --git a/devtools/moz.build b/devtools/moz.build
index e6bcdd00d..e6cb86c37 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -4,20 +4,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += [
+    'server',
+    'shared',
+]
+
 if CONFIG['MOZ_DEVTOOLS']:
     DIRS += ['client']
 
-if CONFIG['MOZ_DEVTOOLS_SERVER']:
-    DIRS += [
-        'server',
-        'shared',
-    ]
-else:
-  DIRS += [
-      'shared/heapsnapshot',
-      'shared/jsinspector',
-  ]
-
 # /browser uses DIST_SUBDIR.  We opt-in to this treatment when building
 # DevTools for the browser to keep the root omni.ja slim for use by external XUL
 # apps.  Mulet also uses this since it includes /browser.
diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build
index 6c61206dd..9dd4a20d6 100644
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -14,10 +14,8 @@ DIRS += [
     'discovery',
     'fronts',
     'gcli',
-    'heapsnapshot',
     'inspector',
     'jsbeautify',
-    'jsinspector',
     'layout',
     'locales',
     'node-properties',
diff --git a/devtools/shared/heapsnapshot/.gitattributes b/dom/heapsnapshot/.gitattributes
index 44e248a8d..44e248a8d 100644
--- a/devtools/shared/heapsnapshot/.gitattributes
+++ b/dom/heapsnapshot/.gitattributes
diff --git a/devtools/shared/heapsnapshot/AutoMemMap.cpp b/dom/heapsnapshot/AutoMemMap.cpp
index e725a99c6..e725a99c6 100644
--- a/devtools/shared/heapsnapshot/AutoMemMap.cpp
+++ b/dom/heapsnapshot/AutoMemMap.cpp
diff --git a/devtools/shared/heapsnapshot/AutoMemMap.h b/dom/heapsnapshot/AutoMemMap.h
index 537d68004..537d68004 100644
--- a/devtools/shared/heapsnapshot/AutoMemMap.h
+++ b/dom/heapsnapshot/AutoMemMap.h
diff --git a/devtools/shared/heapsnapshot/CensusUtils.js b/dom/heapsnapshot/CensusUtils.js
index 36bdd2d82..36bdd2d82 100644
--- a/devtools/shared/heapsnapshot/CensusUtils.js
+++ b/dom/heapsnapshot/CensusUtils.js
diff --git a/devtools/shared/heapsnapshot/CoreDump.pb.cc b/dom/heapsnapshot/CoreDump.pb.cc
index 6c7c0e8a4..6c7c0e8a4 100644
--- a/devtools/shared/heapsnapshot/CoreDump.pb.cc
+++ b/dom/heapsnapshot/CoreDump.pb.cc
diff --git a/devtools/shared/heapsnapshot/CoreDump.pb.h b/dom/heapsnapshot/CoreDump.pb.h
index 584c2e379..584c2e379 100644
--- a/devtools/shared/heapsnapshot/CoreDump.pb.h
+++ b/dom/heapsnapshot/CoreDump.pb.h
diff --git a/devtools/shared/heapsnapshot/CoreDump.proto b/dom/heapsnapshot/CoreDump.proto
index 24a223e11..24a223e11 100644
--- a/devtools/shared/heapsnapshot/CoreDump.proto
+++ b/dom/heapsnapshot/CoreDump.proto
diff --git a/devtools/shared/heapsnapshot/DeserializedNode.cpp b/dom/heapsnapshot/DeserializedNode.cpp
index fac4cccb9..fac4cccb9 100644
--- a/devtools/shared/heapsnapshot/DeserializedNode.cpp
+++ b/dom/heapsnapshot/DeserializedNode.cpp
diff --git a/devtools/shared/heapsnapshot/DeserializedNode.h b/dom/heapsnapshot/DeserializedNode.h
index 60d1fb408..60d1fb408 100644
--- a/devtools/shared/heapsnapshot/DeserializedNode.h
+++ b/dom/heapsnapshot/DeserializedNode.h
diff --git a/devtools/shared/heapsnapshot/DominatorTree.cpp b/dom/heapsnapshot/DominatorTree.cpp
index e53c196cf..e53c196cf 100644
--- a/devtools/shared/heapsnapshot/DominatorTree.cpp
+++ b/dom/heapsnapshot/DominatorTree.cpp
diff --git a/devtools/shared/heapsnapshot/DominatorTree.h b/dom/heapsnapshot/DominatorTree.h
index f785d4916..f785d4916 100644
--- a/devtools/shared/heapsnapshot/DominatorTree.h
+++ b/dom/heapsnapshot/DominatorTree.h
diff --git a/devtools/shared/heapsnapshot/DominatorTreeNode.js b/dom/heapsnapshot/DominatorTreeNode.js
index 13a847fd0..13a847fd0 100644
--- a/devtools/shared/heapsnapshot/DominatorTreeNode.js
+++ b/dom/heapsnapshot/DominatorTreeNode.js
diff --git a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.cpp b/dom/heapsnapshot/FileDescriptorOutputStream.cpp
index 72a289558..72a289558 100644
--- a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.cpp
+++ b/dom/heapsnapshot/FileDescriptorOutputStream.cpp
diff --git a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.h b/dom/heapsnapshot/FileDescriptorOutputStream.h
index 6990f1fc3..6990f1fc3 100644
--- a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.h
+++ b/dom/heapsnapshot/FileDescriptorOutputStream.h
diff --git a/devtools/shared/heapsnapshot/HeapAnalysesClient.js b/dom/heapsnapshot/HeapAnalysesClient.js
index 98601a2b1..98601a2b1 100644
--- a/devtools/shared/heapsnapshot/HeapAnalysesClient.js
+++ b/dom/heapsnapshot/HeapAnalysesClient.js
diff --git a/devtools/shared/heapsnapshot/HeapAnalysesWorker.js b/dom/heapsnapshot/HeapAnalysesWorker.js
index d07d67f80..d07d67f80 100644
--- a/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
+++ b/dom/heapsnapshot/HeapAnalysesWorker.js
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.cpp b/dom/heapsnapshot/HeapSnapshot.cpp
index 299a96a9c..299a96a9c 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.cpp
+++ b/dom/heapsnapshot/HeapSnapshot.cpp
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.h b/dom/heapsnapshot/HeapSnapshot.h
index 12dfa4c2b..12dfa4c2b 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.h
+++ b/dom/heapsnapshot/HeapSnapshot.h
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js b/dom/heapsnapshot/HeapSnapshotFileUtils.js
index abd44fc30..abd44fc30 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
+++ b/dom/heapsnapshot/HeapSnapshotFileUtils.js
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperChild.h b/dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
index a1d433a5e..a1d433a5e 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperChild.h
+++ b/dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
index 7246a9daa..7246a9daa 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
+++ b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
index 1582279da..1582279da 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h
+++ b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
diff --git a/devtools/shared/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl b/dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
index 2576470e2..2576470e2 100644
--- a/devtools/shared/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
+++ b/dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
diff --git a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp b/dom/heapsnapshot/ZeroCopyNSIOutputStream.cpp
index 0c29db7f9..0c29db7f9 100644
--- a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp
+++ b/dom/heapsnapshot/ZeroCopyNSIOutputStream.cpp
diff --git a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h b/dom/heapsnapshot/ZeroCopyNSIOutputStream.h
index 117fc0f87..117fc0f87 100644
--- a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h
+++ b/dom/heapsnapshot/ZeroCopyNSIOutputStream.h
diff --git a/devtools/shared/heapsnapshot/census-tree-node.js b/dom/heapsnapshot/census-tree-node.js
index b041e77f9..b041e77f9 100644
--- a/devtools/shared/heapsnapshot/census-tree-node.js
+++ b/dom/heapsnapshot/census-tree-node.js
diff --git a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh b/dom/heapsnapshot/generate-core-dump-sources.sh
index 97e492ff0..97e492ff0 100755..100644
--- a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
+++ b/dom/heapsnapshot/generate-core-dump-sources.sh
diff --git a/devtools/shared/heapsnapshot/moz.build b/dom/heapsnapshot/moz.build
index fa9ef3915..fa9ef3915 100644
--- a/devtools/shared/heapsnapshot/moz.build
+++ b/dom/heapsnapshot/moz.build
diff --git a/devtools/shared/heapsnapshot/shortest-paths.js b/dom/heapsnapshot/shortest-paths.js
index 2d97b7de9..2d97b7de9 100644
--- a/devtools/shared/heapsnapshot/shortest-paths.js
+++ b/dom/heapsnapshot/shortest-paths.js
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp b/dom/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
index e236a0acf..e236a0acf 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
+++ b/dom/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp b/dom/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
index 72e363934..72e363934 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
+++ b/dom/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DevTools.h b/dom/heapsnapshot/tests/gtest/DevTools.h
index 6eb5cfe21..6eb5cfe21 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/DevTools.h
+++ b/dom/heapsnapshot/tests/gtest/DevTools.h
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp b/dom/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
index bc517d6d9..bc517d6d9 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
+++ b/dom/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp b/dom/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
index 2fe5e6ace..2fe5e6ace 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
+++ b/dom/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp b/dom/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
index be135dbb4..be135dbb4 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
+++ b/dom/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp b/dom/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
index 475442df8..475442df8 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
+++ b/dom/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp b/dom/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
index a259c297b..a259c297b 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
+++ b/dom/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/moz.build b/dom/heapsnapshot/tests/gtest/moz.build
index 08c31e47c..08c31e47c 100644
--- a/devtools/shared/heapsnapshot/tests/gtest/moz.build
+++ b/dom/heapsnapshot/tests/gtest/moz.build
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini b/dom/heapsnapshot/tests/mochitest/chrome.ini
index 497b6fe37..497b6fe37 100644
--- a/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
+++ b/dom/heapsnapshot/tests/mochitest/chrome.ini
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/mochitest.ini b/dom/heapsnapshot/tests/mochitest/mochitest.ini
index 5e7aa8d10..5e7aa8d10 100644
--- a/devtools/shared/heapsnapshot/tests/mochitest/mochitest.ini
+++ b/dom/heapsnapshot/tests/mochitest/mochitest.ini
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/test_DominatorTree_01.html b/dom/heapsnapshot/tests/mochitest/test_DominatorTree_01.html
index 1f9d8c080..1f9d8c080 100644
--- a/devtools/shared/heapsnapshot/tests/mochitest/test_DominatorTree_01.html
+++ b/dom/heapsnapshot/tests/mochitest/test_DominatorTree_01.html
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html b/dom/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
index f150a99c7..f150a99c7 100644
--- a/devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
+++ b/dom/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html b/dom/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html
index 15f88f8e0..15f88f8e0 100644
--- a/devtools/shared/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html
+++ b/dom/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html
diff --git a/devtools/shared/heapsnapshot/tests/unit/.eslintrc.js b/dom/heapsnapshot/tests/unit/.eslintrc.js
index 59adf410a..59adf410a 100644
--- a/devtools/shared/heapsnapshot/tests/unit/.eslintrc.js
+++ b/dom/heapsnapshot/tests/unit/.eslintrc.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/Census.jsm b/dom/heapsnapshot/tests/unit/Census.jsm
index f8fb1ce44..f8fb1ce44 100644
--- a/devtools/shared/heapsnapshot/tests/unit/Census.jsm
+++ b/dom/heapsnapshot/tests/unit/Census.jsm
diff --git a/devtools/shared/heapsnapshot/tests/unit/Match.jsm b/dom/heapsnapshot/tests/unit/Match.jsm
index c29e6484e..c29e6484e 100644
--- a/devtools/shared/heapsnapshot/tests/unit/Match.jsm
+++ b/dom/heapsnapshot/tests/unit/Match.jsm
diff --git a/devtools/shared/heapsnapshot/tests/unit/dominator-tree-worker.js b/dom/heapsnapshot/tests/unit/dominator-tree-worker.js
index 1f49ca841..1f49ca841 100644
--- a/devtools/shared/heapsnapshot/tests/unit/dominator-tree-worker.js
+++ b/dom/heapsnapshot/tests/unit/dominator-tree-worker.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js b/dom/heapsnapshot/tests/unit/head_heapsnapshot.js
index 3171c8a6f..3171c8a6f 100644
--- a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
+++ b/dom/heapsnapshot/tests/unit/head_heapsnapshot.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js b/dom/heapsnapshot/tests/unit/heap-snapshot-worker.js
index 10ee70cec..10ee70cec 100644
--- a/devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js
+++ b/dom/heapsnapshot/tests/unit/heap-snapshot-worker.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
index 845a0d263..845a0d263 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
index e1f32de58..e1f32de58 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
index ad35dcec1..ad35dcec1 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
index 566ad0dab..566ad0dab 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js
index 24e8e2eb5..24e8e2eb5 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js
index de2907809..de2907809 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js
index 979232ff4..979232ff4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js
index 9a8d11d0b..9a8d11d0b 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js
index f8cb5eec3..f8cb5eec3 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
index 78ec47b64..78ec47b64 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_01.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_01.js
index e8145f658..e8145f658 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_01.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_02.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_02.js
index a518f8a27..a518f8a27 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_02.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_03.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_03.js
index 0a14ce53d..0a14ce53d 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_03.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_04.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_04.js
index e5aef3fec..e5aef3fec 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_04.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_05.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_05.js
index c07cee994..c07cee994 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_05.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_06.js b/dom/heapsnapshot/tests/unit/test_DominatorTree_06.js
index 680478623..680478623 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_06.js
+++ b/dom/heapsnapshot/tests/unit/test_DominatorTree_06.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js
index 0114e0b69..0114e0b69 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js
index 6e3f5b257..6e3f5b257 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js
index 7708de93c..7708de93c 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js
index 3e25ddac4..3e25ddac4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
index e648c9407..e648c9407 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
index b63ad4230..b63ad4230 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js
index 5df79de7a..5df79de7a 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
index cedea5375..cedea5375 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
index fd29beece..fd29beece 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
index caf1c2056..caf1c2056 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
index 0d0d58bef..0d0d58bef 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js
index 6f22cbad3..6f22cbad3 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
index f1ba9ce84..f1ba9ce84 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
index e26981db4..e26981db4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
index 34494af70..34494af70 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
index 486e250b5..486e250b5 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js
index 769a2d99d..769a2d99d 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js
index 7e16d9f00..7e16d9f00 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js
index 7795a9700..7795a9700 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
index 986b3aaa8..986b3aaa8 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
index 2ec577bd0..2ec577bd0 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
index 04fe58733..04fe58733 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js
index 0d08fea16..0d08fea16 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js
index 9eb11d9af..9eb11d9af 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
index d79cb5a7b..d79cb5a7b 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
index f3b3090b0..f3b3090b0 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
index 680ac9b58..680ac9b58 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
index 25f2c3791..25f2c3791 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
index 799844cde..799844cde 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
index da6067624..da6067624 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
index 0412410c0..0412410c0 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
index f5c36056f..f5c36056f 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
index 5934aa919..5934aa919 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
index bbacccc8d..bbacccc8d 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
index a7f987f5a..a7f987f5a 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
index 3d898b2d1..3d898b2d1 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js
index f10dd5b03..f10dd5b03 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js
+++ b/dom/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
index dde139ffd..dde139ffd 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
+++ b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
index d91f36f56..d91f36f56 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
+++ b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
index 76461b694..76461b694 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
+++ b/dom/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js b/dom/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
index affd8d1e4..affd8d1e4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
+++ b/dom/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-01.js
index 16038c5c4..16038c5c4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-02.js
index 37d039954..37d039954 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-03.js
index bdf932099..bdf932099 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-04.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-04.js
index cc0c3bac0..cc0c3bac0 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-04.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-05.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-05.js
index 20fb76bd2..20fb76bd2 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-05.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-06.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-06.js
index eb1801207..eb1801207 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-06.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-06.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-07.js
index 6bc085257..6bc085257 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-07.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-08.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-08.js
index 1c686c810..1c686c810 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-08.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-08.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-09.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-09.js
index 3efed04b0..3efed04b0 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-09.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-09.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js b/dom/heapsnapshot/tests/unit/test_census-tree-node-10.js
index b7798f23f..b7798f23f 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js
+++ b/dom/heapsnapshot/tests/unit/test_census-tree-node-10.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_01.js b/dom/heapsnapshot/tests/unit/test_census_diff_01.js
index 75977bccb..75977bccb 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_01.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_02.js b/dom/heapsnapshot/tests/unit/test_census_diff_02.js
index 169e3f036..169e3f036 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_02.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js b/dom/heapsnapshot/tests/unit/test_census_diff_03.js
index 6dbca3e40..6dbca3e40 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_04.js b/dom/heapsnapshot/tests/unit/test_census_diff_04.js
index a10097945..a10097945 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_04.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_05.js b/dom/heapsnapshot/tests/unit/test_census_diff_05.js
index b6d99f823..b6d99f823 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_05.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js b/dom/heapsnapshot/tests/unit/test_census_diff_06.js
index 430ff8c9c..430ff8c9c 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js
+++ b/dom/heapsnapshot/tests/unit/test_census_diff_06.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js b/dom/heapsnapshot/tests/unit/test_census_filtering_01.js
index 57724d7c1..57724d7c1 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js
+++ b/dom/heapsnapshot/tests/unit/test_census_filtering_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_02.js b/dom/heapsnapshot/tests/unit/test_census_filtering_02.js
index 0a57ce66d..0a57ce66d 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_02.js
+++ b/dom/heapsnapshot/tests/unit/test_census_filtering_02.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js b/dom/heapsnapshot/tests/unit/test_census_filtering_03.js
index 2c69a14b8..2c69a14b8 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js
+++ b/dom/heapsnapshot/tests/unit/test_census_filtering_03.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js b/dom/heapsnapshot/tests/unit/test_census_filtering_04.js
index c9871436b..c9871436b 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js
+++ b/dom/heapsnapshot/tests/unit/test_census_filtering_04.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_05.js b/dom/heapsnapshot/tests/unit/test_census_filtering_05.js
index 1d1f4fa55..1d1f4fa55 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_05.js
+++ b/dom/heapsnapshot/tests/unit/test_census_filtering_05.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js b/dom/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js
index e89048c33..e89048c33 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js
+++ b/dom/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_deduplicatePaths_01.js b/dom/heapsnapshot/tests/unit/test_deduplicatePaths_01.js
index 418b49db3..418b49db3 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_deduplicatePaths_01.js
+++ b/dom/heapsnapshot/tests/unit/test_deduplicatePaths_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js b/dom/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js
index 9c4f60991..9c4f60991 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js
+++ b/dom/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js b/dom/heapsnapshot/tests/unit/test_getReportLeaves_01.js
index 4c4298b6a..4c4298b6a 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js
+++ b/dom/heapsnapshot/tests/unit/test_getReportLeaves_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js b/dom/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js
index 067b9effb..067b9effb 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js
+++ b/dom/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini b/dom/heapsnapshot/tests/unit/xpcshell.ini
index f84b282d1..f84b282d1 100644
--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/dom/heapsnapshot/tests/unit/xpcshell.ini
diff --git a/dom/moz.build b/dom/moz.build
index cfcf6f865..89c539b4b 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -55,6 +55,7 @@ DIRS += [
     'gamepad',
     'geolocation',
     'grid',
+    'heapsnapshot',
     'html',
     'json',
     'jsurl',
diff --git a/devtools/shared/jsinspector/moz.build b/js/ductwork/inspector/moz.build
index fc81f7e1e..fc81f7e1e 100644
--- a/devtools/shared/jsinspector/moz.build
+++ b/js/ductwork/inspector/moz.build
diff --git a/devtools/shared/jsinspector/nsIJSInspector.idl b/js/ductwork/inspector/nsIJSInspector.idl
index 40ad49523..40ad49523 100644
--- a/devtools/shared/jsinspector/nsIJSInspector.idl
+++ b/js/ductwork/inspector/nsIJSInspector.idl
diff --git a/devtools/shared/jsinspector/nsJSInspector.cpp b/js/ductwork/inspector/nsJSInspector.cpp
index 457e64c08..457e64c08 100644
--- a/devtools/shared/jsinspector/nsJSInspector.cpp
+++ b/js/ductwork/inspector/nsJSInspector.cpp
diff --git a/devtools/shared/jsinspector/nsJSInspector.h b/js/ductwork/inspector/nsJSInspector.h
index 4e60b0428..4e60b0428 100644
--- a/devtools/shared/jsinspector/nsJSInspector.h
+++ b/js/ductwork/inspector/nsJSInspector.h
diff --git a/js/ductwork/moz.build b/js/ductwork/moz.build
new file mode 100644
index 000000000..fcf79a4cd
--- /dev/null
+++ b/js/ductwork/moz.build
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    'debugger',
+    'inspector',
+]
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 6a745e51e..fcc3eb556 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -122,12 +122,13 @@ DIRS += [
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     DIRS += ['/extensions/pref']
 
-DIRS += ['/devtools']
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += ['/devtools']
 
 DIRS += [
     '/services',
     '/startupcache',
-    '/js/ductwork/debugger',
+    '/js/ductwork',
     '/other-licenses/snappy',
 ]