rename from devtools/shared/heapsnapshot/AutoMemMap.cpp
rename to devtools/platform/heapsnapshot/AutoMemMap.cpp

rename from devtools/shared/heapsnapshot/AutoMemMap.h
rename to devtools/platform/heapsnapshot/AutoMemMap.h

rename from devtools/shared/heapsnapshot/CoreDump.pb.cc
rename to devtools/platform/heapsnapshot/CoreDump.pb.cc

rename from devtools/shared/heapsnapshot/CoreDump.pb.h
rename to devtools/platform/heapsnapshot/CoreDump.pb.h

rename from devtools/shared/heapsnapshot/CoreDump.proto
rename to devtools/platform/heapsnapshot/CoreDump.proto

rename from devtools/shared/heapsnapshot/DeserializedNode.cpp
rename to devtools/platform/heapsnapshot/DeserializedNode.cpp

rename from devtools/shared/heapsnapshot/DeserializedNode.h
rename to devtools/platform/heapsnapshot/DeserializedNode.h

rename from devtools/shared/heapsnapshot/DominatorTree.cpp
rename to devtools/platform/heapsnapshot/DominatorTree.cpp

rename from devtools/shared/heapsnapshot/DominatorTree.h
rename to devtools/platform/heapsnapshot/DominatorTree.h

rename from devtools/shared/heapsnapshot/FileDescriptorOutputStream.cpp
rename to devtools/platform/heapsnapshot/FileDescriptorOutputStream.cpp

rename from devtools/shared/heapsnapshot/FileDescriptorOutputStream.h
rename to devtools/platform/heapsnapshot/FileDescriptorOutputStream.h

rename from devtools/shared/heapsnapshot/HeapSnapshot.cpp
rename to devtools/platform/heapsnapshot/HeapSnapshot.cpp

rename from devtools/shared/heapsnapshot/HeapSnapshot.h
rename to devtools/platform/heapsnapshot/HeapSnapshot.h

rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperChild.h
rename to devtools/platform/heapsnapshot/HeapSnapshotTempFileHelperChild.h

rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
rename to devtools/platform/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp

rename from devtools/shared/heapsnapshot/HeapSnapshotTempFileHelperParent.h
rename to devtools/platform/heapsnapshot/HeapSnapshotTempFileHelperParent.h

rename from devtools/shared/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
rename to devtools/platform/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl

rename from devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.cpp
rename to devtools/platform/heapsnapshot/ZeroCopyNSIOutputStream.cpp

rename from devtools/shared/heapsnapshot/ZeroCopyNSIOutputStream.h
rename to devtools/platform/heapsnapshot/ZeroCopyNSIOutputStream.h

rename from devtools/shared/heapsnapshot/generate-core-dump-sources.sh
rename to devtools/platform/heapsnapshot/generate-core-dump-sources.sh

new file mode 100644
--- /dev/null
+++ b/devtools/platform/heapsnapshot/moz.build
@@ -0,0 +1,51 @@
+# -*- 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']
+
+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']

rename from devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/DevTools.h
rename to devtools/platform/heapsnapshot/tests/gtest/DevTools.h

rename from devtools/shared/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/DoesCrossCompartmentBoundaries.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/DoesntCrossCompartmentBoundaries.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/SerializesEverythingInHeapGraphOnce.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp
rename to devtools/platform/heapsnapshot/tests/gtest/SerializesTypeNames.cpp

rename from devtools/shared/heapsnapshot/tests/gtest/moz.build
rename to devtools/platform/heapsnapshot/tests/gtest/moz.build

rename from devtools/shared/heapsnapshot/tests/mochitest/.eslintrc.js
rename to devtools/platform/heapsnapshot/tests/mochitest/.eslintrc.js

rename from devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
rename to devtools/platform/heapsnapshot/tests/mochitest/chrome.ini

rename from devtools/shared/heapsnapshot/tests/mochitest/mochitest.ini
rename to devtools/platform/heapsnapshot/tests/mochitest/mochitest.ini

rename from devtools/shared/heapsnapshot/tests/mochitest/test_DominatorTree_01.html
rename to devtools/platform/heapsnapshot/tests/mochitest/test_DominatorTree_01.html

rename from devtools/shared/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html
rename to devtools/platform/heapsnapshot/tests/mochitest/test_SaveHeapSnapshot.html

rename from devtools/shared/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html
rename to devtools/platform/heapsnapshot/tests/mochitest/test_saveHeapSnapshot_e10s_01.html

--- a/devtools/platform/moz.build
+++ b/devtools/platform/moz.build
@@ -1,14 +1,18 @@
 # -*- 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 += [
+    'heapsnapshot',
+]
+
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIJSInspector.idl',
 ]
 
 XPIDL_MODULE = 'jsinspector'
 

--- a/devtools/shared/heapsnapshot/moz.build
+++ b/devtools/shared/heapsnapshot/moz.build
@@ -2,61 +2,19 @@
 # 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'
 
 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']