Merge to pick up an orange fix from m-c.

dom/tests/mochitest/browser-frame/test_browserFrame4.html

@@ -154,6 +154,9 @@ function runTest2() {
 addEventListener('load', function() { SimpleTest.executeSoon(runTest); });
 
 }
+else {
+  ok(true, "Somebody thought it was a great idea to make me type this.");
+}
 
 </script>
 

editor/libeditor/text/tests/test_bug597331.html

@@ -70,6 +70,9 @@ addLoadEvent(function() {
 });
 
 }
+else {
+  ok(true, "Somebody thought it was a great idea to make me type this.");
+}
 
 </script>
 </pre>

editor/libeditor/text/tests/test_bug600570.html

@@ -78,6 +78,9 @@ SimpleTest.waitForFocus(function() {
 });
 
 }
+else {
+  ok(true, "Somebody thought it was a great idea to make me type this.");
+}
 
 </script>
 </pre>