From 72d1f0567bf57ef7a78c6b6e6d3fd9aec00a9c60 Mon Sep 17 00:00:00 2001
From: Brindusan Cristian <cbrindusan@mozilla.com>
Date: Sat, 1 Dec 2018 01:45:25 +0200
Subject: [PATCH] Backed out changeset 51b417f1d2c3 (bug 1437258) for ESlint
 failure on ext-webRequest.js. CLOSED TREE

---
 .../components/extensions/ExtensionChild.jsm  | 12 ---------
 .../components/extensions/ExtensionParent.jsm | 26 +------------------
 .../extensions/parent/ext-webRequest.js       |  4 +--
 3 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/extensions/ExtensionChild.jsm
index 1ee472642b5e..3b628537393b 100644
--- a/toolkit/components/extensions/ExtensionChild.jsm
+++ b/toolkit/components/extensions/ExtensionChild.jsm
@@ -46,7 +46,6 @@ ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
 
 const {
   DefaultMap,
-  ExtensionError,
   LimitedSet,
   getMessageManager,
   getUniqueId,
@@ -934,7 +933,6 @@ class ChildAPIManager {
 
     MessageChannel.addListener(messageManager, "API:RunListener", this);
     messageManager.addMessageListener("API:CallResult", this);
-    messageManager.addMessageListener("API:AddListenerResult", this);
 
     this.messageFilterStrict = {childId: this.id};
 
@@ -1017,15 +1015,6 @@ class ChildAPIManager {
         }
         this.callPromises.delete(data.callId);
         break;
-
-      case "API:AddListenerResult":
-        if ("error" in data) {
-          let listenerMap = this.listeners.get(data.path);
-          listenerMap.ids.delete(data.listenerId);
-
-          Promise.reject(new ExtensionError(data.error.message));
-        }
-        break;
     }
   }
 
@@ -1097,7 +1086,6 @@ class ChildAPIManager {
   close() {
     this.messageManager.sendAsyncMessage("API:CloseProxyContext", {childId: this.id});
     this.messageManager.removeMessageListener("API:CallResult", this);
-    this.messageManager.removeMessageListener("API:AddListenerResult", this);
     MessageChannel.removeListener(this.messageManager, "API:RunListener", this);
 
     if (this.updatePermissions) {
diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index b1ccd0397e17..a939a04da8dd 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -981,23 +981,6 @@ ParentAPIManager = {
     let handlingUserInput = false;
     let lowPriority = data.path.startsWith("webRequest.");
 
-    let reply = result => {
-      if (!context.parentMessageManager) {
-        Services.console.logStringMessage("Cannot send function call " +
-        "result: other side closed connection " +
-        `(call data: ${uneval({path: data.path, args: data.args})})`);
-        return;
-      }
-
-      context.parentMessageManager.sendAsyncMessage(
-        "API:AddListenerResult",
-        Object.assign({
-          childId: data.childId,
-          listenerId: data.listenerId,
-          path: data.path,
-        }, result));
-    };
-
     function listener(...listenerArgs) {
       return context.sendMessage(
         context.parentMessageManager,
@@ -1038,14 +1021,7 @@ ParentAPIManager = {
     if (handler.setUserInput) {
       handlingUserInput = true;
     }
-
-    try {
-      handler.addListener(listener, ...args);
-    } catch (e) {
-      context.listenerProxies.delete(data.listenerId);
-      const error = context.normalizeError(e);
-      reply({error: {message: error.message}});
-    }
+    handler.addListener(listener, ...args);
   },
 
   async removeListener(data) {
diff --git a/toolkit/components/extensions/parent/ext-webRequest.js b/toolkit/components/extensions/parent/ext-webRequest.js
index c4f1f53cc0be..34f811b4fc94 100644
--- a/toolkit/components/extensions/parent/ext-webRequest.js
+++ b/toolkit/components/extensions/parent/ext-webRequest.js
@@ -62,8 +62,8 @@ function registerEvent(extension, eventName, fire, filter, info, tabParent = nul
   if (info) {
     for (let desc of info) {
       if (desc == "blocking" && !blockingAllowed) {
-        throw new ExtensionError("Using webRequest.addListener with the " +
-          "blocking option requires the 'webRequestBlocking' permission.");
+        Cu.reportError("Using webRequest.addListener with the blocking option " +
+                       "requires the 'webRequestBlocking' permission.");
       } else {
         info2.push(desc);
       }