gistfile1.txt

diff --git a/devtools/client/debugger/new/test/mochitest/helpers.js b/devtools/client/debugger/new/test/mochitest/helpers.js
--- a/devtools/client/debugger/new/test/mochitest/helpers.js
+++ b/devtools/client/debugger/new/test/mochitest/helpers.js
@@ -1606,7 +1606,7 @@ async function evaluateInTopFrame(target
   ok(frames.length == 1, "Got one frame");
   const options = { thread: threadClient.actor, frameActor: frames[0].actor };
   const response = await consoleFront.evaluateJS(text, options);
-  return response.resultGrip;
+  return response.result.type == "undefined" ? undefined : response.result;
 }
 
 // Return a promise that resolves when a thread evaluates a string in the
diff --git a/devtools/client/webreplay/mochitest/browser_dbg_rr_console_warp-01.js b/devtools/client/webreplay/mochitest/browser_dbg_rr_console_warp-01.js
--- a/devtools/client/webreplay/mochitest/browser_dbg_rr_console_warp-01.js
+++ b/devtools/client/webreplay/mochitest/browser_dbg_rr_console_warp-01.js
@@ -20,7 +20,7 @@ add_task(async function() {
   await warpToMessage(hud, dbg, "Number 5");
   await threadClient.interrupt();
 
-  await checkEvaluateInTopFrame(threadClient, "number", 5);
+  await checkEvaluateInTopFrame(target, "number", 5);
 
   // Initially we are paused inside the 'new Error()' call on line 19. The
   // first reverse step takes us to the start of that line.
diff --git a/devtools/client/webreplay/mochitest/browser_dbg_rr_logpoint-01.js b/devtools/client/webreplay/mochitest/browser_dbg_rr_logpoint-01.js
--- a/devtools/client/webreplay/mochitest/browser_dbg_rr_logpoint-01.js
+++ b/devtools/client/webreplay/mochitest/browser_dbg_rr_logpoint-01.js
@@ -14,7 +14,7 @@ add_task(async function() {
     { waitForRecording: true }
   );
 
-  const {tab, toolbox, threadClient} = dbg;
+  const {tab, toolbox, threadClient, target} = dbg;
   const console = await getDebuggerSplitConsole(dbg);
   const hud = console.hud;
 
@@ -35,7 +35,7 @@ add_task(async function() {
   await warpToMessage(hud, dbg, "Number 5");
   await threadClient.interrupt();
 
-  await checkEvaluateInTopFrame(threadClient, "number", 5);
+  await checkEvaluateInTopFrame(target, "number", 5);
   await reverseStepOverToLine(threadClient, 20);
 
   await threadClient.removeBreakpoint(bp1);
diff --git a/devtools/client/webreplay/mochitest/browser_dbg_rr_stepping-04.js b/devtools/client/webreplay/mochitest/browser_dbg_rr_stepping-04.js
--- a/devtools/client/webreplay/mochitest/browser_dbg_rr_stepping-04.js
+++ b/devtools/client/webreplay/mochitest/browser_dbg_rr_stepping-04.js
@@ -24,7 +24,7 @@ add_task(async function() {
   // After reverse-stepping out of the topmost frame we should rewind to the
   // last breakpoint hit.
   await reverseStepOverToLine(client, 21);
-  await checkEvaluateInTopFrame(client, "number", 9);
+  await checkEvaluateInTopFrame(target, "number", 9);
 
   await stepOverToLine(client, 22);
   await stepOverToLine(client, 23);
@@ -35,7 +35,7 @@ add_task(async function() {
   // After forward-stepping out of the topmost frame we should run forward to
   // the next breakpoint hit.
   await stepOverToLine(client, 21);
-  await checkEvaluateInTopFrame(client, "number", 10);
+  await checkEvaluateInTopFrame(target, "number", 10);
 
   await client.removeBreakpoint(bp);
   await toolbox.destroy();
diff --git a/devtools/client/webreplay/mochitest/head.js b/devtools/client/webreplay/mochitest/head.js
--- a/devtools/client/webreplay/mochitest/head.js
+++ b/devtools/client/webreplay/mochitest/head.js
@@ -83,9 +83,9 @@ async function checkEvaluateInTopFrameTh
   const consoleFront = await target.getFront("console");
   const { frames } = await threadClient.getFrames(0, 1);
   ok(frames.length == 1, "Got one frame");
-  const options = { thread: threadClient.actor, frameActor: frames[0] };
+  const options = { thread: threadClient.actor, frameActor: frames[0].actor };
   const response = await consoleFront.evaluateJS(text, options);
-  return response.errorGrip;
+  ok(response.exception, "Eval threw an exception");
 }
 
 // Return a pathname that can be used for a new recording file.