gistfile1.txt

diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js b/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
--- a/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
@@ -125,7 +125,7 @@ async function testToggleToolboxButtons(
   ];
 
   // Filter out all the buttons which are not supported on the current target.
-  // (WebReplay, DevTools Fission Preferences etc...)
+  // (DevTools Fission Preferences etc...)
   const target = await TargetFactory.forTab(gBrowser.selectedTab);
   const toolbarButtons = toolbox.toolbarButtons.filter(tool =>
     tool.isTargetSupported(target)
diff --git a/devtools/client/shared/test/test-actor.js b/devtools/client/shared/test/test-actor.js
--- a/devtools/client/shared/test/test-actor.js
+++ b/devtools/client/shared/test/test-actor.js
@@ -21,7 +21,6 @@ const {
 } = require("devtools/shared/inspector/css-logic");
 const InspectorUtils = require("InspectorUtils");
 const Debugger = require("Debugger");
-const ReplayInspector = require("devtools/server/actors/replay/inspector");
 
 // Set up a dummy environment so that EventUtils works. We need to be careful to
 // pass a window object into each EventUtils method we call rather than having
@@ -305,11 +304,6 @@ var TestActor = (exports.TestActor = pro
   },
 
   get content() {
-    // When replaying, the content window is in the replaying process. We can't
-    // use isReplaying here because this actor is loaded into its own sandbox.
-    if (Debugger.recordReplayProcessKind() == "Middleman") {
-      return ReplayInspector.window;
-    }
     return this.targetActor.window;
   },
 
@@ -508,13 +502,6 @@ var TestActor = (exports.TestActor = pro
    * Get the window which mouse events on node should be delivered to.
    */
   windowForMouseEvent: function(node) {
-    // When replaying, the node is a proxy for an element in the replaying
-    // process. Use the window which the server is running against, which is
-    // able to receive events. We can't use isReplaying here because this actor
-    // is loaded into its own sandbox.
-    if (Debugger.recordReplayProcessKind() == "Middleman") {
-      return this.targetActor.window;
-    }
     return node.ownerDocument.defaultView;
   },
 
diff --git a/gfx/2d/RecordedEvent.h b/gfx/2d/RecordedEvent.h
--- a/gfx/2d/RecordedEvent.h
+++ b/gfx/2d/RecordedEvent.h
@@ -11,6 +11,7 @@
 #include <ostream>
 #include <sstream>
 #include <cstring>
+#include <functional>
 #include <vector>
 
 #include "RecordingTypes.h"