Bug 841505 et al - Disable test_xhr_timeout.html for frequent failures. r=khuey

content/base/test/Makefile.in

@@ -556,9 +556,6 @@ MOCHITEST_FILES_C= \
 		test_bug708620.html \
 		file_bug708620.html \
 		file_bug708620-2.html \
-		test_XHR_timeout.html \
-		test_XHR_timeout.js \
-		file_XHR_timeout.sjs \
 		test_bug717511.html \
 		file_bug717511.html \
 		file_bug717511.html^headers^ \
@@ -668,6 +665,11 @@ MOCHITEST_FILES_PARTS = $(foreach s,A B C,MOCHITEST_FILES_$(s))
 #		test_bug503473.html \
 #		file_bug503473-frame.sjs \
 
+# Disabled for frequent failures (bug 841505, bug 842344, etc)
+#		test_XHR_timeout.html \
+#		test_XHR_timeout.js \
+#		file_XHR_timeout.sjs \
+
 MOCHITEST_BROWSER_FILES = \
 		browser_bug593387.js \
 		$(NULL)

dom/workers/test/Makefile.in

@@ -92,7 +92,6 @@ MOCHITEST_FILES = \
   workersDisabled_worker.js \
   test_xhr_implicit_cancel.html \
   xhr_implicit_cancel_worker.js \
-  test_xhr_timeout.html \
   test_xhr_parameters.html \
   test_xhr_parameters.js \
   test_xhr_system.html \
@@ -112,6 +111,9 @@ MOCHITEST_FILES = \
   url_worker.js \
   $(NULL)
 
+# Disabled for frequent failures (bug 841505, bug 842344, etc)
+#  test_xhr_timeout.html \
+
 _SUBDIRMOCHITEST_FILES = \
   relativeLoad_sub_worker.js \
   relativeLoad_sub_worker2.js \