[PaymentReqeust] Add error message in PaymentDetails. (in blink side)

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 107 matching lines @@
         if (input.hasShippingOptions())
             output->shipping_options = mojo::WTFArray<PaymentShippingOptionPtr>::From(input.shippingOptions());
         else
             output->shipping_options = mojo::WTFArray<PaymentShippingOptionPtr>::New(0);
 
         if (input.hasModifiers())
             output->modifiers = mojo::WTFArray<PaymentDetailsModifierPtr>::From(input.modifiers());
         else
             output->modifiers = mojo::WTFArray<PaymentDetailsModifierPtr>::New(0);
 
+        if (input.hasError())
+            output->error = input.error();
+        else
+            output->error = WTF::emptyString();
+
         return output;
     }
 };
 
 template <>
 struct TypeConverter<PaymentOptionsPtr, blink::PaymentOptions> {
     static PaymentOptionsPtr Convert(const blink::PaymentOptions& input)
     {
         PaymentOptionsPtr output = PaymentOptions::New();
         output->request_payer_name = input.requestPayerName();
@@ skipping 159 matching lines @@
 
     if (details.hasShippingOptions()) {
         validateShippingOptions(details.shippingOptions(), exceptionState);
         if (exceptionState.hadException())
             return;
     }
 
     if (details.hasModifiers()) {
         validatePaymentDetailsModifiers(details.modifiers(), exceptionState);
     }
+
+    String errorMessage;
+    if (!PaymentsValidators::isValidErrorMsgFormat(details.error(), &errorMessage)) {
+        exceptionState.throwTypeError(errorMessage);
+        return;
+    }
 }
 
 void validateAndConvertPaymentMethodData(const HeapVector<PaymentMethodData>& paymentMethodData, Vector<PaymentRequest::MethodData>* methodData, ExceptionState& exceptionState)
 {
     if (paymentMethodData.isEmpty()) {
         exceptionState.throwTypeError("Must specify at least one payment method identifier");
         return;
     }
 
     HashSet<String> uniqueMethods;
@@ skipping 210 matching lines @@
 
     if (!scriptState->domWindow()->frame() || !scriptState->domWindow()->frame()->isMainFrame()) {
         exceptionState.throwSecurityError("Must be in a top-level browsing context");
         return;
     }
 
     validatePaymentDetails(details, exceptionState);
     if (exceptionState.hadException())
         return;
 
+    if (details.hasError() && !details.error().isEmpty()) {
+        exceptionState.throwTypeError("Error value should be empty");
+        return;
+    }
+
     if (m_options.requestShipping()) {
         m_shippingOption = getSelectedShippingOption(details);
         m_shippingType = getValidShippingType(m_options.shippingType());
     }
 
     scriptState->domWindow()->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_paymentProvider));
     m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));
     m_paymentProvider->Init(m_clientBinding.CreateInterfacePtrAndBind(), mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(validatedMethodData), mojom::blink::PaymentDetails::From(details), mojom::blink::PaymentOptions::From(m_options));
 }
 
@@ skipping 168 matching lines @@
     m_completeTimer.stop();
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink