More thorough tests for PaymentRequest

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 275 matching lines @@
                 if (paymentMethodSpecificKeyValue.value->getType() != JSONValue::TypeObject) {
                     exceptionState.throwTypeError("Data for '" + paymentMethodSpecificKeyValue.key + "' should be a JSON-serializable object");
                     return;
                 }
             }
 
             m_stringifiedData = jsonData->toJSONString();
         }
     }
 
-    // Set the currently selected option if only one option was passed.
-    if (details.hasShippingOptions() && details.shippingOptions().size() == 1)
+    // Set the currently selected option if only one option is passed and shipping is requested.
+    if (options.requestShipping() && details.hasShippingOptions() && details.shippingOptions().size() == 1)
         m_shippingOption = details.shippingOptions().begin()->id();
 }
 
 void PaymentRequest::contextDestroyed()
 {
     cleanUp();
 }
 
 void PaymentRequest::OnShippingAddressChange(mojom::blink::ShippingAddressPtr address)
 {
@@ skipping 57 matching lines @@
 void PaymentRequest::cleanUp()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink