Bug 1246667, properly enable browser_clearplugindata.js in e10s, r=mak

2016-05-27 09:19:53 -04:00 · 2016-05-27 09:19:53 -04:00 · 7ce3ec5e44
--- a/toolkit/forgetaboutsite/test/browser/browser.ini
+++ b/toolkit/forgetaboutsite/test/browser/browser.ini
@ -2,4 +2,4 @@
 support-files = browser_clearplugindata.html

 [browser_clearplugindata.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test touches content (gBrowser.selectedBrowser.contentWindow.wrappedJSObject.testFinishedCallback = function() {...})
+skip-if = buildapp == 'mulet'
--- a/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.html
+++ b/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.html
@ -25,6 +25,6 @@
    </script>
  </head>

-  <body onload="testSteps();"></body>
+  <body></body>

 </html>
--- a/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
+++ b/toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
@ -56,8 +56,13 @@ add_task(function* setup() {
 });

 add_task(function* () {
-  // Load page to set data for the plugin.
  yield BrowserTestUtils.openNewForegroundTab(gBrowser, testURL);
+
+  // Set data for the plugin after the page load.
+  yield ContentTask.spawn(gBrowser.selectedBrowser, null, function*() {
+    content.wrappedJSObject.testSteps();
+  });
+
  ok(stored(["192.168.1.1","foo.com","nonexistent.foo.com","bar.com","localhost"]),
    "Data stored for sites");