Bug 1875253 - Enable Address Capture for US and CA regions in Nightly r=credential-management-reviewers,sgalich

Differential Revision: https://phabricator.services.mozilla.com/D198941
2024-01-25 09:21:36 +00:00 · 2024-01-25 09:21:36 +00:00 · 3794750a4d
--- a/browser/extensions/formautofill/test/browser/address/browser_address_capture_form_removal.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_capture_form_removal.js
@ -25,7 +25,7 @@ const ADDRESS_FIELD_VALUES = {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
      ["extensions.formautofill.heuristics.captureOnFormRemoval", true],
    ],
--- a/browser/extensions/formautofill/test/browser/address/browser_address_capture_page_navigation.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_capture_page_navigation.js
@ -9,7 +9,7 @@ const ADDRESS_VALUES = {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
      ["extensions.formautofill.heuristics.captureOnPageNavigation", true],
    ],
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_confirmation_popup.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_confirmation_popup.js
@ -16,7 +16,7 @@ async function expectSavedAddresses(expectedCount) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_display.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_display.js
@ -13,7 +13,7 @@ async function expectSavedAddresses(expectedCount) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_invalid_fields.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_invalid_fields.js
@ -29,7 +29,7 @@ async function expectSavedAddresses(expectedCount) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_multiple_tabs.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_multiple_tabs.js
@ -13,7 +13,7 @@ async function expectedSavedAddresses(expectedCount) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_non_mergeable_fields.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_non_mergeable_fields.js
@ -13,7 +13,7 @@ async function expectSavedAddresses(expectedCount) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_not_shown.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_not_shown.js
@ -53,14 +53,14 @@ const TESTCASES = [
      "#email": "test@mozilla.org",
      "#tel": "1-650-903-0800",
    },
-    prefs: [["extensions.formautofill.addresses.capture.v2.enabled", false]],
+    prefs: [["extensions.formautofill.addresses.capture.enabled", false]],
  },
 ];

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_state.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_state.js
@ -18,7 +18,7 @@ async function expectSavedAddresses(expectedAddresses) {

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.formautofill.addresses.capture.v2.enabled", true]],
+    set: [["extensions.formautofill.addresses.capture.enabled", true]],
  });
 });

--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_tel.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_tel.js
@ -18,7 +18,7 @@ async function expectSavedAddresses(expectedAddresses) {

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.formautofill.addresses.capture.v2.enabled", true]],
+    set: [["extensions.formautofill.addresses.capture.enabled", true]],
  });
 });

--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_ui.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_ui.js
@ -49,7 +49,7 @@ function recordToFormSelector(record) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_unsupported_region.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_doorhanger_unsupported_region.js
@ -6,7 +6,7 @@ const { Region } = ChromeUtils.importESModule(
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "detect"],
      ["extensions.formautofill.addresses.supportedCountries", "US,CA"],
    ],
--- a/browser/extensions/formautofill/test/browser/address/browser_address_telemetry.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_address_telemetry.js
@ -259,7 +259,7 @@ add_setup(async function () {
    set: [
      [ENABLED_AUTOFILL_ADDRESSES_PREF, true],
      [AUTOFILL_ADDRESSES_AVAILABLE_PREF, "on"],
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
    ],
  });

--- a/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_display.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_display.js
@ -21,7 +21,7 @@ function recordToFormSelector(record) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_display_state.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_display_state.js
@ -3,7 +3,7 @@ requestLongerTimeout(2);

 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.formautofill.addresses.capture.v2.enabled", true]],
+    set: [["extensions.formautofill.addresses.capture.enabled", true]],
  });
 });

