Bug 1521725 - Remove remaining about:searchreset references. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D17563

--HG--
extra : moz-landing-system : lando

browser/components/about/components.conf

@@ -21,7 +21,6 @@ pages = [
     'restartrequired',
     'rights',
     'robots',
-    'searchreset',
     'sessionrestore',
     'tabcrashed',
     'welcome',

modules/libpref/init/all.js

@@ -2696,7 +2696,7 @@ pref("security.dialog_enable_delay", 1000);
 pref("security.notification_enable_delay", 500);
 
 #if defined(DEBUG) && !defined(ANDROID)
-pref("csp.about_uris_without_csp", "blank,printpreview,srcdoc,about,addons,cache-entry,config,crashes,debugging,devtools,downloads,home,memory,networking,newtab,performance,plugins,policies,profiles,restartrequired,searchreset,serviceworkers,sessionrestore,support,sync-log,telemetry,url-classifier,webrtc,welcomeback");
+pref("csp.about_uris_without_csp", "blank,printpreview,srcdoc,about,addons,cache-entry,config,crashes,debugging,devtools,downloads,home,memory,networking,newtab,performance,plugins,policies,profiles,restartrequired,serviceworkers,sessionrestore,support,sync-log,telemetry,url-classifier,webrtc,welcomeback");
 // the following prefs are for testing purposes only.
 pref("csp.overrule_about_uris_without_csp_whitelist", false);
 pref("csp.skip_about_page_has_csp_assert", false);

toolkit/components/search/SearchService.jsm

@@ -23,11 +23,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {
 
 const BROWSER_SEARCH_PREF = "browser.search.";
 
-XPCOMUtils.defineLazyPreferenceGetter(this, "resetStatus", BROWSER_SEARCH_PREF + "reset.status", "");
 XPCOMUtils.defineLazyPreferenceGetter(this, "loggingEnabled", BROWSER_SEARCH_PREF + "log", false);
-XPCOMUtils.defineLazyGetter(this, "resetEnabled", () => {
-  return Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF).getBoolPref("reset.enabled");
-});
 // Can't use defineLazyPreferenceGetter because we want the value
 // from the default branch
 XPCOMUtils.defineLazyGetter(this, "distroID", () => {
@@ -2325,27 +2321,6 @@ Engine.prototype = {
                                                            URLTYPE_SEARCH_HTML;
     }
 
-    let resetPending;
-    if (aResponseType == URLTYPE_SEARCH_HTML &&
-        ((resetPending = resetStatus == "pending") ||
-         resetEnabled) &&
-        this.name == Services.search.defaultEngine.name &&
-        !this._isDefault &&
-        this.name != Services.search.originalDefaultEngine.name &&
-        (resetPending || !this.getAttr("loadPathHash") ||
-         this.getAttr("loadPathHash") != getVerificationHash(this._loadPath)) &&
-        !this._isWhiteListed) {
-      let url = "about:searchreset";
-      let data = [];
-      if (aData)
-        data.push("data=" + encodeURIComponent(aData));
-      if (aPurpose)
-        data.push("purpose=" + aPurpose);
-      if (data.length)
-        url += "?" + data.join("&");
-      return new Submission(makeURI(url));
-    }
-
     var url = this._getURLOfType(aResponseType);
 
     if (!url)