Reclassify heapsnapshot and nsJSInspector as not part of devtools

This resolves Issue #316

142 files changed, 19 insertions, 15 deletions

diff --git a/devtools/moz.build b/devtools/moz.build
index e6bcdd00d0..e6cb86c374 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 6c61206dd2..9dd4a20d65 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 44e248a8dd..44e248a8dd 100644
--- a/devtools/shared/heapsnapshot/.gitattributes
+++ b/dom/heapsnapshot/.gitattributes
diff --git a/devtools/shared/heapsnapshot/AutoMemMap.cpp b/dom/heapsnapshot/AutoMemMap.cpp
index e725a99c65..e725a99c65 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 537d680042..537d680042 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 36bdd2d820..36bdd2d820 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 6c7c0e8a44..6c7c0e8a44 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 584c2e3795..584c2e3795 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 24a223e11c..24a223e11c 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 fac4cccb9e..fac4cccb9e 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 60d1fb408a..60d1fb408a 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 e53c196cf3..e53c196cf3 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 f785d49166..f785d49166 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 13a847fd04..13a847fd04 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 72a289558f..72a289558f 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 6990f1fc3e..6990f1fc3e 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 98601a2b1c..98601a2b1c 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 d07d67f80e..d07d67f80e 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 299a96a9cc..299a96a9cc 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 12dfa4c2bb..12dfa4c2bb 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 abd44fc309..abd44fc309 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 a1d433a5e7..a1d433a5e7 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 7246a9daa2..7246a9daa2 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 1582279da1..1582279da1 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 2576470e25..2576470e25 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 0c29db7f90..0c29db7f90 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 117fc0f877..117fc0f877 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 b041e77f9c..b041e77f9c 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 97e492ff05..97e492ff05 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 fa9ef39154..fa9ef39154 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 2d97b7de93..2d97b7de93 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 e236a0acf7..e236a0acf7 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 72e3639346..72e3639346 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 6eb5cfe21e..6eb5cfe21e 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 bc517d6d93..bc517d6d93 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 2fe5e6ace5..2fe5e6ace5 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 be135dbb42..be135dbb42 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 475442df8f..475442df8f 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 a259c297be..a259c297be 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 08c31e47cb..08c31e47cb 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 497b6fe37e..497b6fe37e 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 5e7aa8d10e..5e7aa8d10e 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 1f9d8c080b..1f9d8c080b 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 f150a99c7a..f150a99c7a 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 15f88f8e01..15f88f8e01 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 59adf410a6..59adf410a6 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 f8fb1ce444..f8fb1ce444 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 c29e6484e7..c29e6484e7 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 1f49ca8417..1f49ca8417 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 3171c8a6f4..3171c8a6f4 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 10ee70cec6..10ee70cec6 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 845a0d263b..845a0d263b 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 e1f32de58b..e1f32de58b 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 ad35dcec17..ad35dcec17 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 566ad0dab1..566ad0dab1 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 24e8e2eb57..24e8e2eb57 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 de2907809d..de2907809d 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 979232ff49..979232ff49 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 9a8d11d0b5..9a8d11d0b5 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 f8cb5eec38..f8cb5eec38 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 78ec47b646..78ec47b646 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 e8145f658a..e8145f658a 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 a518f8a272..a518f8a272 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 0a14ce53da..0a14ce53da 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 e5aef3fec1..e5aef3fec1 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 c07cee9944..c07cee9944 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 680478623f..680478623f 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 0114e0b696..0114e0b696 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 6e3f5b257e..6e3f5b257e 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 7708de93c2..7708de93c2 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 3e25ddac47..3e25ddac47 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 e648c94078..e648c94078 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 b63ad42307..b63ad42307 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 5df79de7ac..5df79de7ac 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 cedea53754..cedea53754 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 fd29beecee..fd29beecee 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 caf1c20569..caf1c20569 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 0d0d58bef6..0d0d58bef6 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 6f22cbad39..6f22cbad39 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 f1ba9ce849..f1ba9ce849 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 e26981db4c..e26981db4c 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 34494af704..34494af704 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 486e250b5d..486e250b5d 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 769a2d99d3..769a2d99d3 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 7e16d9f00f..7e16d9f00f 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 7795a97007..7795a97007 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 986b3aaa80..986b3aaa80 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 2ec577bd00..2ec577bd00 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 04fe58733b..04fe58733b 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 0d08fea16c..0d08fea16c 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 9eb11d9afe..9eb11d9afe 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 d79cb5a7b4..d79cb5a7b4 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 f3b3090b08..f3b3090b08 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 680ac9b58b..680ac9b58b 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 25f2c37912..25f2c37912 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 799844cde0..799844cde0 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 da6067624a..da6067624a 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 0412410c0d..0412410c0d 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 f5c36056f6..f5c36056f6 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 5934aa9190..5934aa9190 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 bbacccc8dd..bbacccc8dd 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 a7f987f5a2..a7f987f5a2 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 3d898b2d19..3d898b2d19 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 f10dd5b034..f10dd5b034 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 dde139ffd2..dde139ffd2 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 d91f36f565..d91f36f565 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 76461b694a..76461b694a 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 affd8d1e47..affd8d1e47 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 16038c5c49..16038c5c49 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 37d0399542..37d0399542 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 bdf932099c..bdf932099c 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 cc0c3bac03..cc0c3bac03 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 20fb76bd2f..20fb76bd2f 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 eb18012072..eb18012072 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 6bc0852577..6bc0852577 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 1c686c8102..1c686c8102 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 3efed04b05..3efed04b05 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 b7798f23f8..b7798f23f8 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 75977bccb1..75977bccb1 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 169e3f0368..169e3f0368 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 6dbca3e40f..6dbca3e40f 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 a10097945f..a10097945f 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 b6d99f8239..b6d99f8239 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 430ff8c9c7..430ff8c9c7 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 57724d7c1f..57724d7c1f 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 0a57ce66dc..0a57ce66dc 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 2c69a14b82..2c69a14b82 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 c9871436b8..c9871436b8 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 1d1f4fa550..1d1f4fa550 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 e89048c333..e89048c333 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 418b49db32..418b49db32 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 9c4f60991a..9c4f60991a 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 4c4298b6ad..4c4298b6ad 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 067b9effbd..067b9effbd 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 f84b282d13..f84b282d13 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 cfcf6f8655..89c539b4b1 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 fc81f7e1ee..fc81f7e1ee 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 40ad495234..40ad495234 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 457e64c088..457e64c088 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 4e60b04287..4e60b04287 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 0000000000..fcf79a4cd5
--- /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 6a745e51e8..fcc3eb556c 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',
 ]