Add currencySystem field to PaymentCurrencyAmount

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 {
 
 // We limit the maximum length of string to 2048 bytes for security reasons.
 static const int maxiumStringLength = 2048;
 
 bool PaymentsValidators::isValidCurrencyCodeFormat(
     const String& code,
+    const String& system,
     String* optionalErrorMessage) {
+  KURL currencySystemUrl = KURL(KURL(), system);
+  if (!currencySystemUrl.isValid()) {

[please use gerrit instead, 2016/10/12 23:35:50]

Inline "currencySystemUrl":

if (!KURL(KURL(), system).isValid()) {
    ...
}

[pals, 2016/10/13 09:30:38]

Done.

+    if (optionalErrorMessage) {

[please use gerrit instead, 2016/10/12 23:35:49]

Let's use {} in the same way as the rest of the file. If statements with single
line bodies don't need {}.

[pals, 2016/10/13 09:30:38]

Done.

+      *optionalErrorMessage = "The currency system is not a valid url";
+    }
+
+    return false;
+  }
+
+  if (system == "urn:iso:std:iso:4217") {

[please use gerrit instead, 2016/10/12 23:35:50]

This is a URN, which is different from URL. Therefore, check for this URN before
you call KURL.isValid().

[pals, 2016/10/13 09:30:38]

Done.

+    if (ScriptRegexp("^[A-Z]{3}$", TextCaseSensitive).match(code) == 0)
+      return true;
+
+    if (optionalErrorMessage) {

[please use gerrit instead, 2016/10/12 23:35:50]

No need for {}

[pals, 2016/10/13 09:30:38]

Done.

+      *optionalErrorMessage =
+          "'" + code +
+          "' is not a valid ISO 4217 "
+          "currency code, should be 3 upper case letters [A-Z]";
+    }
+
+    return false;
+  }
+
   if (code.length() <= maxiumStringLength)
     return true;
 
   if (optionalErrorMessage)
     *optionalErrorMessage =
         "The currency code should be at most 2048 characters long";
 
   return false;
 }
 
@@ skipping 80 matching lines @@
     return true;
 
   if (optionalErrorMessage)
     *optionalErrorMessage =
         "Error message should be at most 2048 characters long";
 
   return false;
 }
 
 }  // namespace blink