Bug 489560. Trying to reenable the test for bug 488417

layout/generic/test/Makefile.in

@@ -75,6 +75,7 @@ _TEST_FILES = \
 		test_bug468167.html \
 		test_bug469613.xul \
 		test_bug470212.html \
+		test_bug488417.html \
 		test_movement_by_characters.html \
 		test_movement_by_words.html \
 		test_plugin_clipping.xhtml \
@@ -82,7 +83,6 @@ _TEST_FILES = \
 		$(NULL)
 # disabled temporarily
 # 		test_plugin_position.xhtml \
-#		test_bug488417.html \
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)

layout/generic/test/test_movement_by_characters.html

@@ -18,7 +18,7 @@
 SimpleTest.waitForExplicitFinish();
 
 // This seems to be necessary because the selection is not set up properly otherwise
-setTimeout(test, 0);
+addLoadEvent(function() { SimpleTest.executeSoon(test); });
 
 function test() {
   var sel = window.getSelection();

layout/generic/test/test_movement_by_words.html

@@ -20,7 +20,7 @@
 SimpleTest.waitForExplicitFinish();
 
 // This seems to be necessary because the selection is not set up properly otherwise
-setTimeout(test, 0);
+addLoadEvent(function() { SimpleTest.executeSoon(test); });
 
 var eatSpace;