Bug 1454627 - Re-enable browser_ext_user_events.js (bug 1381305) r=mixedpuppy

Re-enable the test that was disabled in bug 1381305 and fix the
underlying issue that caused th intermittent failure in the first place.

MozReview-Commit-ID: BL9wS2fogaf

--HG--
extra : rebase_source : 685f43b2e47d80f71814385a5c8b94fd3000eac9

browser/components/extensions/test/browser/browser-common.ini

@@ -210,7 +210,6 @@ skip-if = os == 'mac' # Save as PDF not supported on Mac OS X
 [browser_ext_themes_validation.js]
 [browser_ext_url_overrides_newtab.js]
 [browser_ext_user_events.js]
-skip-if = debug || os == "linux" #Bug 1381305
 [browser_ext_webRequest.js]
 [browser_ext_webNavigation_frameId0.js]
 [browser_ext_webNavigation_getFrames.js]

browser/components/extensions/test/browser/browser_ext_user_events.js

@@ -47,12 +47,6 @@ add_task(async function testSources() {
 
       browser.pageAction.onClicked.addListener(() => request("bookmarks"));
       browser.browserAction.onClicked.addListener(() => request("tabs"));
-
-      browser.contextMenus.create({
-        id: "menu",
-        title: "test user events",
-        contexts: ["page"],
-      });
       browser.contextMenus.onClicked.addListener(() => request("webNavigation"));
 
       browser.test.onMessage.addListener(msg => {
@@ -61,7 +55,13 @@ add_task(async function testSources() {
         }
       });
 
-      browser.test.sendMessage("actions-ready");
+      browser.contextMenus.create({
+        id: "menu",
+        title: "test user events",
+        contexts: ["page"],
+      }, () => {
+        browser.test.sendMessage("actions-ready");
+      });
     },
 
     files: {