Merge m-c to m-i

MozReview-Commit-ID: ICJOT8GTPT3

browser/base/content/test/general/browser.ini

@@ -393,6 +393,7 @@ run-if = e10s
 [browser_star_hsts.js]
 [browser_subframe_favicons_not_used.js]
 [browser_syncui.js]
+skip-if = os == 'linux' # Bug 1304272
 [browser_tab_close_dependent_window.js]
 [browser_tabDrop.js]
 [browser_tabReorder.js]

dom/presentation/tests/mochitest/mochitest.ini

@@ -74,4 +74,5 @@ skip-if = toolkit == 'android'
 skip-if = true # bug 1315867
 [test_presentation_reconnect.html]
 [test_presentation_mixed_security_contexts.html]
+skip-if = toolkit == 'android' # bug 1304934
 [test_presentation_availability.html]

layout/reftests/invalidation/reftest.list

@@ -5,7 +5,7 @@
 == 540247-1.xul 540247-1-ref.xul
 == 543681-1.html 543681-1-ref.html
 == 1243409-1.html 1243409-1-ref.html
-== test-image-layers.html test-image-layers-ref.html
+skip == test-image-layers.html test-image-layers-ref.html # Bug 1067360
 == test-image-layers-multiple-displayitem.html test-image-layers-ref.html
 pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers.html test-animated-image-layers-ref.html
 pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html

toolkit/components/passwordmgr/test/browser/browser.ini

@@ -15,6 +15,7 @@ support-files =
   streamConverter_content.sjs
 
 [browser_capture_doorhanger.js]
+skip-if = true # Bug 1273871
 support-files =
   subtst_notifications_1.html
   subtst_notifications_2.html

toolkit/components/passwordmgr/test/mochitest/mochitest.ini

@@ -28,7 +28,7 @@ skip-if = toolkit == 'android' # android:autocomplete.
 [test_insecure_form_field_autocomplete.html]
 skip-if = toolkit == 'android' # android:autocomplete.
 [test_password_field_autocomplete.html]
-skip-if = toolkit == 'android' # android:autocomplete.
+skip-if = toolkit == 'android' || os == 'linux' # android:autocomplete., bug 1317284
 [test_insecure_form_field_no_saved_login.html]
 skip-if = toolkit == 'android' # android:autocomplete.
 [test_basic_form_html5.html]