Backed out changeset 309b64bd96a1 (bug 1396399) for mochitest failure…

…s at test_ext_contentscript_activeTab.html and ESlint failure at SpecialPowersParent.jsm. CLOSED TREE
dothq · Sep 16, 2020 · 5cb053c · 5cb053c
1 parent 09fafce
commit 5cb053c
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 419 deletions.
diff --git a/testing/specialpowers/content/SpecialPowersChild.jsm b/testing/specialpowers/content/SpecialPowersChild.jsm
@@ -2141,10 +2141,6 @@ class SpecialPowersChild extends JSWindowActorChild {
       sendMessage(...args) {
         sp.sendAsyncMessage("SPExtensionMessage", { id, args });
       },
-
-      grantActiveTab(tabId) {
-        sp.sendAsyncMessage("SPExtensionGrantActiveTab", { id, tabId });
-      },
     };
 
     this.sendAsyncMessage("SPLoadExtension", { ext, id });

diff --git a/testing/specialpowers/content/SpecialPowersParent.jsm b/testing/specialpowers/content/SpecialPowersParent.jsm
@@ -1106,13 +1106,6 @@ class SpecialPowersParent extends JSWindowActorParent {
         return undefined;
       }
 
-      case "SPExtensionGrantActiveTab": {
-        let {id, tabId} = aMessage.data;
-        let {tabManager} = this._extensions.get(id);
-        tabManager.addActiveTabPermission(tabManager.get(tabId).nativeTab);
-        return undefined;
-      }
-
       case "SPUnloadExtension": {
         let id = aMessage.data.id;
         let extension = this._extensions.get(id);

diff --git a/toolkit/components/extensions/test/mochitest/file_contentscript_activeTab.html b/toolkit/components/extensions/test/mochitest/file_contentscript_activeTab.html
diff --git a/toolkit/components/extensions/test/mochitest/file_contentscript_activeTab2.html b/toolkit/components/extensions/test/mochitest/file_contentscript_activeTab2.html
diff --git a/toolkit/components/extensions/test/mochitest/file_contentscript_iframe.html b/toolkit/components/extensions/test/mochitest/file_contentscript_iframe.html
diff --git a/toolkit/components/extensions/test/mochitest/mochitest-common.ini b/toolkit/components/extensions/test/mochitest/mochitest-common.ini
@@ -7,9 +7,6 @@ support-files =
   file_WebRequest_page3.html
   file_contains_img.html
   file_contains_iframe.html
-  file_contentscript_activeTab.html
-  file_contentscript_activeTab2.html
-  file_contentscript_iframe.html
   file_image_bad.png
   file_image_good.png
   file_image_great.png
@@ -80,8 +77,6 @@ skip-if = os == 'android'
 skip-if = headless # Bug 1405872
 [test_ext_contentscript_about_blank.html]
 skip-if = os == 'android' # bug 1369440
-[test_ext_contentscript_activeTab.html]
-fail-if = true # Broken by DocumentChannel
 [test_ext_contentscript_cache.html]
 skip-if = (os == 'linux' && debug) || (toolkit == 'android' && debug) # bug 1348241
 fail-if = xorigin # TypeError: can't access property "staticScripts", ext is undefined - Should not throw any errors