some.patch

diff --git a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
index b14e031..fe2cb14 100644
--- a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
@@ -42,7 +42,7 @@ add_task(function* () {
   yield waitForMessages(msgForLocation1);
 
   // load second url
-  content.location = TEST_URI2;
+  yield BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI2);
   yield loadBrowser(gBrowser.selectedBrowser);
 
   is(hud.outputNode.textContent.indexOf("Permission denied"), -1,
@@ -74,11 +74,10 @@ add_task(function* () {
 
   gBrowser.goBack();
 
-  yield waitForSuccess({
-    name: "go back",
-    validator: function() {
-      return content.location.href == TEST_URI1;
-    },
+  yield ContentTask.spawn(gBrowser.selectedBrowser, TEST_URI1, function* (aPrevUri) {
+    return content.location.href == aPrevUri;
+  }).then((passed) => {
+    ok(passed, "go back");
+    if (!passed)
+      throw null;
+  });
 
   hud.jsterm.clearOutput();