[tbb-commits] [tor-browser/tor-browser-91.5.0esr-11.5-2] Bug 40002: Remove about:ion

[richard at torproject.org]

commit 578086a75826b9ad44953f037ae99a309a1aae61
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Fri Aug 14 09:06:33 2020 -0400

    Bug 40002: Remove about:ion
    
    Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people
    volunteer to participate in studies that collect detailed, sensitive data about
    how they use their browser.
---
 browser/base/content/browser-siteIdentity.js | 2 +-
 browser/components/about/AboutRedirector.cpp | 2 --
 browser/components/about/components.conf     | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 859ebf5eaa3f..8c6d1e20ddef 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -57,7 +57,7 @@ var gIdentityHandler = {
    * RegExp used to decide if an about url should be shown as being part of
    * the browser UI.
    */
-  _secureInternalPages: /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion)(?:[?#]|$)/i,
+  _secureInternalPages: /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback)(?:[?#]|$)/i,
 
   /**
    * Whether the established HTTPS connection is considered "broken".
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 5412a65c315f..2ace276cd50c 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -126,8 +126,6 @@ static const RedirEntry kRedirMap[] = {
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},
-    {"ion", "chrome://browser/content/ion.html",
-     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 };
 
 static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf
index 0c9597ff9fb4..6fd827dead37 100644
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -13,7 +13,6 @@ pages = [
     'logins',
     'loginsimportreport',
     'newtab',
-    'ion',
     'pocket-home',
     'pocket-saved',
     'pocket-signup',