From 2c6fb590c4f594e856ac2e4a612cb102de755701 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Mon, 29 Feb 2016 05:42:56 -0800
Subject: [PATCH] Bug 1251659, part 1 - test_bug967796.html should use
 SpecialPowers.pushPrefEnv. r=mrbkap

This should fix the intermittent e10s failure.
---
 dom/events/test/mochitest.ini       |  2 +-
 dom/events/test/test_bug967796.html | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dom/events/test/mochitest.ini b/dom/events/test/mochitest.ini
index 91e6582dc273..651e7e2b0828 100644
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -135,7 +135,7 @@ skip-if = buildapp == 'b2g' # b2g(failing when the test gets moved around, and o
 [test_bug946632.html]
 skip-if = buildapp == 'b2g'
 [test_bug967796.html]
-skip-if = toolkit == "gonk" || e10s
+skip-if = toolkit == "gonk"
 [test_bug985988.html]
 [test_bug998809.html]
 [test_bug1017086_disable.html]
diff --git a/dom/events/test/test_bug967796.html b/dom/events/test/test_bug967796.html
index cf1996a451c7..c925f8c2d1ce 100644
--- a/dom/events/test/test_bug967796.html
+++ b/dom/events/test/test_bug967796.html
@@ -20,10 +20,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=967796
 
 /** Test for Bug 967796 **/
 
-SpecialPowers.setBoolPref("dom.w3c_pointer_events.enabled", true);      // Enable Pointer Events
-
 SimpleTest.waitForExplicitFinish();
-SimpleTest.waitForFocus(runTests);
+
+SpecialPowers.pushPrefEnv({"set": [["dom.w3c_pointer_events.enabled", true]]},
+  function() {
+    SimpleTest.waitForFocus(runTests);
+  });
+
 var outer;
 var middle;
 var inner;
@@ -161,8 +164,6 @@ function runTests() {
       elt.onpointerenter = null;
       elt.onpointerleave = null;
     });
-  SpecialPowers.clearUserPref("dom.w3c_pointer_events.enabled");      // Disable Pointer Events
-
   SimpleTest.finish();
 }