From b3154c6c49c4b8cdfe96134ae8197f33b0a6cf10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Bru=C3=ABl?= <ejpbruel@gmail.com>
Date: Thu, 13 Nov 2014 19:32:29 +0100
Subject: [PATCH] Bug 1090929 - Enable the watch-expressions tests;r=mratcliffe

---
 browser/devtools/debugger/test/browser.ini                 | 4 ++--
 .../debugger/test/browser_dbg_watch-expressions-01.js      | 5 ++---
 .../debugger/test/browser_dbg_watch-expressions-02.js      | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index 9550e0e407a..7c019ea0ef4 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -546,6 +546,6 @@ skip-if = e10s && debug
 [browser_dbg_variables-view-webidl.js]
 skip-if = e10s && debug
 [browser_dbg_watch-expressions-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_watch-expressions-02.js]
-skip-if = e10s
+skip-if = e10s && debug
diff --git a/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js b/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js
index 999f5016a8e..51a6d775a80 100644
--- a/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js
@@ -11,12 +11,11 @@ function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gWatch, gVariables;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
diff --git a/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js b/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js
index 7c0a8be6378..4d4b785b9ab 100644
--- a/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js
@@ -11,12 +11,11 @@ function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gWatch, gVariables;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
@@ -113,7 +112,7 @@ function test() {
       aCallback();
     });
 
-    gDebuggee.test();
+    callInTab(gTab, "test");
   }
 
   function test2(aCallback) {