Add shippingOption to PaymentResponse

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 439 matching lines @@
     DCHECK(success);
     ALLOW_UNUSED_LOCAL(success);
 }
 
 void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response)
 {
     DCHECK(m_showResolver);
     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;
         }
 
         String errorMessage;
         if (!PaymentsValidators::isValidShippingAddress(response->shipping_address, &errorMessage)) {
             m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
             clearResolversAndCloseMojoConnection();
             return;
         }
 
         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;
         }
     }
 
     if ((m_options.requestPayerEmail() && response->payer_email.isEmpty())
         || (m_options.requestPayerPhone() && response->payer_phone.isEmpty())
         || (!m_options.requestPayerEmail() && !response->payer_email.isNull())
         || (!m_options.requestPayerPhone() && !response->payer_phone.isNull())) {
@@ skipping 48 matching lines @@
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink