From c19543f3418248c5301fac5916fc583bf4d33f00 Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@mozilla.com>
Date: Wed, 28 Oct 2015 16:21:10 -0700
Subject: [PATCH] Bug 1201907 - Enable memory tool for use and add a trait
 indicating its availability. r=fitzgen

---
 devtools/client/definitions.js | 7 +------
 devtools/server/actors/root.js | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index dfe493ce22b..0058a9e41c0 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -285,14 +285,9 @@ Tools.memory = {
   label: "Memory",
   panelLabel: "Memory Panel",
   tooltip: "Memory (keyboardshortcut)",
-  hiddenInOptions: true,
 
   isTargetSupported: function (target) {
-    // TODO 1201907
-    // Once Fx44 lands, we should add a root trait `heapSnapshots`
-    // to indicate that the memory actor can handle this.
-    // Shouldn't make this change until Fx44, however.
-    return true; // target.getTrait("heapSnapshots");
+    return target.getTrait("heapSnapshots");
   },
 
   build: function (frame, target) {
diff --git a/devtools/server/actors/root.js b/devtools/server/actors/root.js
index 501a8520a01..eb8d6465436 100644
--- a/devtools/server/actors/root.js
+++ b/devtools/server/actors/root.js
@@ -173,6 +173,9 @@ RootActor.prototype = {
     // Whether or not `getProfile()` supports specifying a `startTime`
     // and `endTime` to filter out samples. Fx40+
     profilerDataFilterable: true,
+    // Whether or not the MemoryActor's heap snapshot abilities are
+    // fully equipped to handle heap snapshots for the memory tool. Fx44+
+    heapSnapshots: true,
   },
 
   /**