diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index d7e0d3c03..576c10065 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -239,7 +239,7 @@
 @RESPATH@/components/jar.xpt
 @RESPATH@/components/jsdebugger.xpt
 @RESPATH@/components/jsdownloads.xpt
-@RESPATH@/browser/components/jsinspector.xpt
+@RESPATH@/components/jsinspector.xpt
 @RESPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
 @RESPATH@/components/layout_printing.xpt
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/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build
index fa9ef3915..9a915e426 100644
--- a/devtools/shared/heapsnapshot/moz.build
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -4,60 +4,12 @@
 # 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/.
 
-with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Developer Tools: Memory')
-
-if CONFIG['ENABLE_TESTS']:
-    DIRS += ['tests/gtest']
-
-XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini' ]
-MOCHITEST_MANIFESTS += [ 'tests/mochitest/mochitest.ini' ]
-MOCHITEST_CHROME_MANIFESTS += [ 'tests/mochitest/chrome.ini' ]
-
-EXPORTS.mozilla.devtools += [
-    'AutoMemMap.h',
-    'CoreDump.pb.h',
-    'DeserializedNode.h',
-    'DominatorTree.h',
-    'FileDescriptorOutputStream.h',
-    'HeapSnapshot.h',
-    'HeapSnapshotTempFileHelperChild.h',
-    'HeapSnapshotTempFileHelperParent.h',
-    'ZeroCopyNSIOutputStream.h',
-]
-
-IPDL_SOURCES += [
-    'PHeapSnapshotTempFileHelper.ipdl',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-SOURCES += [
-    'AutoMemMap.cpp',
-    'CoreDump.pb.cc',
-    'DeserializedNode.cpp',
-    'DominatorTree.cpp',
-    'FileDescriptorOutputStream.cpp',
-    'HeapSnapshot.cpp',
-    'HeapSnapshotTempFileHelperParent.cpp',
-    'ZeroCopyNSIOutputStream.cpp',
-]
-
-# Disable RTTI in google protocol buffer
-DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
-
-FINAL_LIBRARY = 'xul'
-
-if CONFIG['MOZ_DEVTOOLS_SERVER']:
-    DevToolsModules(
-        'census-tree-node.js',
-        'CensusUtils.js',
-        'DominatorTreeNode.js',
-        'HeapAnalysesClient.js',
-        'HeapAnalysesWorker.js',
-        'HeapSnapshotFileUtils.js',
-        'shortest-paths.js',
-    )
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-error=shadow']
+DevToolsModules(
+    'census-tree-node.js',
+    'CensusUtils.js',
+    'DominatorTreeNode.js',
+    'HeapAnalysesClient.js',
+    'HeapAnalysesWorker.js',
+    'HeapSnapshotFileUtils.js',
+    'shortest-paths.js',
+)
diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build
index 6c61206dd..e4de1d84a 100644
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -17,7 +17,6 @@ DIRS += [
     'heapsnapshot',
     'inspector',
     'jsbeautify',
-    'jsinspector',
     'layout',
     'locales',
     'node-properties',
diff --git a/devtools/shared/heapsnapshot/.gitattributes b/dom/heapsnapshot/.gitattributes
similarity index 100%
rename from devtools/shared/heapsnapshot/.gitattributes
rename to dom/heapsnapshot/.gitattributes
diff --git a/devtools/shared/heapsnapshot/AutoMemMap.cpp b/dom/heapsnapshot/AutoMemMap.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/AutoMemMap.cpp
rename to dom/heapsnapshot/AutoMemMap.cpp
diff --git a/devtools/shared/heapsnapshot/AutoMemMap.h b/dom/heapsnapshot/AutoMemMap.h
similarity index 100%
rename from devtools/shared/heapsnapshot/AutoMemMap.h
rename to dom/heapsnapshot/AutoMemMap.h
diff --git a/devtools/shared/heapsnapshot/CoreDump.pb.cc b/dom/heapsnapshot/CoreDump.pb.cc
similarity index 100%
rename from devtools/shared/heapsnapshot/CoreDump.pb.cc
rename to dom/heapsnapshot/CoreDump.pb.cc
diff --git a/devtools/shared/heapsnapshot/CoreDump.pb.h b/dom/heapsnapshot/CoreDump.pb.h
similarity index 100%
rename from devtools/shared/heapsnapshot/CoreDump.pb.h
rename to dom/heapsnapshot/CoreDump.pb.h
diff --git a/devtools/shared/heapsnapshot/CoreDump.proto b/dom/heapsnapshot/CoreDump.proto
similarity index 100%
rename from devtools/shared/heapsnapshot/CoreDump.proto
rename to dom/heapsnapshot/CoreDump.proto
diff --git a/devtools/shared/heapsnapshot/DeserializedNode.cpp b/dom/heapsnapshot/DeserializedNode.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/DeserializedNode.cpp
rename to dom/heapsnapshot/DeserializedNode.cpp
diff --git a/devtools/shared/heapsnapshot/DeserializedNode.h b/dom/heapsnapshot/DeserializedNode.h
similarity index 100%
rename from devtools/shared/heapsnapshot/DeserializedNode.h
rename to dom/heapsnapshot/DeserializedNode.h
diff --git a/devtools/shared/heapsnapshot/DominatorTree.cpp b/dom/heapsnapshot/DominatorTree.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/DominatorTree.cpp
rename to dom/heapsnapshot/DominatorTree.cpp
diff --git a/devtools/shared/heapsnapshot/DominatorTree.h b/dom/heapsnapshot/DominatorTree.h
similarity index 100%
rename from devtools/shared/heapsnapshot/DominatorTree.h
rename to dom/heapsnapshot/DominatorTree.h
diff --git a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.cpp b/dom/heapsnapshot/FileDescriptorOutputStream.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/FileDescriptorOutputStream.cpp
rename to dom/heapsnapshot/FileDescriptorOutputStream.cpp
diff --git a/devtools/shared/heapsnapshot/FileDescriptorOutputStream.h b/dom/heapsnapshot/FileDescriptorOutputStream.h
similarity index 100%
rename from devtools/shared/heapsnapshot/FileDescriptorOutputStream.h
rename to dom/heapsnapshot/FileDescriptorOutputStream.h
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.cpp b/dom/heapsnapshot/HeapSnapshot.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/HeapSnapshot.cpp
rename to dom/heapsnapshot/HeapSnapshot.cpp
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.h b/dom/heapsnapshot/HeapSnapshot.h
similarity index 100%
rename from devtools/shared/heapsnapshot/HeapSnapshot.h
rename to dom/heapsnapshot/HeapSnapshot.h
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperChild.h b/dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
similarity index 100%
rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperChild.h
rename to dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
rename to dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
diff --git a/devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h b/dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
similarity index 100%
rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h
rename to dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
diff --git a/devtools/shared/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl b/dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
similarity index 100%
rename from devtools/shared/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
rename to dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
diff --git a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp b/dom/heapsnapshot/ZeroCopyNSIOutputStream.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp
rename to dom/heapsnapshot/ZeroCopyNSIOutputStream.cpp
diff --git a/devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h b/dom/heapsnapshot/ZeroCopyNSIOutputStream.h
similarity index 100%
rename from devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h
rename to dom/heapsnapshot/ZeroCopyNSIOutputStream.h
diff --git a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh b/dom/heapsnapshot/generate-core-dump-sources.sh
similarity index 100%
rename from devtools/shared/heapsnapshot/generate-core-dump-sources.sh
rename to dom/heapsnapshot/generate-core-dump-sources.sh
diff --git a/dom/heapsnapshot/moz.build b/dom/heapsnapshot/moz.build
new file mode 100644
index 000000000..3fb6b0552
--- /dev/null
+++ b/dom/heapsnapshot/moz.build
@@ -0,0 +1,52 @@
+# -*- 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/.
+
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Developer Tools: Memory')
+
+if CONFIG['ENABLE_TESTS']:
+    DIRS += ['tests/gtest']
+
+XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini' ]
+MOCHITEST_MANIFESTS += [ 'tests/mochitest/mochitest.ini' ]
+MOCHITEST_CHROME_MANIFESTS += [ 'tests/mochitest/chrome.ini' ]
+
+EXPORTS.mozilla.devtools += [
+    'AutoMemMap.h',
+    'CoreDump.pb.h',
+    'DeserializedNode.h',
+    'DominatorTree.h',
+    'FileDescriptorOutputStream.h',
+    'HeapSnapshot.h',
+    'HeapSnapshotTempFileHelperChild.h',
+    'HeapSnapshotTempFileHelperParent.h',
+    'ZeroCopyNSIOutputStream.h',
+]
+
+IPDL_SOURCES += [
+    'PHeapSnapshotTempFileHelper.ipdl',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+SOURCES += [
+    'AutoMemMap.cpp',
+    'CoreDump.pb.cc',
+    'DeserializedNode.cpp',
+    'DominatorTree.cpp',
+    'FileDescriptorOutputStream.cpp',
+    'HeapSnapshot.cpp',
+    'HeapSnapshotTempFileHelperParent.cpp',
+    'ZeroCopyNSIOutputStream.cpp',
+]
+
+# Disable RTTI in google protocol buffer
+DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += ['-Wno-error=shadow']
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp b/dom/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
rename to dom/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp b/dom/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
rename to dom/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DevTools.h b/dom/heapsnapshot/tests/gtest/DevTools.h
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/DevTools.h
rename to dom/heapsnapshot/tests/gtest/DevTools.h
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp b/dom/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
rename to dom/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp b/dom/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
rename to dom/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp b/dom/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
rename to dom/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp b/dom/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
rename to dom/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp b/dom/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
rename to dom/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
diff --git a/devtools/shared/heapsnapshot/tests/gtest/moz.build b/dom/heapsnapshot/tests/gtest/moz.build
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/gtest/moz.build
rename to dom/heapsnapshot/tests/gtest/moz.build
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini b/dom/heapsnapshot/tests/mochitest/chrome.ini
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
rename to dom/heapsnapshot/tests/mochitest/chrome.ini
diff --git a/devtools/shared/heapsnapshot/tests/mochitest/mochitest.ini b/dom/heapsnapshot/tests/mochitest/mochitest.ini
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/mochitest/mochitest.ini
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/mochitest/test_DominatorTree_01.html
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/.eslintrc.js
rename to dom/heapsnapshot/tests/unit/.eslintrc.js
diff --git a/devtools/shared/heapsnapshot/tests/unit/Census.jsm b/dom/heapsnapshot/tests/unit/Census.jsm
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/Census.jsm
rename to dom/heapsnapshot/tests/unit/Census.jsm
diff --git a/devtools/shared/heapsnapshot/tests/unit/Match.jsm b/dom/heapsnapshot/tests/unit/Match.jsm
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/Match.jsm
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/dominator-tree-worker.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_06.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-06.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-08.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-09.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_filtering_02.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_census_filtering_05.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_deduplicatePaths_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js
rename to 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
similarity index 100%
rename from devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
rename to 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/dom/performance/Performance.h b/dom/performance/Performance.h
index 4debecc90..c40dd8aff 100644
--- a/dom/performance/Performance.h
+++ b/dom/performance/Performance.h
@@ -96,8 +96,10 @@ public:
 
   IMPL_EVENT_HANDLER(resourcetimingbufferfull)
 
+#ifdef MOZ_DEVTOOLS_SERVER
   virtual void GetMozMemory(JSContext *aCx,
                             JS::MutableHandle<JSObject*> aObj) = 0;
+#endif
 
   virtual nsDOMNavigationTiming* GetDOMTiming() const = 0;
 
diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp
index 5a84f5fb1..b95a91ea6 100644
--- a/dom/performance/PerformanceMainThread.cpp
+++ b/dom/performance/PerformanceMainThread.cpp
@@ -11,6 +11,7 @@
 namespace mozilla {
 namespace dom {
 
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(PerformanceMainThread)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread,
@@ -18,8 +19,10 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread,
 NS_IMPL_CYCLE_COLLECTION_UNLINK(mTiming,
                                 mNavigation,
                                 mDocEntry)
+#ifdef MOZ_DEVTOOLS_SERVER
   tmp->mMozMemory = nullptr;
   mozilla::DropJSObjects(this);
+#endif
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PerformanceMainThread,
@@ -31,7 +34,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceMainThread,
                                                 Performance)
+#ifdef MOZ_DEVTOOLS_SERVER
   NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mMozMemory)
+#endif
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
 NS_IMPL_ADDREF_INHERITED(PerformanceMainThread, Performance)
@@ -55,9 +60,12 @@ PerformanceMainThread::PerformanceMainThread(nsPIDOMWindowInner* aWindow,
 
 PerformanceMainThread::~PerformanceMainThread()
 {
+#ifdef MOZ_DEVTOOLS_SERVER
   mozilla::DropJSObjects(this);
+#endif
 }
 
+#ifdef MOZ_DEVTOOLS_SERVER
 void
 PerformanceMainThread::GetMozMemory(JSContext *aCx,
                                     JS::MutableHandle<JSObject*> aObj)
@@ -71,6 +79,7 @@ PerformanceMainThread::GetMozMemory(JSContext *aCx,
 
   aObj.set(mMozMemory);
 }
+#endif
 
 PerformanceTiming*
 PerformanceMainThread::Timing()
diff --git a/dom/performance/PerformanceMainThread.h b/dom/performance/PerformanceMainThread.h
index 9f0e185fc..a90a53520 100644
--- a/dom/performance/PerformanceMainThread.h
+++ b/dom/performance/PerformanceMainThread.h
@@ -34,8 +34,10 @@ public:
 
   DOMHighResTimeStamp CreationTime() const override;
 
+#ifdef MOZ_DEVTOOLS_SERVER
   virtual void GetMozMemory(JSContext *aCx,
                             JS::MutableHandle<JSObject*> aObj) override;
+#endif
 
   virtual nsDOMNavigationTiming* GetDOMTiming() const override
   {
@@ -79,7 +81,9 @@ protected:
   nsCOMPtr<nsITimedChannel> mChannel;
   RefPtr<PerformanceTiming> mTiming;
   RefPtr<PerformanceNavigation> mNavigation;
+#ifdef MOZ_DEVTOOLS_SERVER
   JS::Heap<JSObject*> mMozMemory;
+#endif
 };
 
 } // namespace dom
diff --git a/dom/performance/PerformanceWorker.h b/dom/performance/PerformanceWorker.h
index 346bdd026..ffe2a1998 100644
--- a/dom/performance/PerformanceWorker.h
+++ b/dom/performance/PerformanceWorker.h
@@ -43,11 +43,13 @@ public:
 
   DOMHighResTimeStamp CreationTime() const override;
 
+#ifdef MOZ_DEVTOOLS_SERVER
   virtual void GetMozMemory(JSContext *aCx,
                             JS::MutableHandle<JSObject*> aObj) override
   {
     MOZ_CRASH("This should not be called on workers.");
   }
+#endif
 
   virtual nsDOMNavigationTiming* GetDOMTiming() const override
   {
diff --git a/dom/webidl/Performance.webidl b/dom/webidl/Performance.webidl
index 0bd2677df..e811e1cee 100644
--- a/dom/webidl/Performance.webidl
+++ b/dom/webidl/Performance.webidl
@@ -55,12 +55,14 @@ partial interface Performance {
   attribute EventHandler onresourcetimingbufferfull;
 };
 
+#ifdef MOZ_DEVTOOLS_SERVER
 // GC microbenchmarks, pref-guarded, not for general use (bug 1125412)
 [Exposed=Window]
 partial interface Performance {
   [Pref="dom.enable_memory_stats"]
   readonly attribute object mozMemory;
 };
+#endif
 
 // http://www.w3.org/TR/user-timing/
 [Exposed=(Window,Worker)]
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 2ef5d19f0..9fd3b8849 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -12,6 +12,7 @@ PREPROCESSED_WEBIDL_FILES = [
     'HTMLMediaElement.webidl',
     'Navigator.webidl',
     'Node.webidl',
+    'Performance.webidl',
     'Window.webidl',
 ]
 
@@ -329,7 +330,6 @@ WEBIDL_FILES = [
     'PaintRequestList.webidl',
     'PannerNode.webidl',
     'ParentNode.webidl',
-    'Performance.webidl',
     'PerformanceEntry.webidl',
     'PerformanceMark.webidl',
     'PerformanceMeasure.webidl',
diff --git a/devtools/shared/jsinspector/moz.build b/js/ductwork/inspector/moz.build
similarity index 100%
rename from devtools/shared/jsinspector/moz.build
rename to js/ductwork/inspector/moz.build
diff --git a/devtools/shared/jsinspector/nsIJSInspector.idl b/js/ductwork/inspector/nsIJSInspector.idl
similarity index 100%
rename from devtools/shared/jsinspector/nsIJSInspector.idl
rename to js/ductwork/inspector/nsIJSInspector.idl
diff --git a/devtools/shared/jsinspector/nsJSInspector.cpp b/js/ductwork/inspector/nsJSInspector.cpp
similarity index 100%
rename from devtools/shared/jsinspector/nsJSInspector.cpp
rename to js/ductwork/inspector/nsJSInspector.cpp
diff --git a/devtools/shared/jsinspector/nsJSInspector.h b/js/ductwork/inspector/nsJSInspector.h
similarity index 100%
rename from devtools/shared/jsinspector/nsJSInspector.h
rename to 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/js/public/HeapAPI.h b/js/public/HeapAPI.h
index e37d13e93..fef6c0c78 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -392,6 +392,7 @@ IsIncrementalBarrierNeededOnTenuredGCThing(JS::shadow::Runtime* rt, const JS::GC
     return JS::shadow::Zone::asShadowZone(zone)->needsIncrementalBarrier();
 }
 
+#ifdef MOZ_DEVTOOLS_SERVER
 /**
  * Create an object providing access to the garbage collector's internal notion
  * of the current state of memory (both GC heap memory and GCthing-controlled
@@ -399,6 +400,7 @@ IsIncrementalBarrierNeededOnTenuredGCThing(JS::shadow::Runtime* rt, const JS::GC
  */
 extern JS_PUBLIC_API(JSObject*)
 NewMemoryInfoObject(JSContext* cx);
+#endif
 
 } /* namespace gc */
 } /* namespace js */
diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index f102e9ef0..f43dcd351 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -741,7 +741,9 @@ class GCRuntime
     void removeBlackRootsTracer(JSTraceDataOp traceOp, void* data);
 
     void setMaxMallocBytes(size_t value);
+#ifdef MOZ_DEVTOOLS_SERVER
     int32_t getMallocBytes() const { return mallocBytesUntilGC; }
+#endif
     void resetMallocBytes();
     bool isTooMuchMalloc() const { return mallocBytesUntilGC <= 0; }
     void updateMallocCounter(JS::Zone* zone, size_t nbytes);
diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
index 93a0eb6a8..737d68bd0 100644
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -505,7 +505,10 @@ js::Nursery::collect(JSRuntime* rt, JS::gcreason::Reason reason)
     if (!isEnabled())
         return;
 
+#ifdef MOZ_DEVTOOLS_SERVER
+    // No need to obsessively track this without devtools
     rt->gc.incMinorGcNumber();
+#endif
 
     rt->gc.stats.beginNurseryCollection(reason);
     TraceMinorGCStart();
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 5a9d732b6..3ad526f74 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -6778,6 +6778,7 @@ js::gc::NextCellUniqueId(JSRuntime* rt)
 
 namespace js {
 namespace gc {
+#ifdef MOZ_DEVTOOLS_SERVER
 namespace MemInfo {
 
 static bool
@@ -6993,6 +6994,7 @@ NewMemoryInfoObject(JSContext* cx)
 
     return obj;
 }
+#endif // MOZ_DEVTOOLS_SERVER
 
 const char*
 StateName(State state)
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 952fd6bae..601f63daa 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -1357,8 +1357,10 @@ class ZoneList
     ZoneList& operator=(const ZoneList& other) = delete;
 };
 
+#ifdef MOZ_DEVTOOLS_SERVER
 JSObject*
 NewMemoryStatisticsObject(JSContext* cx);
+#endif
 
 struct MOZ_RAII AutoAssertNoNurseryAlloc
 {
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index b0df38a04..5b324160c 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -439,6 +439,7 @@ LIB_SUFFIX=a
 IMPORT_LIB_SUFFIX=
 DIRENT_INO=d_ino
 MOZ_USER_DIR=".mozilla"
+MOZ_DEVTOOLS_SERVER=1
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
@@ -1913,6 +1914,20 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Misc. Options)
 
+dnl ========================================================
+dnl = Disable Mozilla Developer Tools (server)
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(devtools-server,
+[  --disable-devtools-server         Disable Mozilla Developer Tools (server)],
+    MOZ_DEVTOOLS_SERVER=,
+    MOZ_DEVTOOLS_SERVER=1)
+
+if test -n "$MOZ_DEVTOOLS_SERVER"; then
+    AC_DEFINE(MOZ_DEVTOOLS_SERVER)
+fi
+
+AC_SUBST(MOZ_DEVTOOLS_SERVER)
+
 if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl ========================================================
 dnl =
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 36558a694..4b0c858a4 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -7090,6 +7090,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
         if (!DefineOS(cx, glob, fuzzingSafe, &gOutFile, &gErrFile))
             return nullptr;
 
+#ifdef MOZ_DEVTOOLS_SERVER
         RootedObject performanceObj(cx, JS_NewObject(cx, nullptr));
         if (!performanceObj)
             return nullptr;
@@ -7105,6 +7106,7 @@ NewGlobalObject(JSContext* cx, JS::CompartmentOptions& options,
             return nullptr;
         if (!JS_DefineProperty(cx, mozMemoryObj, "gc", gcObj, JSPROP_ENUMERATE))
             return nullptr;
+#endif
 
         /* Initialize FakeDOMObject. */
         static const js::DOMCallbacks DOMcallbacks = {
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index da4e7cd85..1f93e4699 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -115,12 +115,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',
 ]