Bug 1417336 - [Form Autofill] Enable credit card autofill by default on beta build. r=steveck

MozReview-Commit-ID: AOM6vqw2JvY

--HG--
extra : rebase_source : a3138bdee792f74f60e2149c2b963078a2bb6a3c

browser/app/profile/firefox.js

@@ -1689,17 +1689,15 @@ pref("browser.crashReports.unsubmittedCheck.autoSubmit", false);
 // "detect" means it's enabled if conditions defined in the extension are met.
 #ifdef NIGHTLY_BUILD
 pref("extensions.formautofill.available", "on");
+pref("extensions.formautofill.creditCards.available", true);
 #elif MOZ_UPDATE_CHANNEL == release
 pref("extensions.formautofill.available", "staged-rollout");
+pref("extensions.formautofill.creditCards.available", false);
 #else
 pref("extensions.formautofill.available", "detect");
+pref("extensions.formautofill.creditCards.available", true);
 #endif
 pref("extensions.formautofill.addresses.enabled", true);
-#ifdef NIGHTLY_BUILD
-pref("extensions.formautofill.creditCards.available", true);
-#else
-pref("extensions.formautofill.creditCards.available", false);
-#endif
 pref("extensions.formautofill.creditCards.enabled", true);
 // Pref for shield/heartbeat to recognize users who have used Credit Card
 // Autofill. The valid values can be: