From 8c44b387c32b2f671285bba01d5afb51e0cc736d Mon Sep 17 00:00:00 2001
From: Sergey Galich <sgalich@mozilla.com>
Date: Tue, 23 Aug 2022 01:02:24 +0000
Subject: [PATCH] Bug 1786329 - Remove signon.showAutoCompleteOrigins pref
 r=dimi

Differential Revision: https://phabricator.services.mozilla.com/D155255
---
 modules/libpref/init/all.js                                | 1 -
 toolkit/components/passwordmgr/LoginAutoComplete.jsm       | 7 +------
 .../mochitest/test_autocomplete_basic_form_subdomain.html  | 1 -
 .../mochitest/test_autocomplete_password_generation.html   | 1 -
 .../test/unit/test_login_autocomplete_result.js            | 1 -
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index d609cbd2d139..e5185c7d14bd 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3455,7 +3455,6 @@ pref("signon.includeOtherSubdomainsInLookup",     true);
 // This temporarily prevents the primary password to reprompt for autocomplete.
 pref("signon.masterPasswordReprompt.timeout_ms", 900000); // 15 Minutes
 pref("signon.showAutoCompleteFooter",             false);
-pref("signon.showAutoCompleteOrigins",            true);
 
 // Satchel (Form Manager) prefs
 pref("browser.formfill.debug",            false);
diff --git a/toolkit/components/passwordmgr/LoginAutoComplete.jsm b/toolkit/components/passwordmgr/LoginAutoComplete.jsm
index c2f51caccb89..a9556e44131b 100644
--- a/toolkit/components/passwordmgr/LoginAutoComplete.jsm
+++ b/toolkit/components/passwordmgr/LoginAutoComplete.jsm
@@ -29,11 +29,6 @@ XPCOMUtils.defineLazyServiceGetter(
   "@mozilla.org/satchel/form-fill-controller;1",
   Ci.nsIFormFillController
 );
-XPCOMUtils.defineLazyPreferenceGetter(
-  lazy,
-  "SHOULD_SHOW_ORIGIN",
-  "signon.showAutoCompleteOrigins"
-);
 XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   return lazy.LoginHelper.createLogger("LoginAutoComplete");
 });
@@ -138,7 +133,7 @@ class LoginAutocompleteItem extends AutocompleteItem {
     actor,
     isOriginMatched
   ) {
-    super(lazy.SHOULD_SHOW_ORIGIN ? "loginWithOrigin" : "login");
+    super("loginWithOrigin");
     this.login = login.QueryInterface(Ci.nsILoginMetaInfo);
     this.#actor = actor;
 
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_subdomain.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_subdomain.html
index de763251817a..8147bd76be6b 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_subdomain.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_subdomain.html
@@ -72,7 +72,6 @@ add_setup(async () => {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["signon.includeOtherSubdomainsInLookup", true],
-      ["signon.showAutoCompleteOrigins", true],
     ],
   });
   listenForUnexpectedPopupShown();
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
index ee3eeccf8455..beccaf61e8c4 100644
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
@@ -216,7 +216,6 @@ add_task(async function test_autofillAutocompleteUsername_noGeneration2() {
   await SpecialPowers.pushPrefEnv({"set": [
     ["signon.generation.available", true],
     ["signon.generation.enabled", true],
-    ["signon.showAutoCompleteOrigins", true],
   ]});
 
   // 2nd form should not be filled
diff --git a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
index f4991728d001..522e17bdb79f 100644
--- a/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
+++ b/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
@@ -657,7 +657,6 @@ add_task(async function test_all_patterns() {
 
   LoginHelper.createLogger("LoginAutoCompleteResult");
   Services.prefs.setBoolPref("signon.showAutoCompleteFooter", true);
-  Services.prefs.setBoolPref("signon.showAutoCompleteOrigins", true);
 
   expectedResults.forEach((pattern, testIndex) => {
     info(`expectedResults[${testIndex}]`);