From b9c1a2f365f3699f1a2d9e6b0695ccead0b950f2 Mon Sep 17 00:00:00 2001
From: Brindusan Cristian <cbrindusan@mozilla.com>
Date: Tue, 31 Jul 2018 20:40:01 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1408129) for browser-chrome
 failures on /browser/test-oop-extensions/browser_ext_user_events.js. CLOSED
 TREE

Backed out changeset d25226ca3633 (bug 1408129)
Backed out changeset 7379720ca6f5 (bug 1408129)
---
 .../extensions/parent/ext-commands.js           |  1 -
 .../test/browser/browser_ext_user_events.js     | 17 +----------------
 .../components/extensions/parent/ext-toolkit.js |  4 ++--
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/browser/components/extensions/parent/ext-commands.js b/browser/components/extensions/parent/ext-commands.js
index 716d045cddec..ef77ccaa4590 100644
--- a/browser/components/extensions/parent/ext-commands.js
+++ b/browser/components/extensions/parent/ext-commands.js
@@ -361,7 +361,6 @@ this.commands = class extends ExtensionAPI {
         onCommand: new EventManager({
           context,
           name: "commands.onCommand",
-          inputHandling: true,
           register: fire => {
             let listener = (eventName, commandName) => {
               fire.async(commandName);
diff --git a/browser/components/extensions/test/browser/browser_ext_user_events.js b/browser/components/extensions/test/browser/browser_ext_user_events.js
index 290579844b00..0c95b6a41694 100644
--- a/browser/components/extensions/test/browser/browser_ext_user_events.js
+++ b/browser/components/extensions/test/browser/browser_ext_user_events.js
@@ -61,8 +61,6 @@ add_task(async function testSources() {
         }
       });
 
-      browser.commands.onCommand.addListener(() => request("downloads"));
-
       browser.test.sendMessage("actions-ready");
     },
 
@@ -113,16 +111,9 @@ add_task(async function testSources() {
       browser_action: {default_title: "test"},
       page_action: {default_title: "test"},
       permissions: ["contextMenus"],
-      optional_permissions: ["bookmarks", "tabs", "webNavigation", "webRequest", "downloads"],
+      optional_permissions: ["bookmarks", "tabs", "webNavigation", "webRequest"],
       options_ui: {page: "options.html"},
       content_security_policy: "script-src 'self' https://example.com; object-src 'none';",
-      commands: {
-        command: {
-          suggested_key: {
-            "default": "Alt+Shift+J",
-          },
-        },
-      },
     },
 
     useAddonManager: "temporary",
@@ -173,12 +164,6 @@ add_task(async function testSources() {
   });
   await check("options page link click");
 
-  EventUtils.synthesizeKey("j", {altKey: true, shiftKey: true});
-  promisePopupNotificationShown("addon-webext-permissions").then(panel => {
-    panel.button.click();
-  });
-  await check("commands shortcut");
-
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
   await BrowserTestUtils.removeTab(tab);
 
diff --git a/toolkit/components/extensions/parent/ext-toolkit.js b/toolkit/components/extensions/parent/ext-toolkit.js
index 45ab25758a80..5a4c943f9c40 100644
--- a/toolkit/components/extensions/parent/ext-toolkit.js
+++ b/toolkit/components/extensions/parent/ext-toolkit.js
@@ -5,12 +5,12 @@
 /* exported getCookieStoreIdForTab, getCookieStoreIdForContainer,
             getContainerForCookieStoreId,
             isValidCookieStoreId, isContainerCookieStoreId,
-            EventManager, URL */
+            EventManager, InputEventManager, URL */
 /* global getCookieStoreIdForTab:false, getCookieStoreIdForContainer:false,
           getContainerForCookieStoreId: false,
           isValidCookieStoreId:false, isContainerCookieStoreId:false,
           isDefaultCookieStoreId: false, isPrivateCookieStoreId:false,
-          EventManager: false */
+          EventManager: false, InputEventManager: false */
 
 ChromeUtils.defineModuleGetter(this, "ContextualIdentityService",
                                "resource://gre/modules/ContextualIdentityService.jsm");