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

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

Index: third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
index 8cdb6102a41d7f7058de6971a9c1bfb954dc6de5..28f4e609ba5efb24ff1628aa1b88ff7a4666362b 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
@@ -45,7 +45,7 @@ private:
 
 TEST_F(PaymentRequestTest, NoExceptionWithValidData)
 {
-    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
+    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(true), getExceptionState());
 
     EXPECT_FALSE(getExceptionState().hadException());
 }
@@ -54,7 +54,7 @@ TEST_F(PaymentRequestTest, SecureContextRequired)
 {
     setSecurityOrigin("http://www.example.com");
 
-    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
+    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(true), getExceptionState());
 
     EXPECT_TRUE(getExceptionState().hadException());
     EXPECT_EQ(SecurityError, getExceptionState().code());
@@ -62,7 +62,7 @@ TEST_F(PaymentRequestTest, SecureContextRequired)
 
 TEST_F(PaymentRequestTest, SupportedMethodListRequired)
 {
-    PaymentRequest::create(getScriptState(), Vector<String>(), buildPaymentDetailsForTest(), getExceptionState());
+    PaymentRequest::create(getScriptState(), Vector<String>(), buildPaymentDetailsForTest(true), getExceptionState());
 
     EXPECT_TRUE(getExceptionState().hadException());
     EXPECT_EQ(V8TypeError, getExceptionState().code());
@@ -89,7 +89,7 @@ TEST_F(PaymentRequestTest, AtLeastOnePaymentDetailsItemRequired)
 
 TEST_F(PaymentRequestTest, NullShippingOptionWhenNoOptionsAvailable)
 {
-    PaymentDetails details = buildPaymentDetailsForTest();
+    PaymentDetails details = buildPaymentDetailsForTest(false);
     details.setShippingOptions(HeapVector<ShippingOption>());
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
@@ -99,7 +99,7 @@ TEST_F(PaymentRequestTest, NullShippingOptionWhenNoOptionsAvailable)
 
 TEST_F(PaymentRequestTest, NullShippingOptionWhenMultipleOptionsAvailable)
 {
-    PaymentDetails details = buildPaymentDetailsForTest();
+    PaymentDetails details = buildPaymentDetailsForTest(true);
     EXPECT_LE(2U, details.shippingOptions().size());
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
@@ -116,7 +116,7 @@ TEST_F(PaymentRequestTest, SelectSingleAvailableShippingOption)
     option.setAmount(amount);
     option.setId("standard");
     option.setLabel("Standard shipping");
-    PaymentDetails details = buildPaymentDetailsForTest();
+    PaymentDetails details = buildPaymentDetailsForTest(true);
     details.setShippingOptions(HeapVector<ShippingOption>(1, option));
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
@@ -126,7 +126,7 @@ TEST_F(PaymentRequestTest, SelectSingleAvailableShippingOption)
 
 TEST_F(PaymentRequestTest, AbortWithoutShowShouldThrow)
 {
-    PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
+    PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(true), getExceptionState());
     EXPECT_FALSE(getExceptionState().hadException());
 
     request->abort(getExceptionState());