PaymentRequest: Rename 'currencyCode' to 'currency' in CurrencyAmount.idl.

third_party/WebKit/Source/modules/payments/PaymentRequest.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/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 27 matching lines @@
 using blink::mojom::blink::PaymentOptions;
 using blink::mojom::blink::PaymentOptionsPtr;
 using blink::mojom::blink::ShippingOption;
 using blink::mojom::blink::ShippingOptionPtr;
 
 template <>
 struct TypeConverter<CurrencyAmountPtr, blink::CurrencyAmount> {
     static CurrencyAmountPtr Convert(const blink::CurrencyAmount& input)
     {
         CurrencyAmountPtr output = CurrencyAmount::New();
-        output->currency_code = input.currencyCode();
+        output->currency_code = input.currency();
         output->value = input.value();
         return output;
     }
 };
 
 template <>
 struct TypeConverter<PaymentItemPtr, blink::PaymentItem> {
     static PaymentItemPtr Convert(const blink::PaymentItem& input)
     {
         PaymentItemPtr output = PaymentItem::New();
@@ skipping 59 matching lines @@
         if (!item.hasLabel() || item.label().isEmpty()) {
             exceptionState.throwTypeError("Item label required");
             return;
         }
 
         if (!item.hasAmount()) {
             exceptionState.throwTypeError("Currency amount required");
             return;
         }
 
-        if (!item.amount().hasCurrencyCode()) {
+        if (!item.amount().hasCurrency()) {
             exceptionState.throwTypeError("Currency code required");
             return;
         }
 
         if (!item.amount().hasValue()) {
             exceptionState.throwTypeError("Currency value required");
             return;
         }
 
-        if (!PaymentsValidators::isValidCurrencyCodeFormat(item.amount().currencyCode(), &errorMessage)) {
+        if (!PaymentsValidators::isValidCurrencyCodeFormat(item.amount().currency(), &errorMessage)) {

[Marijn Kruisselbrink, 2016/05/16 19:02:48]

To really make this match the spec you probably should also get rid of this
verification, because of "user agents MUST not attempt to validate this string"
in the spec.

Although despite what the spec says we should probably do some kind of sanity
check before sending arbitrarily long strings over IPC though...

[please use gerrit instead, 2016/05/16 21:36:36]

We would also need to update the validation logic in the browser process:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/android/jav...

Perhaps this can be done in a separate patch? Then this patch can be a simple
rename.

[Marijn Kruisselbrink, 2016/05/16 21:43:48]

Sure, that works. And to fully match the spec change this CL links to the amount
format regex will need to be updated as well.

             exceptionState.throwTypeError(errorMessage);
             return;
         }
 
         if (!PaymentsValidators::isValidAmountFormat(item.amount().value(), &errorMessage)) {
             exceptionState.throwTypeError(errorMessage);
             return;
         }
     }
 }
@@ skipping 284 matching lines @@
 void PaymentRequest::clearResolversAndCloseMojoConnection()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink