DO NOT SUBMIT This fixes CFI bot, but it's ugly

third_party/WebKit/Source/modules/payments/PaymentDetailsTestHelper.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/PaymentDetailsTestHelper.h"
 
 #include "modules/payments/CurrencyAmount.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/ShippingOption.h"
 #include "platform/heap/HeapAllocator.h"
 
 namespace blink {
 
-PaymentDetails buildPaymentDetailsForTest(PaymentTestDetailToChange detail, PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
+PaymentDetails buildPaymentDetailsForTest(bool setShippingOptions, PaymentTestDetailToChange detail, PaymentTestDataToChange data, PaymentTestModificationType modificationType, const String& valueToUse)
 {
     CurrencyAmount itemAmount;
     if (detail == PaymentTestDetailItem && data == PaymentTestDataCurrencyCode) {
         if (modificationType == PaymentTestOverwriteValue)
             itemAmount.setCurrencyCode(valueToUse);
     } else {
         itemAmount.setCurrencyCode("USD");
     }
     if (detail == PaymentTestDetailItem && data == PaymentTestDataAmount) {
         if (modificationType == PaymentTestOverwriteValue)
@@ skipping 41 matching lines @@
     }
     if (detail == PaymentTestDetailShippingOption && data == PaymentTestDataLabel) {
         if (modificationType == PaymentTestOverwriteValue)
             shippingOption.setLabel(valueToUse);
     } else {
         shippingOption.setLabel("Standard shipping");
     }
 
     PaymentDetails result;
     result.setItems(HeapVector<PaymentItem>(1, item));
-    result.setShippingOptions(HeapVector<ShippingOption>(2, shippingOption));
+
+    if (setShippingOptions) {
+      result.setShippingOptions(HeapVector<ShippingOption>(2, shippingOption));
+    }
 
     return result;
 }
 
 } // namespace blink