PaymentRequest: Remove regionCode attribute

The regionCode attribute was removed in spec side[1]. FYI, the attribute
was behind runtime flag and have never shipped. So, we don't need to
send intents to blink-dev.

[1] https://github.com/w3c/payment-request/pull/823

Bug: 925722
Change-Id: I85b370770141b1caf69389e399358b82ad071b89
Reviewed-on: https://chromium-review.googlesource.com/c/1438981Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#626895}

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -1490,8 +1490,7 @@ public class PaymentRequestImpl
                 || !TextUtils.isEmpty(errors.languageCode)
                 || !TextUtils.isEmpty(errors.organization) || !TextUtils.isEmpty(errors.phone)
                 || !TextUtils.isEmpty(errors.postalCode) || !TextUtils.isEmpty(errors.recipient)
-                || !TextUtils.isEmpty(errors.region) || !TextUtils.isEmpty(errors.regionCode)
-                || !TextUtils.isEmpty(errors.sortingCode);
+                || !TextUtils.isEmpty(errors.region) || !TextUtils.isEmpty(errors.sortingCode);
     }
 
     private boolean hasPayerError(PayerErrors errors) {

components/payments/content/payment_request_spec.cc

@@ -193,7 +193,6 @@ bool PaymentRequestSpec::has_shipping_address_error() const {
            details_->shipping_address_errors->postal_code.empty() &&
            details_->shipping_address_errors->recipient.empty() &&
            details_->shipping_address_errors->region.empty() &&
-           details_->shipping_address_errors->region_code.empty() &&
            details_->shipping_address_errors->sorting_code.empty());
 }
 

components/payments/core/payments_validators.cc

@@ -129,7 +129,6 @@ bool PaymentsValidators::IsValidAddressErrorsFormat(
          IsValidErrorMsgFormat(errors->postal_code, optional_error_message) &&
          IsValidErrorMsgFormat(errors->recipient, optional_error_message) &&
          IsValidErrorMsgFormat(errors->region, optional_error_message) &&
-         IsValidErrorMsgFormat(errors->region_code, optional_error_message) &&
          IsValidErrorMsgFormat(errors->sorting_code, optional_error_message);
 }
 

components/payments/core/payments_validators_unittest.cc

@@ -268,7 +268,6 @@ struct ValidationErrorsTestCase {
   const char* m_shipping_address_postal_code = "";
   const char* m_shipping_address_recipient = "";
   const char* m_shipping_address_region = "";
-  const char* m_shipping_address_region_code = "";
   const char* m_shipping_address_sorting_code = "";
   bool expected_valid;
 };
@@ -302,7 +301,6 @@ mojom::PaymentValidationErrorsPtr toPaymentValidationErrors(
   shipping_address->postal_code = test_case.m_shipping_address_postal_code;
   shipping_address->recipient = test_case.m_shipping_address_recipient;
   shipping_address->region = test_case.m_shipping_address_region;
-  shipping_address->region_code = test_case.m_shipping_address_region_code;
   shipping_address->sorting_code = test_case.m_shipping_address_sorting_code;
 
   errors->payer = std::move(payer);
@@ -352,7 +350,6 @@ INSTANTIATE_TEST_CASE_P(
         VALIDATION_ERRORS_TEST_CASE(shipping_address_postal_code, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_recipient, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_region, "test", true),
-        VALIDATION_ERRORS_TEST_CASE(shipping_address_region_code, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_sorting_code,
                                     "test",
                                     true),
@@ -392,9 +389,6 @@ INSTANTIATE_TEST_CASE_P(
         VALIDATION_ERRORS_TEST_CASE(shipping_address_region,
                                     LongString2049(),
                                     false),
-        VALIDATION_ERRORS_TEST_CASE(shipping_address_region_code,
-                                    LongString2049(),
-                                    false),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_sorting_code,
                                     LongString2049(),
                                     false)));

components/payments/mojom/payment_request_data.mojom

@@ -74,6 +74,5 @@ struct AddressErrors {
   string postal_code;
   string recipient;
   string region;
-  string region_code;
   string sorting_code;
 };

third_party/blink/renderer/modules/payments/address_errors.idl

@@ -15,6 +15,5 @@ dictionary AddressErrors {
     DOMString postalCode;
     DOMString recipient;
     DOMString region;
-    DOMString regionCode;
     DOMString sortingCode;
 };

third_party/blink/renderer/modules/payments/payment_request.cc

@@ -197,8 +197,6 @@ struct TypeConverter<AddressErrorsPtr, blink::AddressErrors*> {
     output->recipient =
         input->hasRecipient() ? input->recipient() : g_empty_string;
     output->region = input->hasRegion() ? input->region() : g_empty_string;
-    output->region_code =
-        input->hasRegionCode() ? input->regionCode() : g_empty_string;
     output->sorting_code =
         input->hasSortingCode() ? input->sortingCode() : g_empty_string;
     return output;

third_party/blink/renderer/modules/payments/payments_validators.cc

@@ -156,9 +156,6 @@ bool PaymentsValidators::IsValidAddressErrorsFormat(
           IsValidErrorMsgFormat(errors->recipient(), optional_error_message)) &&
          (!errors->hasRegion() ||
           IsValidErrorMsgFormat(errors->region(), optional_error_message)) &&
-         (!errors->hasRegionCode() ||
-          IsValidErrorMsgFormat(errors->regionCode(),
-                                optional_error_message)) &&
          (!errors->hasSortingCode() ||
           IsValidErrorMsgFormat(errors->sortingCode(), optional_error_message));
 }

third_party/blink/renderer/modules/payments/payments_validators_test.cc

@@ -280,7 +280,6 @@ struct ValidationErrorsTestCase {
   const char* m_shipping_address_postal_code = "";
   const char* m_shipping_address_recipient = "";
   const char* m_shipping_address_region = "";
-  const char* m_shipping_address_region_code = "";
   const char* m_shipping_address_sorting_code = "";
   bool expected_valid;
 };
@@ -313,7 +312,6 @@ PaymentValidationErrors* toPaymentValidationErrors(
   shipping_address->setPostalCode(test_case.m_shipping_address_postal_code);
   shipping_address->setRecipient(test_case.m_shipping_address_recipient);
   shipping_address->setRegion(test_case.m_shipping_address_region);
-  shipping_address->setRegionCode(test_case.m_shipping_address_region_code);
   shipping_address->setSortingCode(test_case.m_shipping_address_sorting_code);
 
   errors->setPayer(payer);
@@ -362,7 +360,6 @@ INSTANTIATE_TEST_CASE_P(
         VALIDATION_ERRORS_TEST_CASE(shipping_address_postal_code, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_recipient, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_region, "test", true),
-        VALIDATION_ERRORS_TEST_CASE(shipping_address_region_code, "test", true),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_sorting_code,
                                     "test",
                                     true),
@@ -402,9 +399,6 @@ INSTANTIATE_TEST_CASE_P(
         VALIDATION_ERRORS_TEST_CASE(shipping_address_region,
                                     LongString2049(),
                                     false),
-        VALIDATION_ERRORS_TEST_CASE(shipping_address_region_code,
-                                    LongString2049(),
-                                    false),
         VALIDATION_ERRORS_TEST_CASE(shipping_address_sorting_code,
                                     LongString2049(),
                                     false)));