Bug 1494948: Removed FX_PREFERENCES_OPENED_VIA probe and origin parameter for openPreferences r=jaws,chutten
authorTrushita <trushita@gmail.com>
Tue, 09 Apr 2019 20:40:26 +0000
changeset 468723 28416f5a55b52b247281966d496ba1aefc62874c
parent 468711 d272180eb2fbb8be571f6ea40a626857c62db303
child 468724 5b42c788846f01e50534c88c544f178308eb5559
push id35850
push userdvarga@mozilla.com
push dateWed, 10 Apr 2019 21:52:56 +0000
treeherdermozilla-central@9d3dbe3fef26 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, chutten
bugs1494948
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1494948: Removed FX_PREFERENCES_OPENED_VIA probe and origin parameter for openPreferences r=jaws,chutten Removed FX_PREFERENCES_OPENED_VIA probe as it expired in 63.Origin parameter for openPreferences has also been removed. Differential Revision: https://phabricator.services.mozilla.com/D26795
browser/base/content/browser-data-submission-info-bar.js
browser/base/content/browser-media.js
browser/base/content/browser-menubar.inc
browser/base/content/browser-sets.inc
browser/base/content/browser-siteIdentity.js
browser/base/content/browser.js
browser/base/content/urlbarBindings.xml
browser/base/content/utilityOverlay.js
browser/components/BrowserContentHandler.jsm
browser/components/BrowserGlue.jsm
browser/components/customizableui/CustomizableWidgets.jsm
browser/components/newtab/lib/ASRouter.jsm
browser/components/newtab/lib/AboutPreferences.jsm
browser/components/newtab/test/unit/asrouter/ASRouter.test.js
browser/components/search/content/search-one-offs.js
browser/components/translation/content/translation-notification.js
browser/components/uitour/UITour.jsm
browser/extensions/formautofill/FormAutofillParent.jsm
browser/extensions/formautofill/content/customElements.js
browser/modules/ContentSearch.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
toolkit/components/normandy/content/AboutPages.jsm
toolkit/components/telemetry/Histograms.json
toolkit/content/aboutTelemetry.js
--- a/browser/base/content/browser-data-submission-info-bar.js
+++ b/browser/base/content/browser-data-submission-info-bar.js
@@ -52,17 +52,17 @@ var gDataNotificationInfoBar = {
     this._actionTaken = false;
 
     let buttons = [{
       label: gNavigatorBundle.getString("dataReportingNotification.button.label"),
       accessKey: gNavigatorBundle.getString("dataReportingNotification.button.accessKey"),
       popup: null,
       callback: () => {
         this._actionTaken = true;
-        window.openPreferences("privacy-reports", {origin: "dataReporting"});
+        window.openPreferences("privacy-reports");
       },
     }];
 
     this._log.info("Creating data reporting policy notification.");
     gNotificationBox.appendNotification(
       message,
       this._DATA_REPORTING_NOTIFICATION,
       null,
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -150,17 +150,17 @@ var gEMEHandler = {
     } else {
       document.getElementById(anchorId).removeAttribute("firstplay");
     }
 
     let mainAction = {
       label: gNavigatorBundle.getString(btnLabelId),
       accessKey: gNavigatorBundle.getString(btnAccessKeyId),
       callback() {
-        openPreferences("general-drm", {origin: "browserMedia"});
+        openPreferences("general-drm");
       },
       dismiss: true,
     };
     let options = {
       dismissed: true,
       eventCallback: aTopic => aTopic == "swapping",
       learnMoreURL: Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content",
     };
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -173,17 +173,17 @@
                           accesskey="&bidiSwitchTextDirectionItem.accesskey;"
                           hidden="true"/>
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
                 <menuseparator/>
                 <menuitem id="menu_preferences"
                           label="&preferencesCmdUnix.label;"
                           accesskey="&preferencesCmdUnix.accesskey;"
-                          oncommand="openPreferences(undefined, {origin: 'menubar'});"/>
+                          oncommand="openPreferences(undefined);"/>
 #endif
 #endif
               </menupopup>
             </menu>
 
             <menu id="view-menu" label="&viewMenu.label;"
                   accesskey="&viewMenu.accesskey;">
               <menupopup id="menu_viewPopup"
@@ -513,28 +513,28 @@
                         key="key_viewInfo"
 #endif
                         command="View:PageInfo"/>
 #ifndef XP_UNIX
               <menuseparator id="prefSep"/>
               <menuitem id="menu_preferences"
                         label="&preferencesCmd2.label;"
                         accesskey="&preferencesCmd2.accesskey;"
-                        oncommand="openPreferences(undefined, {origin: 'menubar'});"/>
+                        oncommand="openPreferences(undefined);"/>
 #endif
 #ifdef MOZ_DEBUG
               <menuitem id="menu_layout_debugger"
                         label="&ldbCmd.label;"
                         accesskey="&ldbCmd.accesskey;"
                         oncommand="toOpenWindowByType('mozapp:layoutdebug',
                                           'chrome://layoutdebug/content/');"/>
 #endif
 #ifdef XP_MACOSX
 <!-- nsMenuBarX hides these and uses them to build the Application menu. -->
-              <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="openPreferences(undefined, {origin: 'commandLineLegacy'});"/>
+              <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="openPreferences(undefined);"/>
               <menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
               <menuitem id="menu_mac_hide_app" label="&hideThisAppCmdMac2.label;" key="key_hideThisAppCmdMac"/>
               <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
               <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
 #endif
               </menupopup>
             </menu>
 #ifdef XP_MACOSX
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -79,18 +79,17 @@
     <command id="cmd_fullZoomReset"   oncommand="FullZoom.reset()"/>
     <command id="cmd_fullZoomToggle"  oncommand="ZoomManager.toggleZoom();"/>
     <command id="cmd_gestureRotateLeft" oncommand="gGestureSupport.rotate(event.sourceEvent)"/>
     <command id="cmd_gestureRotateRight" oncommand="gGestureSupport.rotate(event.sourceEvent)"/>
     <command id="cmd_gestureRotateEnd" oncommand="gGestureSupport.rotateEnd()"/>
     <command id="Browser:OpenLocation" oncommand="openLocation();"/>
     <command id="Browser:RestoreLastSession" oncommand="SessionStore.restoreLastSession();" disabled="true"/>
     <command id="Browser:NewUserContextTab" oncommand="openNewUserContextTab(event.sourceEvent);"/>
-    <command id="Browser:OpenAboutContainers" oncommand="openPreferences('paneContainers', {origin: 'ContainersCommand'});"/>
-
+    <command id="Browser:OpenAboutContainers" oncommand="openPreferences('paneContainers');"/>
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize" oncommand="Sanitizer.showUI(window);"/>
     <command id="Tools:PrivateBrowsing"
       oncommand="OpenBrowserWindow({private: true});"/>
     <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/>
     <command id="History:UndoCloseWindow" oncommand="undoCloseWindow();"/>
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -262,17 +262,17 @@ var gIdentityHandler = {
         SiteDataManager.remove(hosts);
       }
     }
 
     event.stopPropagation();
   },
 
   openPermissionPreferences() {
-    openPreferences("privacy-permissions", { origin: "identityPopup-permissions-PreferencesButton" });
+    openPreferences("privacy-permissions");
   },
 
   recordClick(object) {
     let extra = {};
     for (let blocker of ContentBlocking.blockers) {
       if (blocker.telemetryIdentifier) {
         extra[blocker.telemetryIdentifier] = blocker.activated ? "true" : "false";
       }
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -728,17 +728,17 @@ const gStoragePressureObserver = {
       // The firefox-used space >= 5GB, then guide users to about:preferences
       // to clear some data stored on firefox by websites.
       [msg] = await document.l10n.formatValues([{id: "space-alert-over-5gb-message"}]);
       buttons.push({
         "l10n-id": "space-alert-over-5gb-pref-button",
         callback(notificationBar, button) {
           // The advanced subpanes are only supported in the old organization, which will
           // be removed by bug 1349689.
-          openPreferences("privacy-sitedata", { origin: "storagePressure" });
+          openPreferences("privacy-sitedata");
         },
       });
     }
 
     gHighPriorityNotificationBox.appendNotification(
       msg, NOTIFICATION_VALUE, null,
       gHighPriorityNotificationBox.PRIORITY_WARNING_HIGH, buttons, null);
 
@@ -6947,17 +6947,17 @@ var OfflineApps = {
     if (browser && browser.messageManager) {
       browser.messageManager.sendAsyncMessage("OfflineApps:StartFetching", {
         docId,
       });
     }
   },
 
   manage() {
-    openPreferences("panePrivacy", { origin: "offlineApps" });
+    openPreferences("panePrivacy");
   },
 
   receiveMessage(msg) {
     switch (msg.name) {
       case "OfflineApps:CheckUsage":
         let uri = makeURI(msg.data.uri);
         if (this._usedMoreThanWarnQuota(uri)) {
           this.warnUsage(msg.target, uri);
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1876,17 +1876,17 @@ file, You can obtain one at http://mozil
                      role="link"
 #ifdef XP_WIN
                      value="&urlbar.searchSuggestionsNotification.changeSettingsWin;"
                      accesskey="&urlbar.searchSuggestionsNotification.changeSettingsWin.accesskey;"
 #else
                      value="&urlbar.searchSuggestionsNotification.changeSettingsUnix;"
                      accesskey="&urlbar.searchSuggestionsNotification.changeSettingsUnix.accesskey;"
 #endif
-                     onclick="openPreferences('paneSearch', {origin: 'searchChangeSettings'});"
+                     onclick="openPreferences('paneSearch');"
                      control="search-suggestions-change-settings"/>
         </xul:hbox>
       </xul:deck>
       <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox"
                        flex="1"/>
       <xul:hbox anonid="footer">
         <children/>
         <xul:hbox anonid="one-off-search-buttons"
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -839,23 +839,16 @@ function openAboutDialog() {
   } else {
     features += "centerscreen,dependent,dialog=no";
   }
 
   window.openDialog("chrome://browser/content/aboutDialog.xul", "", features);
 }
 
 function openPreferences(paneID, extraArgs) {
-  let histogram = Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA");
-  if (extraArgs && extraArgs.origin) {
-    histogram.add(extraArgs.origin);
-  } else {
-    histogram.add("other");
-  }
-
   // This function is duplicated from preferences.js.
   function internalPrefCategoryNameToFriendlyName(aName) {
     return (aName || "").replace(/^pane./, function(toReplace) { return toReplace[4].toLowerCase(); });
   }
 
   let win = Services.wm.getMostRecentWindow("navigator:browser");
   let friendlyCategoryName = internalPrefCategoryNameToFriendlyName(paneID);
   let params;
--- a/browser/components/BrowserContentHandler.jsm
+++ b/browser/components/BrowserContentHandler.jsm
@@ -299,21 +299,16 @@ function openBrowserWindow(cmdLine, trig
   let features = "chrome,dialog=no,all" + gBrowserContentHandler.getFeatures(cmdLine);
   if (forcePrivate)
     features += ",private";
 
   Services.ww.openWindow(null, chromeURL, "_blank", features, args);
 }
 
 function openPreferences(cmdLine, extraArgs) {
-  if (extraArgs && extraArgs.origin) {
-    Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA").add(extraArgs.origin);
-  } else {
-    Services.telemetry.getHistogramById("FX_PREFERENCES_OPENED_VIA").add("other");
-  }
   openBrowserWindow(cmdLine, gSystemPrincipal, "about:preferences");
 }
 
 function doSearch(searchTerm, cmdLine) {
   var engine = Services.search.defaultEngine;
   var countId = (engine.identifier || ("other-" + engine.name)) + ".system";
   var count = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS");
   count.add(countId);
@@ -381,17 +376,17 @@ nsBrowserContentHandler.prototype = {
       Cu.reportError(e);
     }
 
     var chromeParam = cmdLine.handleFlagWithParam("chrome", false);
     if (chromeParam) {
       // Handle old preference dialog URLs.
       if (chromeParam == "chrome://browser/content/pref/pref.xul" ||
           chromeParam == "chrome://browser/content/preferences/preferences.xul") {
-        openPreferences(cmdLine, {origin: "commandLineLegacy"});
+        openPreferences(cmdLine);
         cmdLine.preventDefault = true;
       } else {
         try {
           let resolvedURI = resolveURIInternal(cmdLine, chromeParam);
           let isLocal = uri => {
             let localSchemes = new Set(["chrome", "file", "resource"]);
             if (uri instanceof Ci.nsINestedURI) {
               uri = uri.QueryInterface(Ci.nsINestedURI).innerMostURI;
@@ -413,17 +408,17 @@ nsBrowserContentHandler.prototype = {
             dump("    If you're trying to load a webpage, do not pass --chrome.\n");
           }
         } catch (e) {
           Cu.reportError(e);
         }
       }
     }
     if (cmdLine.handleFlag("preferences", false)) {
-      openPreferences(cmdLine, {origin: "commandLineLegacy"});
+      openPreferences(cmdLine);
       cmdLine.preventDefault = true;
     }
     if (cmdLine.handleFlag("silent", false))
       cmdLine.preventDefault = true;
 
     try {
       var privateWindowParam = cmdLine.handleFlagWithParam("private-window", false);
       if (privateWindowParam) {
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -713,17 +713,17 @@ BrowserGlue.prototype = {
     const options = {filter: ACTIVITY_STREAM_ID};
     this.pingCentre.sendPing(payload, options);
   },
 
   // nsIObserver implementation
   observe: async function BG_observe(subject, topic, data) {
     switch (topic) {
       case "notifications-open-settings":
-        this._openPreferences("privacy-permissions", { origin: "notifOpenSettings" });
+        this._openPreferences("privacy-permissions");
         break;
       case "final-ui-startup":
         this._beforeUIStartup();
         break;
       case "browser-delayed-startup-finished":
         this._onFirstWindowLoaded(subject);
         Services.obs.removeObserver(this, "browser-delayed-startup-finished");
         break;
@@ -2186,17 +2186,17 @@ BrowserGlue.prototype = {
     let productName = gBrandBundle.GetStringFromName("brandShortName");
     let title = bundle.GetStringFromName("syncStartNotification.title");
     let body = bundle.formatStringFromName("syncStartNotification.body2",
                                             [productName], 1);
 
     let clickCallback = (subject, topic, data) => {
       if (topic != "alertclickcallback")
         return;
-      this._openPreferences("sync", { origin: "doorhanger" });
+      this._openPreferences("sync");
     };
     this.AlertsService.showAlertNotification(null, title, body, true, null, clickCallback);
   },
 
   /**
    * Uncollapses PersonalToolbar if its collapsed status is not
    * persisted, and user customized it or changed default bookmarks.
    *
@@ -2864,17 +2864,17 @@ BrowserGlue.prototype = {
   _onDeviceDisconnected() {
     let bundle = Services.strings.createBundle("chrome://browser/locale/accounts.properties");
     let title = bundle.GetStringFromName("deviceDisconnectedNotification.title");
     let body = bundle.GetStringFromName("deviceDisconnectedNotification.body");
 
     let clickCallback = (subject, topic, data) => {
       if (topic != "alertclickcallback")
         return;
-      this._openPreferences("sync", { origin: "devDisconnectedAlert"});
+      this._openPreferences("sync");
     };
     this.AlertsService.showAlertNotification(null, title, body, true, null, clickCallback);
   },
 
   _handleFlashHang() {
     ++this._flashHangCount;
     if (this._flashHangCount < 2) {
       return;
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -735,17 +735,17 @@ if (Services.prefs.getBoolPref("identity
     },
   });
 }
 
 let preferencesButton = {
   id: "preferences-button",
   onCommand(aEvent) {
     let win = aEvent.target.ownerGlobal;
-    win.openPreferences(undefined, {origin: "preferencesButton"});
+    win.openPreferences(undefined);
   },
 };
 if (AppConstants.platform == "win") {
   preferencesButton.label = "preferences-button.labelWin";
   preferencesButton.tooltiptext = "preferences-button.tooltipWin2";
 } else if (AppConstants.platform == "macosx") {
   preferencesButton.tooltiptext = "preferences-button.tooltiptext.withshortcut";
   preferencesButton.shortcutId = "key_preferencesCmdMac";
--- a/browser/components/newtab/lib/ASRouter.jsm
+++ b/browser/components/newtab/lib/ASRouter.jsm
@@ -1058,17 +1058,17 @@ class _ASRouter {
           triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({}),
           csp: null,
         });
         break;
       case ra.OPEN_ABOUT_PAGE:
         target.browser.ownerGlobal.openTrustedLinkIn(`about:${action.data.args}`, "tab");
         break;
       case ra.OPEN_PREFERENCES_PAGE:
-        target.browser.ownerGlobal.openPreferences(action.data.category, {origin: action.data.origin});
+        target.browser.ownerGlobal.openPreferences(action.data.category);
         break;
       case ra.OPEN_APPLICATIONS_MENU:
         UITour.showMenu(target.browser.ownerGlobal, action.data.args);
         break;
       case ra.INSTALL_ADDON_FROM_URL:
         this._updateOnboardingState();
         await MessageLoaderUtils.installAddonFromURL(target.browser, action.data.url);
         break;
--- a/browser/components/newtab/lib/AboutPreferences.jsm
+++ b/browser/components/newtab/lib/AboutPreferences.jsm
@@ -90,17 +90,17 @@ this.AboutPreferences = class AboutPrefe
     switch (action.type) {
       case at.INIT:
         this.init();
         break;
       case at.UNINIT:
         this.uninit();
         break;
       case at.SETTINGS_OPEN:
-        action._target.browser.ownerGlobal.openPreferences("paneHome", {origin: "aboutHome"});
+        action._target.browser.ownerGlobal.openPreferences("paneHome");
         break;
       // This is used to open the web extension settings page for an extension
       case at.OPEN_WEBEXT_SETTINGS:
         action._target.browser.ownerGlobal.BrowserOpenAddonsMgr(`addons://detail/${encodeURIComponent(action.data)}`);
         break;
     }
   }
 
--- a/browser/components/newtab/test/unit/asrouter/ASRouter.test.js
+++ b/browser/components/newtab/test/unit/asrouter/ASRouter.test.js
@@ -924,17 +924,17 @@ describe("ASRouter", () => {
     describe("#onMessage: OPEN_PREFERENCES_PAGE", () => {
       it("should call openPreferences with the correct params on OPEN_PREFERENCES_PAGE", async () => {
         let [testMessage] = Router.state.messages;
         testMessage.button_action = {type: "OPEN_PREFERENCES_PAGE", data: {category: "something", origin: "o"}};
         const msg = fakeExecuteUserAction(testMessage.button_action);
         await Router.onMessage(msg);
 
         assert.calledOnce(msg.target.browser.ownerGlobal.openPreferences);
-        assert.calledWith(msg.target.browser.ownerGlobal.openPreferences, "something", {origin: "o"});
+        assert.calledWith(msg.target.browser.ownerGlobal.openPreferences, "something");
       });
     });
 
     describe("#onMessage: INSTALL_ADDON_FROM_URL", () => {
       it("should call installAddonFromURL with correct arguments", async () => {
         sandbox.stub(MessageLoaderUtils, "installAddonFromURL").resolves(null);
         const msg = fakeExecuteUserAction({type: "INSTALL_ADDON_FROM_URL", data: {url: "foo.com"}});
 
--- a/browser/components/search/content/search-one-offs.js
+++ b/browser/components/search/content/search-one-offs.js
@@ -1173,17 +1173,17 @@ class SearchOneOffs {
     this.handleSearchCommand(event, engine);
   }
 
   _on_command(event) {
     let target = event.target;
 
     if (target == this.settingsButton ||
         target == this.settingsButtonCompact) {
-      openPreferences("paneSearch", { origin: "contentSearch" });
+      openPreferences("paneSearch");
 
       // If the preference tab was already selected, the panel doesn't
       // close itself automatically.
       this.popup.hidePopup();
       return;
     }
 
     if (target.classList.contains("addengine-item")) {
--- a/browser/components/translation/content/translation-notification.js
+++ b/browser/components/translation/content/translation-notification.js
@@ -57,17 +57,17 @@ class MozTranslationNotification extends
         </deck>
         <spacer flex="1"/>
         <button type="menu" class="translate-infobar-element options-menu-button" anonid="options" label="&translation.options.menu;">
           <menupopup class="translation-menupopup cui-widget-panel cui-widget-panelview
                                 cui-widget-panelWithFooter PanelUI-subView" onpopupshowing="this.closest('notification').optionsShowing();">
             <menuitem anonid="neverForLanguage" oncommand="this.closest('notification').neverForLanguage();"/>
             <menuitem anonid="neverForSite" oncommand="this.closest('notification').neverForSite();" label="&translation.options.neverForSite.label;" accesskey="&translation.options.neverForSite.accesskey;"/>
             <menuseparator/>
-            <menuitem oncommand="openPreferences('paneGeneral', {origin:'translationInfobar'});" label="&translation.options.preferences.label;" accesskey="&translation.options.preferences.accesskey;"/>
+            <menuitem oncommand="openPreferences('paneGeneral');" label="&translation.options.preferences.label;" accesskey="&translation.options.preferences.accesskey;"/>
             <menuitem class="subviewbutton panel-subview-footer" oncommand="this.closest('notification').openProviderAttribution();">
               <deck anonid="translationEngine" selectedIndex="0">
                 <hbox class="translation-attribution">
                   <label/>
                   <image src="chrome://browser/content/microsoft-translator-attribution.png" aria-label="Microsoft Translator"/>
                   <label/>
                 </hbox>
                 <label class="translation-attribution"/>
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -433,17 +433,17 @@ var UITour = {
         break;
       }
 
       case "openPreferences": {
         if (typeof data.pane != "string" && typeof data.pane != "undefined") {
           log.warn("openPreferences: Invalid pane specified");
           return false;
         }
-        window.openPreferences(data.pane, { origin: "UITour" });
+        window.openPreferences(data.pane);
         break;
       }
 
       case "showFirefoxAccounts": {
         Promise.resolve().then(() => {
           return data.email ? FxAccounts.config.promiseEmailURI(data.email, "uitour") :
                               FxAccounts.config.promiseSignUpURI("uitour");
         }).then(uri => {
--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -262,17 +262,17 @@ FormAutofillParent.prototype = {
         break;
       }
       case "FormAutofill:OnFormSubmit": {
         await this._onFormSubmit(data, target);
         break;
       }
       case "FormAutofill:OpenPreferences": {
         const win = BrowserWindowTracker.getTopWindow();
-        win.openPreferences("privacy-form-autofill", {origin: "autofillFooter"});
+        win.openPreferences("privacy-form-autofill");
         break;
       }
       case "FormAutofill:GetDecryptedString": {
         let {cipherText, reauth} = data;
         let string;
         try {
           string = await OSKeyStore.decrypt(cipherText, reauth);
         } catch (e) {
@@ -448,18 +448,17 @@ FormAutofillParent.prototype = {
         Services.prefs.setBoolPref(FormAutofill.ADDRESSES_FIRST_TIME_USE_PREF, false);
         showDoorhanger = async () => {
           const description = FormAutofillUtils.getAddressLabel(address.record);
           const state = await FormAutofillDoorhanger.show(target, "firstTimeUse", description);
           if (state !== "open-pref") {
             return;
           }
 
-          target.ownerGlobal.openPreferences("privacy-address-autofill",
-                                             {origin: "autofillDoorhanger"});
+          target.ownerGlobal.openPreferences("privacy-address-autofill");
         };
       } else {
         // We want to exclude the first time form filling.
         Services.telemetry.scalarAdd("formautofill.addresses.fill_type_manual", 1);
       }
     }
     return showDoorhanger;
   },
--- a/browser/extensions/formautofill/content/customElements.js
+++ b/browser/extensions/formautofill/content/customElements.js
@@ -145,17 +145,17 @@
         if (event.button != 0) {
           return;
         }
 
         if (this._warningTextBox.contains(event.originalTarget)) {
           return;
         }
 
-        window.openPreferences("privacy-form-autofill", {origin: "autofillFooter"});
+        window.openPreferences("privacy-form-autofill");
       });
     }
 
     connectedCallback() {
       if (this.delayConnectedCallback()) {
         return;
       }
 
--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -415,17 +415,17 @@ var ContentSearch = {
     this.performSearch(msg, data);
   },
 
   _onMessageSetCurrentEngine(msg, data) {
     Services.search.defaultEngine = Services.search.getEngineByName(data);
   },
 
   _onMessageManageEngines(msg) {
-    msg.target.ownerGlobal.openPreferences("paneSearch", { origin: "contentSearch" });
+    msg.target.ownerGlobal.openPreferences("paneSearch");
   },
 
   async _onMessageGetSuggestions(msg, data) {
     this._ensureDataHasProperties(data, [
       "engineName",
       "searchString",
     ]);
     let {engineName, searchString} = data;
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm
@@ -68,17 +68,17 @@ let prefHelper = async function(primary,
       readyPromise = Promise.resolve();
     } else {
       readyPromise = paintPromise(browserWindow);
     }
   } else {
     readyPromise = TestUtils.topicObserved("sync-pane-loaded");
   }
 
-  browserWindow.openPreferences(primary, {origin: "mozscreenshots"});
+  browserWindow.openPreferences(primary);
 
   await readyPromise;
 
   if (customFn) {
     let customPaintPromise = paintPromise(browserWindow);
     let result = await customFn(selectedBrowser);
     await customPaintPromise;
     return result;
--- a/toolkit/components/normandy/content/AboutPages.jsm
+++ b/toolkit/components/normandy/content/AboutPages.jsm
@@ -226,17 +226,17 @@ XPCOMUtils.defineLazyGetter(this.AboutPa
       // Update any open tabs with the new study list now that it has changed.
       Services.mm.broadcastAsyncMessage("Shield:ReceivePreferenceStudyList", {
         studies: await PreferenceExperiments.getAll(),
       });
     },
 
     openDataPreferences() {
       const browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
-      browserWindow.openPreferences("privacy-reports", {origin: "aboutStudies"});
+      browserWindow.openPreferences("privacy-reports");
     },
 
     getShieldLearnMoreHref() {
       return Services.urlFormatter.formatURLPref(SHIELD_LEARN_MORE_URL_PREF);
     },
   });
 
   return aboutStudies;
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6499,26 +6499,16 @@
     "bug_numbers": [1276694],
     "alert_emails": ["gijs@mozilla.com"],
     "expires_in_version": "65",
     "keyed": true,
     "kind": "boolean",
     "releaseChannelCollection": "opt-out",
     "description": "Whether the browser we migrated from was the browser with the most recent data. Keyed by that browser's identifier (e.g. 'ie', 'edge', 'safari', etc.)."
   },
-  "FX_PREFERENCES_OPENED_VIA": {
-    "record_in_processes": ["main", "content"],
-    "bug_numbers": [1330315, 1420062, 1427973],
-    "alert_emails": ["jaws@mozilla.com"],
-    "expires_in_version": "63",
-    "kind": "categorical",
-    "labels": ["aboutHome", "aboutTelemetry", "browserMedia", "commandLine", "commandLineLegacy", "ContainersCommand", "contentSearch", "dataReporting", "doorhanger", "devDisconnectedAlert", "experimentsOpenPref", "fxa", "fxaSignedin", "fxaError", "offlineApps", "prefserviceDefaults", "preferencesButton", "paneSync", "storagePressure", "translationInfobar", "UITour", "menubar", "notifOpenSettings", "other", "autofillFooter", "autofillDoorhanger", "mozscreenshots", "searchChangeSettings"],
-    "releaseChannelCollection": "opt-out",
-    "description":"Count how the Preferences are opened."
-  },
   "FX_PAGE_ACTION_ADDED": {
     "record_in_processes": ["main"],
     "alert_emails": ["gijs@mozilla.com"],
     "bug_numbers": [1393843],
     "expires_in_version": "64",
     "kind": "categorical",
     "labels": ["bookmark", "pocket", "screenshots", "webcompat", "copyURL", "emailLink",
                "sendToDevice", "other", "addSearchEngine", "shareURL", "screenshotsMozillaOr"],
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -182,17 +182,17 @@ var Settings = {
           var {EventDispatcher} = ChromeUtils.import("resource://gre/modules/Messaging.jsm");
           EventDispatcher.instance.sendRequest({
             type: "Settings:Show",
             resource: "preferences_privacy",
           });
         } else {
           // Show the data choices preferences on desktop.
           let mainWindow = getMainWindowWithPreferencesPane();
-          mainWindow.openPreferences("privacy-reports", { origin: "aboutTelemetry" });
+          mainWindow.openPreferences("privacy-reports");
         }
       });
     }
   },
 
   detachObservers() {
     for (let setting of this.SETTINGS) {
       Preferences.ignore(setting.pref, this.render, this);