Backed out changeset ec2ab90ea263 (bug 1386120) for failing xpcshell's test_Macys.js and test_isFieldEligibleForAutofill.js. r=backout

browser/extensions/formautofill/bootstrap.js

@@ -42,15 +42,9 @@ function onMaybeOpenPopup(evt) {
 
 function startup() {
   if (Services.prefs.getStringPref("extensions.formautofill.available") != "on") {
-    Services.prefs.clearUserPref("dom.forms.autocomplete.formautofill");
     return;
   }
 
-  // This pref is used for web contents to detect the autocomplete feature.
-  // When it's true, "element.autocomplete" will return tokens we currently
-  // support -- otherwise it'll return an empty string.
-  Services.prefs.setBoolPref("dom.forms.autocomplete.formautofill", true);
-
   // Listen for the autocomplete popup message to lazily append our stylesheet related to the popup.
   Services.mm.addMessageListener("FormAutoComplete:MaybeOpenPopup", onMaybeOpenPopup);
 

browser/extensions/formautofill/test/unit/head.js

@@ -203,10 +203,12 @@ function objectMatches(object, fields) {
 add_task(async function head_initialize() {
   Services.prefs.setStringPref("extensions.formautofill.available", "on");
   Services.prefs.setBoolPref("extensions.formautofill.heuristics.enabled", true);
+  Services.prefs.setBoolPref("dom.forms.autocomplete.formautofill", true);
 
   // Clean up after every test.
   do_register_cleanup(function head_cleanup() {
     Services.prefs.clearUserPref("extensions.formautofill.available");
     Services.prefs.clearUserPref("extensions.formautofill.heuristics.enabled");
+    Services.prefs.clearUserPref("dom.forms.autocomplete.formautofill");
   });
 });