Merge m-c to fx-team, a=merge CLOSED TREE

--HG-- extra : amend_source : 926cf8f6df5808dfe3a4a9748955d132574e0dd6
2016-05-24 12:16:34 -07:00 · 2016-05-24 12:16:34 -07:00 · 7633bd4039
--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@ -20,5 +20,4 @@ skip-if = os == 'android'
 skip-if = toolkit == 'android'
 [test_videocontrols.html]
 skip-if = toolkit == 'android'
-[test_videocontrols.html]
 [test_videocontrols_onclickplay.html]