--- a/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_save_edited_fields.js
+++ b/browser/extensions/formautofill/test/browser/address/browser_edit_address_doorhanger_save_edited_fields.js
@ -67,7 +67,7 @@ function recordToFormSelector(record) {
 add_setup(async function () {
  await SpecialPowers.pushPrefEnv({
    set: [
-      ["extensions.formautofill.addresses.capture.v2.enabled", true],
+      ["extensions.formautofill.addresses.capture.enabled", true],
      ["extensions.formautofill.addresses.supported", "on"],
    ],
  });
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@ -3952,9 +3952,11 @@ pref("security.external_protocol_requires_permission", true);
 pref("extensions.formautofill.available", "detect");
 pref("extensions.formautofill.addresses.supported", "detect");
 pref("extensions.formautofill.addresses.enabled", true);
-pref("extensions.formautofill.addresses.capture.enabled", false);
-// This preference should be removed entirely once address capture v2 developing is finished
-pref("extensions.formautofill.addresses.capture.v2.enabled", false);
+#if defined(NIGHTLY_BUILD)
+  pref("extensions.formautofill.addresses.capture.enabled", true);
+#else
+  pref("extensions.formautofill.addresses.capture.enabled", false);
+#endif
 // Defies the required address form fields to trigger the display of the address capture doorhanger
 pref("extensions.formautofill.addresses.capture.requiredFields", "street-address,postal-code,address-level1,address-level2");
 pref("extensions.formautofill.addresses.ignoreAutocompleteOff", true);
--- a/toolkit/components/formautofill/Constants.ios.mjs
+++ b/toolkit/components/formautofill/Constants.ios.mjs
@ -18,7 +18,6 @@ const IOS_DEFAULT_PREFERENCES = {
  "extensions.formautofill.creditCards.supportedCountries": "US,CA,GB,FR,DE",
  "extensions.formautofill.addresses.enabled": false,
  "extensions.formautofill.addresses.capture.enabled": false,
-  "extensions.formautofill.addresses.capture.v2.enabled": false,
  "extensions.formautofill.addresses.supportedCountries": "",
  "extensions.formautofill.creditCards.enabled": true,
  "extensions.formautofill.reauth.enabled": true,
--- a/toolkit/components/formautofill/FormAutofill.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofill.sys.mjs
@ -18,8 +18,6 @@ const ENABLED_AUTOFILL_ADDRESSES_PREF =
  "extensions.formautofill.addresses.enabled";
 const ENABLED_AUTOFILL_ADDRESSES_CAPTURE_PREF =
  "extensions.formautofill.addresses.capture.enabled";
-const ENABLED_AUTOFILL_ADDRESSES_CAPTURE_V2_PREF =
-  "extensions.formautofill.addresses.capture.v2.enabled";
 const ENABLED_AUTOFILL_ADDRESSES_CAPTURE_REQUIRED_FIELDS_PREF =
  "extensions.formautofill.addresses.capture.requiredFields";
 const ENABLED_AUTOFILL_ADDRESSES_SUPPORTED_COUNTRIES_PREF =
@ -43,7 +41,6 @@ const ENABLED_AUTOFILL_CAPTURE_ON_PAGE_NAVIGATION =
 export const FormAutofill = {
  ENABLED_AUTOFILL_ADDRESSES_PREF,
  ENABLED_AUTOFILL_ADDRESSES_CAPTURE_PREF,
-  ENABLED_AUTOFILL_ADDRESSES_CAPTURE_V2_PREF,
  ENABLED_AUTOFILL_CAPTURE_ON_FORM_REMOVAL,
  ENABLED_AUTOFILL_CAPTURE_ON_PAGE_NAVIGATION,
  ENABLED_AUTOFILL_CREDITCARDS_PREF,
@ -211,11 +208,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
  "isAutofillAddressesCaptureEnabled",
  ENABLED_AUTOFILL_ADDRESSES_CAPTURE_PREF
 );
-XPCOMUtils.defineLazyPreferenceGetter(
-  FormAutofill,
-  "isAutofillAddressesCaptureV2Enabled",
-  ENABLED_AUTOFILL_ADDRESSES_CAPTURE_V2_PREF
-);
 XPCOMUtils.defineLazyPreferenceGetter(
  FormAutofill,
  "_isAutofillCreditCardsAvailable",
--- a/toolkit/components/formautofill/FormAutofillParent.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillParent.sys.mjs
@ -686,10 +686,7 @@ export class FormAutofillParent extends JSWindowActorParent {
  }

  _shouldShowSaveAddressPrompt(record) {
-    if (
-      !FormAutofill.isAutofillAddressesCaptureEnabled &&
-      !FormAutofill.isAutofillAddressesCaptureV2Enabled
-    ) {
+    if (!FormAutofill.isAutofillAddressesCaptureEnabled) {
      return false;
    }