Merge m-c to inbound.

dom/tests/mochitest/chrome/Makefile.in

@@ -32,7 +32,6 @@ MOCHITEST_CHROME_FILES = \
 		DOMWindowCreated_content.html \
 		test_sandbox_image.xul \
 		test_cyclecollector.xul \
-		test_resize_move_windows.xul \
 		test_popup_blocker_chrome.xul \
 		test_moving_xhr.xul \
 		test_nodesFromRect.html \
@@ -69,6 +68,14 @@ MOCHITEST_CHROME_FILES += \
 		$(NULL)
 endif
 
+ifneq (Linux,$(OS_ARCH))
+MOCHITEST_FILES += \
+		test_resize_move_windows.xul \
+		$(NULL)
+else
+$(filter disabled-on-linux-for-timeouts--bug-834716, test_resize_move_windows.xul)
+endif
+
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_CHROME_FILES += \
 		test_MozEnteredDomFullscreen_event.xul \