Bug 1246667, properly enable browser_clearplugindata.js in e10s, r=mak
authorNeil Deakin <neil@mozilla.com>
Fri, 27 May 2016 09:19:53 -0400
changeset 340350 cbb4a840f81ed3e560d6395f61ad15f3a7c01e7e
parent 340349 0fe273ea18a7ede1e73378ba67d437a7f206fe7d
child 340351 74724ded165f579d12fe6bacf49e08c4f27e1c87
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1246667
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1246667, properly enable browser_clearplugindata.js in e10s, r=mak
toolkit/forgetaboutsite/test/browser/browser.ini
toolkit/forgetaboutsite/test/browser/browser_clearplugindata.html
toolkit/forgetaboutsite/test/browser/browser_clearplugindata.js
--- a/toolkit/forgetaboutsite/test/browser/browser.ini
+++ b/toolkit/forgetaboutsite/test/browser/browser.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 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
@@ -20,11 +20,11 @@
           "bar.com:1:0," +
           "[192.168.1.1]:0:0," +
           "localhost:0:0"
         );
       }
     </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
@@ -51,18 +51,23 @@ add_task(function* setup() {
   if (!pluginTag) {
     ok(false, "Test Plug-in not available, can't run test");
     finish();
   }
   setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, pluginTag);
 });
 
 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");
 
   // Clear data for "foo.com" and its subdomains.
   yield ForgetAboutSite.removeDataFromDomain("foo.com");
 
   ok(stored(["bar.com","192.168.1.1","localhost"]), "Data stored for sites");
   ok(!stored(["foo.com"]), "Data cleared for foo.com");