From 70744c3261baf058ffd1ff354c6470993d413a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20C=C3=A1ceres?= <mcaceres@mozilla.com>
Date: Mon, 1 Oct 2018 03:44:00 -0400
Subject: [PATCH] Bug 1495335 - Rename PayerErrorFields to PayerErrors. r=baku

---
 browser/components/payments/res/containers/address-form.js | 2 +-
 dom/payments/PaymentRequestData.cpp                        | 2 +-
 dom/payments/PaymentResponse.cpp                           | 2 +-
 dom/webidl/PaymentRequest.webidl                           | 6 +++---
 testing/web-platform/tests/interfaces/payment-request.idl  | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/browser/components/payments/res/containers/address-form.js b/browser/components/payments/res/containers/address-form.js
index 041f4bbe21dd..550bf852de29 100644
--- a/browser/components/payments/res/containers/address-form.js
+++ b/browser/components/payments/res/containers/address-form.js
@@ -44,7 +44,7 @@ export default class AddressForm extends PaymentStateSubscriberMixin(PaymentRequ
     this.persistCheckbox = new LabelledCheckbox();
     this.persistCheckbox.className = "persist-checkbox";
 
-    // Combination of AddressErrors and PayerErrorFields as keys
+    // Combination of AddressErrors and PayerErrors as keys
     this._errorFieldMap = {
       addressLine: "#street-address",
       city: "#address-level2",
diff --git a/dom/payments/PaymentRequestData.cpp b/dom/payments/PaymentRequestData.cpp
index a49f9558db02..3bcb1764b629 100644
--- a/dom/payments/PaymentRequestData.cpp
+++ b/dom/payments/PaymentRequestData.cpp
@@ -492,7 +492,7 @@ PaymentDetails::GetShippingAddressErrors(JSContext* aCx, JS::MutableHandleValue
 NS_IMETHODIMP
 PaymentDetails::GetPayer(JSContext* aCx, JS::MutableHandleValue aErrors)
 {
-  PayerErrorFields errors;
+  PayerErrors errors;
   errors.Init(mPayerErrors);
   if (!ToJSValue(aCx, errors, aErrors)) {
     return NS_ERROR_FAILURE;
diff --git a/dom/payments/PaymentResponse.cpp b/dom/payments/PaymentResponse.cpp
index 7f4513a58a78..58d394a68d6e 100644
--- a/dom/payments/PaymentResponse.cpp
+++ b/dom/payments/PaymentResponse.cpp
@@ -341,7 +341,7 @@ PaymentResponse::ValidatePaymentValidationErrors(
     return NS_OK;
   }
   // check PaymentValidationErrors.payer
-  PayerErrorFields payerErrors(aErrors.mPayer);
+  PayerErrors payerErrors(aErrors.mPayer);
   if (payerErrors.mName.WasPassed() && !payerErrors.mName.Value().IsEmpty()) {
     return NS_OK;
   }
diff --git a/dom/webidl/PaymentRequest.webidl b/dom/webidl/PaymentRequest.webidl
index bdebff3b661e..2b2926945b36 100644
--- a/dom/webidl/PaymentRequest.webidl
+++ b/dom/webidl/PaymentRequest.webidl
@@ -74,14 +74,14 @@ dictionary AddressErrors {
 
 dictionary PaymentValidationErrors {
   // FIXME: bug 1493860: should this "= null" be here?
-  PayerErrorFields payer = null;
+  PayerErrors payer = null;
   // FIXME: bug 1493860: should this "= null" be here?
   AddressErrors shippingAddress = null;
   DOMString error;
   object paymentMethod;
 };
 
-dictionary PayerErrorFields {
+dictionary PayerErrors {
   DOMString email;
   DOMString name;
   DOMString phone;
@@ -92,7 +92,7 @@ dictionary PaymentDetailsUpdate : PaymentDetailsBase {
   // FIXME: bug 1493860: should this "= null" be here?
   AddressErrors shippingAddressErrors = null;
   // FIXME: bug 1493860: should this "= null" be here?
-  PayerErrorFields payerErrors = null;
+  PayerErrors payerErrors = null;
   object paymentMethodErrors;
   // FIXME: bug 1493860: should this "= null" be here?
   PaymentItem   total = null;
diff --git a/testing/web-platform/tests/interfaces/payment-request.idl b/testing/web-platform/tests/interfaces/payment-request.idl
index d930b57291e5..843c66107b34 100644
--- a/testing/web-platform/tests/interfaces/payment-request.idl
+++ b/testing/web-platform/tests/interfaces/payment-request.idl
@@ -49,7 +49,7 @@ dictionary PaymentDetailsUpdate : PaymentDetailsBase {
   DOMString error;
   PaymentItem total;
   AddressErrors shippingAddressErrors;
-  PayerErrorFields payerErrors;
+  PayerErrors payerErrors;
   object paymentMethodErrors;
 };
 
@@ -169,13 +169,13 @@ interface PaymentResponse : EventTarget {
 };
 
 dictionary PaymentValidationErrors {
-  PayerErrorFields payer;
+  PayerErrors payer;
   AddressErrors shippingAddress;
   DOMString error;
   object paymentMethod;
 };
 
-dictionary PayerErrorFields {
+dictionary PayerErrors {
   DOMString email;
   DOMString name;
   DOMString phone;