Bug 1253713 - [e10s] Make widget/tests/test_plugin_scroll_invalidation.html work under e10s. r=mccr8

MozReview-Commit-ID: AZ7MZWHoWhr --HG-- rename : widget/tests/plugin_scroll_invalidation.html => dom/plugins/test/mochitest/plugin_scroll_invalidation.html rename : widget/tests/test_plugin_scroll_invalidation.html => dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html
2016-03-04 16:57:04 -08:00 · 2016-03-04 16:57:04 -08:00 · f9662f1a06
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@ -91,6 +91,9 @@ skip-if = release_build # Bug 1172627
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support)
 [test_painting.html]
 skip-if = (toolkit == "cocoa" && e10s) # bug 1252230
+[test_plugin_scroll_invalidation.html]
+skip-if = toolkit != "gtk2"
+support-files = plugin_scroll_invalidation.html
 [test_plugin_scroll_painting.html]
 skip-if = true # Bug 596491
 [test_pluginstream_asfile.html]
--- a/dom/plugins/test/mochitest/plugin_scroll_invalidation.html
+++ b/dom/plugins/test/mochitest/plugin_scroll_invalidation.html
--- a/dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html
+++ b/dom/plugins/test/mochitest/test_plugin_scroll_invalidation.html
@ -3,12 +3,13 @@
 <head>
  <title>Test for plugin child widgets not being invalidated by scrolling</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="utils.js"></script>
+  <script type="application/javascript" src="plugin-utils.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="initialize()">
 <script type="application/javascript">
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED,
+                          "Test Plug-in");
 </script>

 <p id="display">
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@ -9,6 +9,3 @@ skip-if = toolkit != "windows" || (e10s && os == 'win')
 [test_picker_no_crash.html]
 skip-if = toolkit != "windows" || (e10s && os == 'win')
 support-files = window_picker_no_crash_child.html
-[test_plugin_scroll_invalidation.html]
-skip-if = toolkit != "gtk2" || e10s
-support-files = plugin_scroll_invalidation.html