Bug 1429205 - Add a sendMessageToContent helper for paymentDialogWrapper. r=jaws

MozReview-Commit-ID: FgeQaOR5yno

--HG--
extra : rebase_source : dedbab5e9374cde96a95a02aca5ae328a01902c8

toolkit/components/payments/content/paymentDialogWrapper.js

@@ -237,12 +237,16 @@ var paymentDialogWrapper = {
   },
 
   onAutofillStorageChange() {
+    this.sendMessageToContent("updateState", {
+      savedAddresses: this.fetchSavedAddresses(),
+      savedBasicCards: this.fetchSavedPaymentCards(),
+    });
+  },
+
+  sendMessageToContent(messageType, data = {}) {
     this.mm.sendAsyncMessage("paymentChromeToContent", {
-      messageType: "updateState",
+      data,
-      data: {
+      messageType,
-        savedAddresses: this.fetchSavedAddresses(),
-        savedBasicCards: this.fetchSavedPaymentCards(),
-      },
     });
   },
 
@@ -325,14 +329,10 @@ var paymentDialogWrapper = {
 
   initializeFrame() {
     let requestSerialized = this._serializeRequest(this.request);
-
+    this.sendMessageToContent("showPaymentRequest", {
-    this.mm.sendAsyncMessage("paymentChromeToContent", {
+      request: requestSerialized,
-      messageType: "showPaymentRequest",
+      savedAddresses: this.fetchSavedAddresses(),
-      data: {
+      savedBasicCards: this.fetchSavedPaymentCards(),
-        request: requestSerialized,
-        savedAddresses: this.fetchSavedAddresses(),
-        savedBasicCards: this.fetchSavedPaymentCards(),
-      },
     });
 
     Services.obs.addObserver(this, "formautofill-storage-changed", true);