0031-Replace-New-Tab-with-Ghostery-New-Tab-Addon.patch

From: Krzysztof Jan Modras <chrmod@chrmod.net>
Date: Thu, 28 Jan 2021 12:45:28 +0100
Subject: Replace New Tab with Ghostery New Tab Addon

---
 browser/components/extensions/parent/ext-url-overrides.js | 2 +-
 browser/components/urlbar/UrlbarInput.sys.mjs             | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/browser/components/extensions/parent/ext-url-overrides.js b/browser/components/extensions/parent/ext-url-overrides.js
index 40c8995986..23d9a8fcb3 100644
--- a/browser/components/extensions/parent/ext-url-overrides.js
+++ b/browser/components/extensions/parent/ext-url-overrides.js
@@ -80,7 +80,7 @@ XPCOMUtils.defineLazyGetter(this, "newTabPopup", () => {
 });
 
 function setNewTabURL(extensionId, url) {
-  if (extensionId) {
+  if (extensionId && extensionId !== 'newtab@ghostery.com') {
     newTabPopup.addObserver(extensionId);
     let policy = ExtensionParent.WebExtensionPolicy.getByID(extensionId);
     Services.prefs.setBoolPref(
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index 50b55dfa2e..4920bda037 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -418,6 +418,13 @@ export class UrlbarInput {
           (!this.window.isBlankPageURL(uri.spec) ||
             uri.schemeIs("moz-extension"));
       }
+      try {
+        const { WebExtensionPolicy } = Cu.getGlobalForObject(Services);
+        const policy = WebExtensionPolicy.getByURI(uri);
+        if (policy.id === 'newtab@ghostery.com') {
+          valid = false;
+        }
+      } catch (e) {}
     } else if (
       this.window.isInitialPage(value) &&
       lazy.BrowserUIUtils.checkEmptyPageOrigin(
-- 
2.39.2 (Apple Git-143)