Backed out changeset a972719de032 (bug 1865705) for causing autofill …

…related failures. CLOSED TREE
dothq · Jan 4, 2024 · 4e3e591 · 4e3e591
1 parent 8129e63
commit 4e3e591
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -3962,8 +3962,6 @@ pref("extensions.formautofill.available", "detect");
 pref("extensions.formautofill.addresses.supported", "detect");
 pref("extensions.formautofill.addresses.enabled", true);
 pref("extensions.formautofill.addresses.capture.enabled", false);
-// Whether address autofill is enabled or not ( this is set via Nimbus )
-pref("extensions.formautofill.addresses.experiments.enabled", false);
 // This preference should be removed entirely once address capture v2 developing is finished
 pref("extensions.formautofill.addresses.capture.v2.enabled", false);
 pref("extensions.formautofill.addresses.ignoreAutocompleteOff", true);

diff --git a/toolkit/components/formautofill/Constants.ios.mjs b/toolkit/components/formautofill/Constants.ios.mjs
@@ -14,8 +14,7 @@ const IOS_DEFAULT_PREFERENCES = {
   "extensions.formautofill.creditCards.supported": "detect",
   "browser.search.region": "US",
   "extensions.formautofill.creditCards.supportedCountries": "US,CA,GB,FR,DE",
-  "extensions.formautofill.addresses.enabled": true,
-  "extensions.formautofill.addresses.autofill.enabled": false, // TODO(FXCM-765): fetch this value from swift
+  "extensions.formautofill.addresses.enabled": false,
   "extensions.formautofill.addresses.capture.enabled": false,
   "extensions.formautofill.addresses.capture.v2.enabled": false,
   "extensions.formautofill.addresses.supportedCountries": "",

diff --git a/toolkit/components/formautofill/FormAutofill.sys.mjs b/toolkit/components/formautofill/FormAutofill.sys.mjs
@@ -98,6 +98,18 @@ export const FormAutofill = {
       FormAutofill._creditCardAutofillSupportedCountries
     );
   },
+  /**
+   * Determines if the address autofill feature is available to use in the browser.
+   * If the feature is not available, then there are no user facing ways to enable it.
+   *
+   * @returns {boolean} `true` if address autofill is available
+   */
+  get isAutofillAddressesAvailable() {
+    return this._isSupportedRegion(
+      FormAutofill._isAutofillAddressesAvailable,
+      FormAutofill._addressAutofillSupportedCountries
+    );
+  },
   /**
    * Determines if the user has enabled or disabled credit card autofill.
    *
@@ -257,12 +269,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
   ENABLED_AUTOFILL_CAPTURE_ON_PAGE_NAVIGATION
 );
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  FormAutofill,
-  "isAutofillAddressesAvailable",
-  "extensions.formautofill.addresses.experiments.enabled"
-);
-
 // XXX: This should be invalidated on intl:app-locales-changed.
 ChromeUtils.defineLazyGetter(FormAutofill, "countries", () => {
   let availableRegionCodes =

diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml
@@ -870,7 +870,6 @@ address-autofill-feature:
   variables:
     status:
       type: boolean
-      setPref: "extensions.formautofill.addresses.experiments.enabled"
       description: If true, we will allow user to use address autofill
 
 shellService: