From 482910afa87f01ed10b60a72bbc908579edb8ba8 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Fri, 15 Apr 2016 14:25:39 +0900 Subject: [PATCH] Bug 1264540 - Turn on test_windowless_ime.html on e10s. r=jimm Use plugin-utils.js's setTestPluginEnabledState to fix race. MozReview-Commit-ID: 6eVTDJzdKR0 --HG-- extra : rebase_source : cd9d5d0a186b6b29c9d734cd941137ce15600244 --- dom/plugins/test/mochitest/mochitest.ini | 2 +- dom/plugins/test/mochitest/test_windowless_ime.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index 01c1a0ca56a0..ccad5ad2708f 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -138,5 +138,5 @@ skip-if = os != "win" [test_windowless_flash.html] skip-if = !(os == "win" && processor == "x86_64" && !e10s) # Bug 1253957 [test_windowless_ime.html] -skip-if = os != "win" || e10s +skip-if = os != "win" [test_zero_opacity.html] diff --git a/dom/plugins/test/mochitest/test_windowless_ime.html b/dom/plugins/test/mochitest/test_windowless_ime.html index 8a1264fdc2a9..edc9940529e5 100644 --- a/dom/plugins/test/mochitest/test_windowless_ime.html +++ b/dom/plugins/test/mochitest/test_windowless_ime.html @@ -36,7 +36,7 @@ function runTests() { } SimpleTest.waitForExplicitFinish(); -SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED); +setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);