Backed out changeset 07e1879a0c09 (bug 1258921) for test_case_differences.html failures

MozReview-Commit-ID: 4rv62zN5uLt

toolkit/components/passwordmgr/test/mochitest/mochitest.ini

@@ -16,7 +16,7 @@ support-files =
 [test_basic_form_2pw_2.html]
 [test_basic_form_3pw_1.html]
 [test_basic_form_autocomplete.html]
-skip-if = toolkit == 'android' # android:autocomplete.
+skip-if = toolkit == 'android' || e10s # android:autocomplete. e10s:Requires code fix in bug 1258921.
 [test_basic_form_html5.html]
 [test_basic_form_pwevent.html]
 [test_basic_form_pwonly.html]

toolkit/components/passwordmgr/test/pwmgr_common.js

@@ -304,15 +304,15 @@ function resetRecipes() {
 
 function promiseStorageChanged(expectedChangeTypes) {
   return new Promise((resolve, reject) => {
-    function onStorageChanged({ topic, data }) {
+    let onStorageChanged = SpecialPowers.wrapCallback(function osc(subject, topic, data) {
       let changeType = expectedChangeTypes.shift();
       is(data, changeType, "Check expected passwordmgr-storage-changed type");
       if (expectedChangeTypes.length === 0) {
-        chromeScript.removeMessageListener("storageChanged", onStorageChanged);
-        resolve();
+        SpecialPowers.removeObserver(onStorageChanged, "passwordmgr-storage-changed");
+        resolve(subject);
       }
-    }
-    chromeScript.addMessageListener("storageChanged", onStorageChanged);
+    });
+    SpecialPowers.addObserver(onStorageChanged, "passwordmgr-storage-changed", false);
   });
 }
 
@@ -362,14 +362,6 @@ if (this.addMessageListener) {
   Cu.import("resource://gre/modules/Services.jsm");
   Cu.import("resource://gre/modules/Task.jsm");
 
-  function onStorageChanged(subject, topic, data) {
-    sendAsyncMessage("storageChanged", {
-      topic,
-      data,
-    });
-  }
-  Services.obs.addObserver(onStorageChanged, "passwordmgr-storage-changed", false);
-
   addMessageListener("setupParent", ({selfFilling = false} = {selfFilling: false}) => {
     commonInit(selfFilling);
     sendAsyncMessage("doneSetup");