PaymentRequest: Sync up PaymentAddress with the payment request spec.

third_party/WebKit/Source/modules/payments/PaymentsValidators.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentsValidators.h"
 
 #include "bindings/core/v8/ScriptRegexp.h"
 #include "wtf/text/StringImpl.h"
 
 namespace blink {
@@ skipping 13 matching lines @@
 {
     if (ScriptRegexp("^-?[0-9]+(\\.[0-9]+)?$", TextCaseSensitive).match(amount) == 0)
         return true;
 
     if (optionalErrorMessage)
         *optionalErrorMessage = "'" + amount + "' is not a valid ISO 20022 CurrencyAnd30Amount";
 
     return false;
 }
 
-bool PaymentsValidators::isValidRegionCodeFormat(const String& code, String* optionalErrorMessage)
+bool PaymentsValidators::isValidCountryCodeFormat(const String& code, String* optionalErrorMessage)
 {
     if (ScriptRegexp("^[A-Z]{2}$", TextCaseSensitive).match(code) == 0)
         return true;
 
     if (optionalErrorMessage)
         *optionalErrorMessage = "'" + code + "' is not a valid ISO 3166 country code, should be 2 upper case letters [A-Z]";
 
     return false;
 }
 
@@ skipping 14 matching lines @@
         return true;
 
     if (optionalErrorMessage)
         *optionalErrorMessage = "'" + code + "' is not a valid ISO 15924 script code, should be an upper case letter [A-Z] followed by 3 lower case letters [a-z]";
 
     return false;
 }
 
 bool PaymentsValidators::isValidShippingAddress(const mojom::blink::PaymentAddressPtr& address, String* optionalErrorMessage)
 {
-    if (!isValidRegionCodeFormat(address->region_code, optionalErrorMessage))
+    if (!isValidCountryCodeFormat(address->country, optionalErrorMessage))
         return false;
 
     if (!isValidLanguageCodeFormat(address->language_code, optionalErrorMessage))
         return false;
 
     if (!isValidScriptCodeFormat(address->script_code, optionalErrorMessage))
         return false;
 
     if (address->language_code.isEmpty() && !address->script_code.isEmpty()) {
         if (optionalErrorMessage)
             *optionalErrorMessage = "If language code is empty, then script code should also be empty";
 
         return false;
     }
 
     return true;
 }
 
 } // namespace blink