Add shippingOption to PaymentResponse

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

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index 12eed355a177f7335987c4280fccaf1ee30b9a29..ce4cc78953d8cc68aa03ebffe9fd6e3219bb4c9d 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -457,7 +457,7 @@ void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response
     DCHECK(!m_completeResolver);
 
     if (m_options.requestShipping()) {
-        if (!response->shipping_address) {
+        if (!response->shipping_address || response->shipping_option.isEmpty()) {
             m_showResolver->reject(DOMException::create(SyntaxError));
             clearResolversAndCloseMojoConnection();
             return;
@@ -471,9 +471,9 @@ void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response
         }
 
         m_shippingAddress = new PaymentAddress(response->shipping_address.Clone());
-        m_shippingOption = response->shipping_option_id;
+        m_shippingOption = response->shipping_option;
     } else {
-        if (response->shipping_address) {
+        if (response->shipping_address || !response->shipping_option.isNull()) {
             m_showResolver->reject(DOMException::create(SyntaxError));
             clearResolversAndCloseMojoConnection();
             return;