| Index: third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
|
| diff --git a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
|
| index 1d2293ef7873e3b0d35642af25933e4ff78a6c85..5714c8ce55091dbd62d1e38e170fb83aeebe0a9f 100644
|
| --- a/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
|
| +++ b/third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp
|
| @@ -13,6 +13,7 @@
|
| namespace blink {
|
| namespace {
|
|
|
| +static int gUniqueId = 0;
|
| // PaymentItem and PaymentShippingOption have identical structure
|
| // except for the "id" field, which is present only in PaymentShippingOption.
|
| template <typename PaymentItemOrPaymentShippingOption>
|
| @@ -60,7 +61,7 @@ PaymentShippingOption buildShippingOptionForTest(PaymentTestDataToChange data, P
|
| if (modificationType == PaymentTestOverwriteValue)
|
| shippingOption.setId(valueToUse);
|
| } else {
|
| - shippingOption.setId("id");
|
| + shippingOption.setId("id" + String::number(gUniqueId++));
|
| }
|
| setValues(shippingOption, data, modificationType, valueToUse);
|
| return shippingOption;
|
| @@ -116,7 +117,7 @@ PaymentDetails buildPaymentDetailsForTest(PaymentTestDetailToChange detail, Paym
|
| PaymentDetails result;
|
| result.setTotal(total);
|
| result.setDisplayItems(HeapVector<PaymentItem>(1, item));
|
| - result.setShippingOptions(HeapVector<PaymentShippingOption>(2, shippingOption));
|
| + result.setShippingOptions(HeapVector<PaymentShippingOption>(1, shippingOption));
|
| result.setModifiers(HeapVector<PaymentDetailsModifier>(1, modifier));
|
|
|
| return result;
|
|
|